Merge pull request #493 from MilesCranmer/dont-store-invalids

fix: never store member if violating constraints

Author: MilesCranmer

src/CheckConstraints.jl

@@ -67,18 +67,18 @@ function check_constraints(
     ex::AbstractExpression,
     options::AbstractOptions,
     maxsize::Int,
-    cursize::Union{Int,Nothing}=nothing,
+    cached_size::Union{Int,Nothing}=nothing,
 )::Bool
     tree = get_tree(ex)
-    return check_constraints(tree, options, maxsize, cursize)
+    return check_constraints(tree, options, maxsize, cached_size)
 end
 function check_constraints(
     tree::AbstractExpressionNode,
     options::AbstractOptions,
     maxsize::Int,
-    cursize::Union{Int,Nothing}=nothing,
+    cached_size::Union{Int,Nothing}=nothing,
 )::Bool
-    @something(cursize, compute_complexity(tree, options)) > maxsize && return false
+    @something(cached_size, compute_complexity(tree, options)) > maxsize && return false
     count_depth(tree) > options.maxdepth && return false
     any_invalid = any(enumerate(options.op_constraints)) do (degree, degree_constraints)
         any(enumerate(degree_constraints)) do (op_idx, cons)

src/SearchUtils.jl

@@ -24,6 +24,7 @@ using ..ProgressBarsModule: WrappedProgressBar, manually_iterate!, barlen
 using ..AdaptiveParsimonyModule: RunningSearchStatistics
 using ..ExpressionBuilderModule: strip_metadata
 using ..InterfaceDynamicExpressionsModule: takes_eval_options
+using ..CheckConstraintsModule: check_constraints
 
 function logging_callback! end
 
@@ -724,6 +725,9 @@ function update_hall_of_fame!(
         if !valid_size
             continue
         end
+        if !check_constraints(member.tree, options, options.maxsize, size)
+            continue
+        end
         not_filled = !hall_of_fame.exists[size]
         better_than_current = member.cost < hall_of_fame.members[size].cost
         if not_filled || better_than_current