Changeset 9555 for trunk

Timestamp:

05/29/13 14:30:34 (12 years ago)

Author:

mkommend

Message:

#2038: Adapted GAMainLoop to reuse the existing evaluator block for reevaluations of elites.

File:

• trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs

@@ -148 +148 @@
       ConditionalBranch conditionalBranch = new ConditionalBranch();
       ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();
-      UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
-      Placeholder evaluator2 = new Placeholder();
-      SubScopesCounter subScopesCounter2 = new SubScopesCounter();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GeneticAlgorithm expects this to be called Generations
@@ -204 +201 @@
       reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";
       reevaluateElitesBranch.Name = "Reevaluate elites ?";
-
-      uniformSubScopesProcessor3.Parallel.Value = true;
-
-      evaluator2.Name = "Evaluator";
-      evaluator2.OperatorParameter.ActualName = "Evaluator";
-
-      subScopesCounter2.Name = "Increment EvaluatedSolutions";
-      subScopesCounter2.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
-
       #endregion
 
@@ -242 +230 @@
       bestSelector.Successor = rightReducer;
       rightReducer.Successor = reevaluateElitesBranch;
-      reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor3;
-      uniformSubScopesProcessor3.Operator = evaluator;
-      uniformSubScopesProcessor3.Successor = subScopesCounter2;
+      reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor2;
       reevaluateElitesBranch.FalseBranch = null;
       reevaluateElitesBranch.Successor = null;