Changeset 3096 for trunk/sources/HeuristicLab.Algorithms.LS

Timestamp:

03/18/10 04:11:49 (14 years ago)

Author:

swagner

Message:

Replaced LeftSelector and RightSelector by BestSelector and WorstSelector (#926)

File:

• trunk/sources/HeuristicLab.Algorithms.LS/3.3/LSMainLoop.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.LS/3.3/LSMainLoop.cs

@@ -97 +97 @@
       UniformSequentialSubScopesProcessor moveEvaluationProcessor = new UniformSequentialSubScopesProcessor();
       Placeholder moveEvaluator = new Placeholder();
-      SubScopesSorter moveQualitySorter = new SubScopesSorter();
-      LeftSelector leftSelector = new LeftSelector();
+      BestSelector bestSelector = new BestSelector();
       RightReducer rightReducer = new RightReducer();
       UniformSequentialSubScopesProcessor moveMakingProcessor = new UniformSequentialSubScopesProcessor();
@@ -127 +126 @@
       moveEvaluator.OperatorParameter.ActualName = "MoveEvaluator";
 
-      moveQualitySorter.DescendingParameter.ActualName = "Maximization";
-      moveQualitySorter.ValueParameter.ActualName = "MoveQuality";
-
-      leftSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+      bestSelector.CopySelected = new BoolValue(false);
+      bestSelector.MaximizationParameter.ActualName = "Maximization";
+      bestSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(1);
+      bestSelector.QualityParameter.ActualName = "MoveQuality";
 
       moveMakingProcessor.Name = "MoveMaking processor (UniformSequentialSubScopesProcessor)";
@@ -170 +169 @@
       moveGenerator.Successor = moveEvaluationProcessor;
       moveEvaluationProcessor.Operator = moveEvaluator;
-      moveEvaluationProcessor.Successor = moveQualitySorter;
-      moveQualitySorter.Successor = leftSelector;
-      leftSelector.Successor = rightReducer;
+      moveEvaluationProcessor.Successor = bestSelector;
+      bestSelector.Successor = rightReducer;
       rightReducer.Successor = moveMakingProcessor;
       moveMakingProcessor.Operator = qualityComparator;