Merge pull request #110 from SymbolicML/fix-bad-const-eval

fix: non-finite `.val` evaluation issue

Author: MilesCranmer

Project.toml

@@ -1,7 +1,7 @@
 name = "DynamicExpressions"
 uuid = "a40a106e-89c9-4ca8-8020-a735e8728b6b"
 authors = ["MilesCranmer <miles.cranmer@gmail.com>"]
-version = "1.5.0"
+version = "1.5.1"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

src/Evaluate.jl

@@ -621,7 +621,7 @@ end
 
 @inline function deg0_eval_constant(tree::AbstractExpressionNode{T}) where {T}
     output = tree.val
-    return ResultOk([output], true)::ResultOk{Vector{T}}
+    return ResultOk([output], is_valid(output))::ResultOk{Vector{T}}
 end
 
 function deg1_eval_constant(

test/test_evaluation.jl

@@ -287,3 +287,41 @@ end
     ex = Expression(Node{Float64}(; feature=1))
     @test_throws ArgumentError ex(randn(1, 5), OperatorEnum(); bad_arg=1)
 end
+
+@testitem "Test Inf val" begin
+    using DynamicExpressions
+
+    include("tree_gen_utils.jl")
+
+    # Even if the `.val` is `Inf`, we should
+    # be able to safely evaluate the expression.
+    some_unsafe_operators = OperatorEnum(;
+        binary_operators=[+, -, *, /], unary_operators=[sin, cos]
+    )
+
+    function fill_vals!(tree, val)
+        foreach(tree) do node
+            if node.degree == 0 && node.constant
+                node.val = val
+            end
+        end
+    end
+
+    # We want to compare them:
+    num_tests = 100
+    n_features = 3
+    for _ in 1:num_tests
+        let tree, X, eval
+            tree = gen_random_tree_fixed_size(
+                20, some_unsafe_operators, n_features, Float64
+            )
+            # Now, we set all the constant values to Inf:
+            X = zeros(Float64, n_features, 10)
+            # Smoke test – we just want to make sure we can evaluate the expression!
+            eval_tree_array(tree, X, some_unsafe_operators)
+            fill_vals!(tree, Inf)
+            eval_tree_array(tree, X, some_unsafe_operators)
+            fill_vals!(tree, NaN)
+        end
+    end
+end