Changeset 5353 for trunk

Timestamp:

01/21/11 23:31:09 (14 years ago)

Author:

abeham

Message:

#1333

• Adapted local search to perform move evaluation in parallel (using the parallel engine)

File:

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

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

@@ -116 +116 @@
       Placeholder analyzer1 = new Placeholder();
       ResultsCollector resultsCollector1 = new ResultsCollector();
-      ResultsCollector resultsCollector2 = new ResultsCollector();
       SubScopesProcessor mainProcessor = new SubScopesProcessor();
       Placeholder moveGenerator = new Placeholder();
       UniformSubScopesProcessor moveEvaluationProcessor = new UniformSubScopesProcessor();
       Placeholder moveEvaluator = new Placeholder();
-      IntCounter evaluatedMovesCounter = new IntCounter();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       BestSelector bestSelector = new BestSelector();
       SubScopesProcessor moveMakingProcessor = new SubScopesProcessor();
@@ -134 +133 @@
       IntCounter iterationsCounter = new IntCounter();
       Comparator iterationsComparator = new Comparator();
-      ResultsCollector resultsCollector3 = new ResultsCollector();
       ConditionalBranch iterationsTermination = new ConditionalBranch();
 
@@ -151 +149 @@
       resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
       resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
+      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));
       resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name;
-
-      resultsCollector2.CopyValue = new BoolValue(true);
-      resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));
-      resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name;
 
       moveGenerator.Name = "MoveGenerator (placeholder)";
       moveGenerator.OperatorParameter.ActualName = MoveGeneratorParameter.Name;
 
+      moveEvaluationProcessor.Parallel = new BoolValue(true);
+
       moveEvaluator.Name = "MoveEvaluator (placeholder)";
       moveEvaluator.OperatorParameter.ActualName = MoveEvaluatorParameter.Name;
 
-      evaluatedMovesCounter.Name = "EvaluatedMoves + 1";
-      evaluatedMovesCounter.ValueParameter.ActualName = "EvaluatedMoves";
-      evaluatedMovesCounter.Increment = new IntValue(1);
+      subScopesCounter.Name = "Increment EvaluatedMoves";
+      subScopesCounter.ValueParameter.ActualName = "EvaluatedMoves";
 
       bestSelector.CopySelected = new BoolValue(false);
@@ -199 +195 @@
       iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
       iterationsComparator.ResultParameter.ActualName = "Terminate";
-
-      resultsCollector3.CopyValue = new BoolValue(true);
-      resultsCollector3.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));
-      resultsCollector3.ResultsParameter.ActualName = ResultsParameter.Name;
 
       iterationsTermination.Name = "Iterations Termination Condition";
@@ -215 +207 @@
       bestQualityInitializer.Successor = analyzer1;
       analyzer1.Successor = null;
-      resultsCollector1.Successor = resultsCollector2;
-      resultsCollector2.Successor = mainProcessor;
+      resultsCollector1.Successor = mainProcessor;
       mainProcessor.Operators.Add(moveGenerator);
       mainProcessor.Successor = iterationsCounter;
       moveGenerator.Successor = moveEvaluationProcessor;
       moveEvaluationProcessor.Operator = moveEvaluator;
-      moveEvaluationProcessor.Successor = bestSelector;
-      moveEvaluator.Successor = evaluatedMovesCounter;
-      evaluatedMovesCounter.Successor = null;
+      moveEvaluationProcessor.Successor = subScopesCounter;
+      moveEvaluator.Successor = null;
+      subScopesCounter.Successor = bestSelector;
       bestSelector.Successor = moveMakingProcessor;
       moveMakingProcessor.Operators.Add(new EmptyOperator());
@@ -239 +230 @@
       subScopesRemover.Successor = null;
       iterationsCounter.Successor = iterationsComparator;
-      iterationsComparator.Successor = resultsCollector3;
-      resultsCollector3.Successor = iterationsTermination;
+      iterationsComparator.Successor = iterationsTermination;
       iterationsTermination.TrueBranch = null;
       iterationsTermination.FalseBranch = mainProcessor;