Fixed an error introduced in the latest optimizations.

Luaancz · Jan 30, 2015 · 2ef329c · 2ef329c
1 parent 924928f
commit 2ef329c
Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/SalemOptimizer/InspirationalBranch.cs b/SalemOptimizer/InspirationalBranch.cs
@@ -86,6 +86,7 @@ public void Evaluate(EvaluationState engine)
         public InspirationalBranch Clone()
         {
             InspirationalBranch clone = new InspirationalBranch(solver);
+            clone.Inspirational = Inspirational;
 
             if (LeftNode != null) clone.LeftNode = LeftNode.Clone();
             if (RightNode != null) clone.RightNode = RightNode.Clone();

diff --git a/SalemOptimizer/Organism.cs b/SalemOptimizer/Organism.cs
@@ -71,7 +71,6 @@ public void Tick()
             clone.Mutate();
 
             var stateNew = new EvaluationState();
-            var stateOld = new EvaluationState();
 
             var newResult = Evaluate(clone, stateNew, problem);
 

diff --git a/SalemOptimizer/Solver.cs b/SalemOptimizer/Solver.cs
@@ -38,7 +38,14 @@ public Organism[] Solve(bool prune)
                 leaderboard.AddOrganism(organism);
             }
 
-            if (includedOrganisms != null) organisms.AddRange(includedOrganisms.Select(i => i.Clone()));
+            if (includedOrganisms != null)
+            {
+                foreach (var organism in includedOrganisms.Select(i => i.Clone()))
+                {
+                    organisms.Add(organism);
+                    leaderboard.AddOrganism(organism);
+                }
+            }
 
             var best = default(Organism);
             var worst = default(Organism);