Merge pull request #413 from MilesCranmer/fix-colors-tuple-bound

fix: max of 6 expressions bug

Project.toml

@@ -1,7 +1,7 @@
 name = "SymbolicRegression"
 uuid = "8254be44-1295-4e6a-a16d-46603ac705cb"
 authors = ["MilesCranmer <[email protected]>"]
-version = "1.7.1"
+version = "1.7.2"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

examples/parameterized_function.jl

@@ -104,4 +104,4 @@ ypred2 = predict(mach, (data=X, idx=idx2))
 loss2 = sum(i -> abs2(ypred2[i] - y[i]), eachindex(y)) / length(y)
 
 # Should get better:
-@test loss1 > loss2
+@test loss1 >= loss2

src/TemplateExpression.jl

@@ -561,7 +561,7 @@ end
 # Rather than using iterator with repeat, just make a tuple:
 function _colors(::Val{n}) where {n}
     return ntuple(
-        (i -> (:magenta, :green, :red, :blue, :yellow, :cyan)[mod1(i, n)]), Val(n)
+        (i -> (:magenta, :green, :red, :blue, :yellow, :cyan)[mod1(i, 6)]), Val(n)
     )
 end
 _color_string(s::AbstractString, c::Symbol) = styled"{$c:$s}"

test/test_template_expression_string.jl

@@ -1,3 +1,25 @@
+@testitem "template expression color function" tags = [:part1, :template_colors] begin
+    using SymbolicRegression.TemplateExpressionModule: _colors
+
+    # Test empty case
+    @test _colors(Val(0)) == ()
+
+    # Test n <= 6 cases
+    @test _colors(Val(1)) == (:magenta,)
+    @test _colors(Val(2)) == (:magenta, :green)
+    @test _colors(Val(6)) == (:magenta, :green, :red, :blue, :yellow, :cyan)
+
+    # Test n > 6 cases to verify color cycling
+    colors_7 = _colors(Val(7))
+    @test length(colors_7) == 7
+    @test colors_7[1:6] == (:magenta, :green, :red, :blue, :yellow, :cyan)
+    @test colors_7[7] == :magenta  # Should cycle back to first color
+
+    colors_8 = _colors(Val(8))
+    @test length(colors_8) == 8
+    @test colors_8[7:8] == (:magenta, :green)  # Should cycle colors properly
+end
+
 @testitem "template expression string representation" tags = [:part1, :template_string] begin
     using SymbolicRegression
     using StyledStrings: @styled_str, annotatedstring, AnnotatedString