Add functions to set constants

eureqa.jl

@@ -471,3 +471,42 @@ function run(
     end
     return pop
 end
+
+# Get all the constants from a tree
+function getConstants(tree::Node)::Array{Float32, 1}
+    if tree.degree == 0
+        if tree.constant
+            return [tree.val]
+        else
+            return Float32[]
+        end
+    elseif tree.degree == 1
+        return getConstants(tree.l)
+    else
+        both = [getConstants(tree.l), getConstants(tree.r)]
+        return [constant for subtree in both for constant in subtree]
+    end
+end
+
+# Set all the constants inside a tree
+function setConstants(tree::Node, constants::Array{Float32, 1})
+    if tree.degree == 0
+        if tree.constant
+            tree.val = constants[1]
+        end
+    elseif tree.degree == 1
+        setConstants(tree.l, constants)
+    else
+        numberLeft = countConstants(tree.l)
+        setConstants(tree.l, constants)
+        setConstants(tree.r, constants[numberLeft+1:end])
+    end
+end
+
+# Does nothing currently
+function optimizeConstants(member::PopMember)::PopMember
+    x0 = getConstants(member.tree)
+    return member
+end
+
+

paralleleureqa.jl

@@ -5,10 +5,11 @@ const nthreads = Threads.nthreads()
 # List of the best members seen all time
 mutable struct HallOfFame
     members::Array{PopMember, 1}
-    exists::Array{Bool, 1}
+    exists::Array{Bool, 1} #Whether it has been set
+    optimized::Array{Bool, 1} #Whether the constants have been optimized
 
     # Arranged by complexity - store one at each.
-    HallOfFame() = new([PopMember(Node(1f0), 1f9) for i=1:actualMaxsize], [false for i=1:actualMaxsize])
+    HallOfFame() = new([PopMember(Node(1f0), 1f9) for i=1:actualMaxsize], [false for i=1:actualMaxsize], [false for i=1:actualMaxsize])
 end
 
 
@@ -56,6 +57,7 @@ function fullRun(niterations::Integer;
                 betterThanAllSmaller = (numberSmallerAndBetter == 0)
                 if betterThanAllSmaller
                     debug(verbosity, "$size \t $(member.score-parsimony*size) \t $(stringTree(member.tree))")
+                    member = optimizeConstants(member)
                     push!(dominating, member)
                 end
             end
@@ -81,6 +83,5 @@ function fullRun(niterations::Integer;
                 end
             end
         end
-
     end
 end