Changeset 3193 for trunk/sources/HeuristicLab.Algorithms.SGA/3.3

Timestamp:

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

Author:

swagner

Message:

Unified *SequentialSubScopesProcessor and *ParallelSubScopesProcessor (#943).

File:

• trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGAMainLoop.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGAMainLoop.cs

@@ -124 +124 @@
       ResultsCollector resultsCollector = new ResultsCollector();
       Placeholder selector = new Placeholder();
-      SequentialSubScopesProcessor sequentialSubScopesProcessor1 = new SequentialSubScopesProcessor();
+      SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       ChildrenCreator childrenCreator = new ChildrenCreator();
-      UniformSequentialSubScopesProcessor uniformSequentialSubScopesProcessor = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor uniformSubScopesProcessor = new UniformSubScopesProcessor();
       Placeholder crossover = new Placeholder();
       StochasticBranch stochasticBranch = new StochasticBranch();
@@ -132 +132 @@
       Placeholder evaluator = new Placeholder();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
-      SequentialSubScopesProcessor sequentialSubScopesProcessor2 = new SequentialSubScopesProcessor();
+      SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
       BestSelector bestSelector = new BestSelector();
       RightReducer rightReducer = new RightReducer();
@@ -263 +263 @@
       visualizer1.Successor = resultsCollector;
       resultsCollector.Successor = selector;
-      selector.Successor = sequentialSubScopesProcessor1;
-      sequentialSubScopesProcessor1.Operators.Add(new EmptyOperator());
-      sequentialSubScopesProcessor1.Operators.Add(childrenCreator);
-      sequentialSubScopesProcessor1.Successor = sequentialSubScopesProcessor2;
-      childrenCreator.Successor = uniformSequentialSubScopesProcessor;
-      uniformSequentialSubScopesProcessor.Operator = crossover;
-      uniformSequentialSubScopesProcessor.Successor = null;
+      selector.Successor = subScopesProcessor1;
+      subScopesProcessor1.Operators.Add(new EmptyOperator());
+      subScopesProcessor1.Operators.Add(childrenCreator);
+      subScopesProcessor1.Successor = subScopesProcessor2;
+      childrenCreator.Successor = uniformSubScopesProcessor;
+      uniformSubScopesProcessor.Operator = crossover;
+      uniformSubScopesProcessor.Successor = null;
       crossover.Successor = stochasticBranch;
       stochasticBranch.FirstBranch = mutator;
@@ -277 +277 @@
       evaluator.Successor = subScopesRemover;
       subScopesRemover.Successor = null;
-      sequentialSubScopesProcessor2.Operators.Add(bestSelector);
-      sequentialSubScopesProcessor2.Operators.Add(new EmptyOperator());
-      sequentialSubScopesProcessor2.Successor = mergingReducer;
+      subScopesProcessor2.Operators.Add(bestSelector);
+      subScopesProcessor2.Operators.Add(new EmptyOperator());
+      subScopesProcessor2.Successor = mergingReducer;
       bestSelector.Successor = rightReducer;
       rightReducer.Successor = null;