Changeset 3193 for trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

Timestamp:

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

Author:

swagner

Message:

Unified *SequentialSubScopesProcessor and *ParallelSubScopesProcessor (#943).

File:

• trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

@@ -116 +116 @@
       Placeholder visualizer1 = new Placeholder();
       ResultsCollector resultsCollector = new ResultsCollector();
-      UniformSequentialSubScopesProcessor mainProcessor = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor mainProcessor = new UniformSubScopesProcessor();
       Placeholder moveGenerator = new Placeholder();
-      UniformSequentialSubScopesProcessor moveEvaluationProcessor = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor moveEvaluationProcessor = new UniformSubScopesProcessor();
       Placeholder moveEvaluator = new Placeholder();
       BestSelector bestSelector = new BestSelector();
       RightReducer rightReducer = new RightReducer();
-      UniformSequentialSubScopesProcessor moveMakingProcessor = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor moveMakingProcessor = new UniformSubScopesProcessor();
       QualityComparator qualityComparator = new QualityComparator();
       ConditionalBranch improvesQualityBranch = new ConditionalBranch();
@@ -167 +167 @@
       resultsCollector.ResultsParameter.ActualName = ResultsParameter.Name;
 
-      mainProcessor.Name = "Solution processor (UniformSequentialSubScopesProcessor)";
+      mainProcessor.Name = "Solution processor (UniformSubScopesProcessor)";
 
       moveGenerator.Name = "MoveGenerator (placeholder)";
@@ -180 +180 @@
       bestSelector.QualityParameter.ActualName = MoveQualityParameter.Name;
 
-      moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
+      moveMakingProcessor.Name = "MoveMaking processor (UniformSubScopesProcessor)";
 
       qualityComparator.LeftSideParameter.ActualName = MoveQualityParameter.Name;