Changeset 5356 for trunk/sources/HeuristicLab.Algorithms.LocalSearch

Timestamp:

01/22/11 15:18:20 (14 years ago)

Author:

abeham

Message:

#1344

• Adapted all algorithms to count evaluated solutions / moves and outside of the parallel region
• Used the same pattern in every algorithm: Initialize and collect the variable in the Algorithm and increment it in the main loops and main operators

Location:

trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3

Files:

• LocalSearch.cs (modified) (4 diffs)
• LocalSearchMainLoop.cs (modified) (5 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
@@ -117 +118 @@
     }
     private LocalSearchMainLoop MainLoop {
-      get { return (LocalSearchMainLoop)SolutionsCreator.Successor; }
+      get {
+        return (LocalSearchMainLoop)(
+          (ResultsCollector)(
+            (VariableCreator)SolutionsCreator.Successor
+          ).Successor
+        ).Successor;
+      }
     }
     [Storable]
@@ -150 +157 @@
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
-      LocalSearchMainLoop lsMainLoop = new LocalSearchMainLoop();
+      VariableCreator variableCreator = new VariableCreator();
+      ResultsCollector resultsCollector = new ResultsCollector();
+      LocalSearchMainLoop mainLoop = new LocalSearchMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
 
@@ -161 +170 @@
 
       solutionsCreator.NumberOfSolutions = new IntValue(1);
-      solutionsCreator.Successor = lsMainLoop;
-
-      lsMainLoop.MoveGeneratorParameter.ActualName = MoveGeneratorParameter.Name;
-      lsMainLoop.MoveMakerParameter.ActualName = MoveMakerParameter.Name;
-      lsMainLoop.MoveEvaluatorParameter.ActualName = MoveEvaluatorParameter.Name;
-      lsMainLoop.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
-      lsMainLoop.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
-      lsMainLoop.ResultsParameter.ActualName = "Results";
-      lsMainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
+      solutionsCreator.Successor = variableCreator;
+
+      variableCreator.Name = "Initialize EvaluatedMoves";
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedMoves", new IntValue()));
+      variableCreator.Successor = resultsCollector;
+
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));
+      resultsCollector.ResultsParameter.ActualName = "Results";
+      resultsCollector.Successor = mainLoop;
+
+      mainLoop.MoveGeneratorParameter.ActualName = MoveGeneratorParameter.Name;
+      mainLoop.MoveMakerParameter.ActualName = MoveMakerParameter.Name;
+      mainLoop.MoveEvaluatorParameter.ActualName = MoveEvaluatorParameter.Name;
+      mainLoop.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
+      mainLoop.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
+      mainLoop.ResultsParameter.ActualName = "Results";
+      mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
+      mainLoop.EvaluatedMovesParameter.ActualName = "EvaluatedMoves";
 
       moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();

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

@@ -70 +70 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; }
     }
-
-    private ScopeParameter CurrentScopeParameter {
-      get { return (ScopeParameter)Parameters["CurrentScope"]; }
-    }
-    public IScope CurrentScope {
-      get { return CurrentScopeParameter.ActualValue; }
+    public LookupParameter<IntValue> EvaluatedMovesParameter {
+      get { return (LookupParameter<IntValue>)Parameters["EvaluatedMoves"]; }
     }
     #endregion
@@ -107 +103 @@
 
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze the solution and moves."));
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the TS should be applied."));
+      Parameters.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of evaluated moves."));
       #endregion
 
@@ -137 +133 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0))); // Class LocalSearch expects this to be called Iterations
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedMoves", new IntValue(0)));
 
       bestQualityInitializer.Name = "Initialize BestQuality";
@@ -149 +144 @@
       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;
 
@@ -161 +155 @@
 
       subScopesCounter.Name = "Increment EvaluatedMoves";
-      subScopesCounter.ValueParameter.ActualName = "EvaluatedMoves";
+      subScopesCounter.ValueParameter.ActualName = EvaluatedMovesParameter.Name;
 
       bestSelector.CopySelected = new BoolValue(false);