Changeset 5208 for trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy

Timestamp:

01/04/11 06:17:50 (14 years ago)

Author:

swagner

Message:

Adapted EAs to enable parallel solution evaluation (#1333)

File:

• trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategyMainLoop.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategyMainLoop.cs ¶

@@ -120 +120 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Mutator", "The operator used to mutate solutions."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Recombinator", "The operator used to cross solutions."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
@@ -142 +142 @@
       Placeholder strategyMutator1 = new Placeholder();
       Placeholder mutator1 = new Placeholder();
-      Placeholder evaluator1 = new Placeholder();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
       UniformSubScopesProcessor uniformSubScopesProcessor2 = new UniformSubScopesProcessor();
       Placeholder strategyMutator2 = new Placeholder();
       Placeholder mutator2 = new Placeholder();
-      Placeholder evaluator2 = new Placeholder();
+      UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
+      Placeholder evaluator = new Placeholder();
       ConditionalBranch plusOrCommaReplacementBranch = new ConditionalBranch();
       MergingReducer plusReplacement = new MergingReducer();
@@ -195 +195 @@
       mutator1.OperatorParameter.ActualName = MutatorParameter.Name;
 
-      evaluator1.Name = "Evaluator (placeholder)";
-      evaluator1.OperatorParameter.ActualName = EvaluatorParameter.Name;
-
       subScopesRemover.RemoveAllSubScopes = true;
 
@@ -206 +203 @@
       mutator2.OperatorParameter.ActualName = MutatorParameter.Name;
 
-      evaluator2.Name = "Evaluator (placeholder)";
-      evaluator2.OperatorParameter.ActualName = EvaluatorParameter.Name;
+      uniformSubScopesProcessor3.Parallel.Value = true;
+
+      evaluator.Name = "Evaluator (placeholder)";
+      evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
       plusOrCommaReplacementBranch.ConditionParameter.ActualName = PlusSelectionParameter.Name;
@@ -245 +244 @@
       useRecombinationBranch.TrueBranch = childrenCreator;
       useRecombinationBranch.FalseBranch = uniformSubScopesProcessor2;
-      useRecombinationBranch.Successor = null;
+      useRecombinationBranch.Successor = uniformSubScopesProcessor3;
       childrenCreator.Successor = uniformSubScopesProcessor1;
       uniformSubScopesProcessor1.Operator = recombinator;
@@ -252 +251 @@
       strategyRecombinator.Successor = strategyMutator1;
       strategyMutator1.Successor = mutator1;
-      mutator1.Successor = evaluator1;
-      evaluator1.Successor = subScopesRemover;
+      mutator1.Successor = subScopesRemover;
       subScopesRemover.Successor = null;
       uniformSubScopesProcessor2.Operator = strategyMutator2;
       uniformSubScopesProcessor2.Successor = null;
       strategyMutator2.Successor = mutator2;
-      mutator2.Successor = evaluator2;
+      mutator2.Successor = null;
+      uniformSubScopesProcessor3.Operator = evaluator;
+      uniformSubScopesProcessor3.Successor = null;
+      evaluator.Successor = null;
       plusOrCommaReplacementBranch.TrueBranch = plusReplacement;
       plusOrCommaReplacementBranch.FalseBranch = commaReplacement;