Changeset 8642 for trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs

Timestamp:

09/13/12 13:13:00 (12 years ago)

Author:

jkarder

Message:

#1247: integrated branch into trunk

Location:

trunk/sources/HeuristicLab.Algorithms.RAPGA

Files:

• . (copied) (copied from branches/RAPGA/HeuristicLab.Algorithms.RAPGA)
• 3.3/RAPGAMainLoop.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs

@@ -166 +166 @@
       ProgressiveOffspringPreserver progressiveOffspringSelector = new ProgressiveOffspringPreserver();
       SubScopesCounter subScopesCounter2 = new SubScopesCounter();
-      Calculator calculator1 = new Calculator();
+      ExpressionCalculator calculator1 = new ExpressionCalculator();
       ConditionalBranch conditionalBranch1 = new ConditionalBranch();
       Comparator comparator1 = new Comparator();
@@ -179 +179 @@
       IntCounter intCounter3 = new IntCounter();
       SubScopesCounter subScopesCounter3 = new SubScopesCounter();
-      Calculator calculator2 = new Calculator();
+      ExpressionCalculator calculator2 = new ExpressionCalculator();
       Comparator comparator2 = new Comparator();
       ConditionalBranch conditionalBranch3 = new ConditionalBranch();