Changeset 3193 for trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

Timestamp:

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

Author:

swagner

Message:

Unified *SequentialSubScopesProcessor and *ParallelSubScopesProcessor (#943).

File:

• trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -123 +123 @@
       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();
       Placeholder tabuMoveEvaluator = new Placeholder();
@@ -132 +132 @@
       TabuSelector tabuSelector = new TabuSelector();
       RightReducer rightReducer = new RightReducer();
-      UniformSequentialSubScopesProcessor moveMakingProcessor = new UniformSequentialSubScopesProcessor();
+      UniformSubScopesProcessor moveMakingProcessor = new UniformSubScopesProcessor();
       Placeholder tabuMoveMaker = new Placeholder();
       Placeholder moveMaker = new Placeholder();
@@ -179 +179 @@
       resultsCollector.ResultsParameter.ActualName = "Results";
 
-      mainProcessor.Name = "Solution processor (UniformSequentialSubScopesProcessor)";
+      mainProcessor.Name = "Solution processor (UniformSubScopesProcessor)";
 
       moveGenerator.Name = "MoveGenerator (placeholder)";
@@ -204 +204 @@
       valuesCollector.DataTableParameter.ActualName = "MoveQualities";
 
-      moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
+      moveMakingProcessor.Name = "MoveMaking processor (UniformSubScopesProcessor)";
 
       tabuMoveMaker.Name = "TabuMoveMaker (placeholder)";