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

Timestamp:

03/23/10 01:31:17 (15 years ago)

Author:

swagner

Message:

Unified *SequentialSubScopesProcessor and *ParallelSubScopesProcessor (#943).

Location:

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3

Files:

• EvolutionStrategy.cs (modified) (previous)
• EvolutionStrategyMainLoop.cs (modified) (4 diffs)

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

@@ -145 +145 @@
       ResultsCollector resultsCollector = new ResultsCollector();
       WithoutRepeatingBatchedRandomSelector selector = new WithoutRepeatingBatchedRandomSelector();
-      SequentialSubScopesProcessor sequentialSubScopesProcessor1 = new SequentialSubScopesProcessor();
+      SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       Comparator useRecombinationComparator = new Comparator();
       ConditionalBranch useRecombinationBranch = new ConditionalBranch();
       ChildrenCreator childrenCreator = new ChildrenCreator();
-      UniformSequentialSubScopesProcessor uniformSequentialSubScopesProcessor1 = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor uniformSubScopesProcessor1 = new UniformSubScopesProcessor();
       Placeholder recombinator = new Placeholder();
       StrategyVectorManipulator strategyMutator1 = new StrategyVectorManipulator();
@@ -155 +155 @@
       Placeholder evaluator1 = new Placeholder();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
-      UniformSequentialSubScopesProcessor uniformSequentialSubScopesProcessor2 = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor uniformSubScopesProcessor2 = new UniformSubScopesProcessor();
       StrategyVectorManipulator strategyMutator2 = new StrategyVectorManipulator();
       Placeholder mutator2 = new Placeholder();
@@ -316 +316 @@
       visualizer1.Successor = resultsCollector;
       resultsCollector.Successor = selector;
-      selector.Successor = sequentialSubScopesProcessor1;
-      sequentialSubScopesProcessor1.Operators.Add(new EmptyOperator());
-      sequentialSubScopesProcessor1.Operators.Add(useRecombinationComparator);
-      sequentialSubScopesProcessor1.Successor = plusOrCommaReplacementBranch;
+      selector.Successor = subScopesProcessor1;
+      subScopesProcessor1.Operators.Add(new EmptyOperator());
+      subScopesProcessor1.Operators.Add(useRecombinationComparator);
+      subScopesProcessor1.Successor = plusOrCommaReplacementBranch;
       useRecombinationComparator.Successor = useRecombinationBranch;
       useRecombinationBranch.TrueBranch = childrenCreator;
-      useRecombinationBranch.FalseBranch = uniformSequentialSubScopesProcessor2;
+      useRecombinationBranch.FalseBranch = uniformSubScopesProcessor2;
       useRecombinationBranch.Successor = null;
-      childrenCreator.Successor = uniformSequentialSubScopesProcessor1;
-      uniformSequentialSubScopesProcessor1.Operator = recombinator;
-      uniformSequentialSubScopesProcessor1.Successor = null;
+      childrenCreator.Successor = uniformSubScopesProcessor1;
+      uniformSubScopesProcessor1.Operator = recombinator;
+      uniformSubScopesProcessor1.Successor = null;
       recombinator.Successor = strategyMutator1;
       strategyMutator1.Successor = mutator1;
@@ -332 +332 @@
       evaluator1.Successor = subScopesRemover;
       subScopesRemover.Successor = null;
-      uniformSequentialSubScopesProcessor2.Operator = strategyMutator2;
-      uniformSequentialSubScopesProcessor2.Successor = null;
+      uniformSubScopesProcessor2.Operator = strategyMutator2;
+      uniformSubScopesProcessor2.Successor = null;
       strategyMutator2.Successor = mutator2;
       mutator2.Successor = evaluator2;