Changeset 5354 for trunk

Timestamp:

01/22/11 00:12:47 (14 years ago)

Author:

abeham

Message:

#1333

• Adapated Tabu Search to run move evaluations and tabu check in parallel

File:

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

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

@@ -139 +139 @@
       Placeholder analyzer1 = new Placeholder();
       ResultsCollector resultsCollector1 = new ResultsCollector();
-      ResultsCollector resultsCollector2 = new ResultsCollector();
       SubScopesProcessor solutionProcessor = new SubScopesProcessor();
       Placeholder moveGenerator = new Placeholder();
       UniformSubScopesProcessor moveEvaluationProcessor = new UniformSubScopesProcessor();
       Placeholder moveEvaluator = new Placeholder();
-      IntCounter evaluatedMovesCounter = new IntCounter();
       Placeholder tabuChecker = new Placeholder();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       SubScopesSorter moveQualitySorter = new SubScopesSorter();
       TabuSelector tabuSelector = new TabuSelector();
@@ -160 +159 @@
       IntCounter iterationsCounter = new IntCounter();
       Comparator iterationsComparator = new Comparator();
-      ResultsCollector resultsCollector3 = new ResultsCollector();
       ConditionalBranch iterationsTermination = new ConditionalBranch();
 
@@ -180 +178 @@
       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);
-
       tabuChecker.Name = "TabuChecker (placeholder)";
       tabuChecker.OperatorParameter.ActualName = TabuCheckerParameter.Name;
+
+      subScopesCounter.Name = "Increment EvaluatedMoves";
+      subScopesCounter.ValueParameter.ActualName = "EvaluatedMoves";
 
       moveQualitySorter.DescendingParameter.ActualName = MaximizationParameter.Name;
@@ -241 +237 @@
       iterationsComparator.ResultParameter.ActualName = "Terminate";
 
-      resultsCollector3.CopyValue = new BoolValue(true);
-      resultsCollector3.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));
-      resultsCollector3.ResultsParameter.ActualName = ResultsParameter.Name;
-
       emptyNeighborhoodBranch2.Name = "Neighborhood empty?";
       emptyNeighborhoodBranch2.ConditionParameter.ActualName = "EmptyNeighborhood";
@@ -259 +251 @@
       bestQualityInitializer.Successor = analyzer1;
       analyzer1.Successor = null;
-      resultsCollector1.Successor = resultsCollector2;
-      resultsCollector2.Successor = solutionProcessor;
+      resultsCollector1.Successor = solutionProcessor;
       solutionProcessor.Operators.Add(moveGenerator);
       solutionProcessor.Successor = iterationsCounter;
       moveGenerator.Successor = moveEvaluationProcessor;
       moveEvaluationProcessor.Operator = moveEvaluator;
-      moveEvaluationProcessor.Successor = moveQualitySorter;
-      moveEvaluator.Successor = evaluatedMovesCounter;
-      evaluatedMovesCounter.Successor = tabuChecker;
+      moveEvaluationProcessor.Successor = subScopesCounter;
+      moveEvaluator.Successor = tabuChecker;
       tabuChecker.Successor = null;
+      subScopesCounter.Successor = moveQualitySorter;
       moveQualitySorter.Successor = tabuSelector;
       tabuSelector.Successor = emptyNeighborhoodBranch1;
@@ -285 +276 @@
       subScopesRemover.Successor = null;
       iterationsCounter.Successor = iterationsComparator;
-      iterationsComparator.Successor = resultsCollector3;
-      resultsCollector3.Successor = emptyNeighborhoodBranch2;
+      iterationsComparator.Successor = emptyNeighborhoodBranch2;
       emptyNeighborhoodBranch2.TrueBranch = null;
       emptyNeighborhoodBranch2.FalseBranch = iterationsTermination;