Catch domain errors during classical optimization

julia/sr.jl

@@ -689,21 +689,30 @@ function optimizeConstants(member::PopMember)::PopMember
         algorithm = Optim.NelderMead
     end
 
-    result = Optim.optimize(f, x0, algorithm(), Optim.Options(iterations=100))
-    # Try other initial conditions:
-    for i=1:nrestarts
-        tmpresult = Optim.optimize(f, x0 .* (1f0 .+ 5f-1*randn(Float32, size(x0)[1])), algorithm(), Optim.Options(iterations=100))
-        if tmpresult.minimum < result.minimum
-            result = tmpresult
+    try
+        result = Optim.optimize(f, x0, algorithm(), Optim.Options(iterations=100))
+        # Try other initial conditions:
+        for i=1:nrestarts
+            tmpresult = Optim.optimize(f, x0 .* (1f0 .+ 5f-1*randn(Float32, size(x0)[1])), algorithm(), Optim.Options(iterations=100))
+            if tmpresult.minimum < result.minimum
+                result = tmpresult
+            end
         end
-    end
 
-    if Optim.converged(result)
-        setConstants(member.tree, result.minimizer)
-        member.score = convert(Float32, result.minimum)
-        member.birth = getTime()
-    else
-        setConstants(member.tree, x0)
+        if Optim.converged(result)
+            setConstants(member.tree, result.minimizer)
+            member.score = convert(Float32, result.minimum)
+            member.birth = getTime()
+        else
+            setConstants(member.tree, x0)
+        end
+    catch error
+        # Fine if optimization encountered domain error, just return x0
+        if isa(error, AssertionError)
+            setConstants(member.tree, x0)
+        else
+            throw(error)
+        end
     end
     return member
 end

pysr/sr.py

@@ -113,7 +113,7 @@ def pysr(X=None, y=None, threads=4,
         y = eval(eval_str)
         print("Running on", eval_str)
 
-    pkg_directory = '/'.join(__file__.split('/')[:-2] + ['/julia'])
+    pkg_directory = '/'.join(__file__.split('/')[:-2] + ['julia'])
 
     def_hyperparams = f"""include("{pkg_directory}/operators.jl")
 const binops = {'[' + ', '.join(binary_operators) + ']'}