Changeset 3626 for trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs

Timestamp:

05/05/10 11:34:35 (14 years ago)

Author:

abeham

Message:

Fixed build break in ES, LS, and SA due to Analyzer changes #999

File:

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

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

@@ -72 +72 @@
       get { return (ValueParameter<IntValue>)Parameters["SampleSize"]; }
     }
-    private ValueParameter<MultiAnalyzer> MoveAnalyzerParameter {
-      get { return (ValueParameter<MultiAnalyzer>)Parameters["MoveAnalyzer"]; }
-    }
-    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
-      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
+    private ValueParameter<MultiAnalyzer<IPopulationAnalyzer>> MoveAnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer<IPopulationAnalyzer>>)Parameters["MoveAnalyzer"]; }
+    }
+    private ValueParameter<MultiAnalyzer<ISolutionAnalyzer>> AnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>)Parameters["Analyzer"]; }
     }
     #endregion
@@ -109 +109 @@
       set { SampleSizeParameter.Value = value; }
     }
-    public MultiAnalyzer MoveAnalyzer {
+    public MultiAnalyzer<IPopulationAnalyzer> MoveAnalyzer {
       get { return MoveAnalyzerParameter.Value; }
       set { MoveAnalyzerParameter.Value = value; }
     }
-    public MultiAnalyzer Analyzer {
+    public MultiAnalyzer<ISolutionAnalyzer> Analyzer {
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
@@ -126 +126 @@
       get { return (LocalSearchMainLoop)SolutionsCreator.Successor; }
     }
-    private BestAverageWorstQualityAnalyzer moveQualityAnalyzer;
+    private PopulationBestAverageWorstQualityAnalyzer moveQualityAnalyzer;
     #endregion
 
@@ -140 +140 @@
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
       Parameters.Add(new ValueParameter<IntValue>("SampleSize", "Number of moves that MultiMoveGenerators should create. This is ignored for Exhaustive- and SingleMoveGenerators.", new IntValue(100)));
-      Parameters.Add(new ValueParameter<MultiAnalyzer>("MoveAnalyzer", "The operator used to analyze the moves in each iteration.", new MultiAnalyzer()));
-      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each iteration.", new MultiAnalyzer()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer<IPopulationAnalyzer>>("MoveAnalyzer", "The operator used to analyze the moves in each iteration.", new MultiAnalyzer<IPopulationAnalyzer>()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>("Analyzer", "The operator used to analyze each iteration.", new MultiAnalyzer<ISolutionAnalyzer>()));
       
       RandomCreator randomCreator = new RandomCreator();
@@ -268 +268 @@
     }
     private void InitializeAnalyzers() {
-      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      moveQualityAnalyzer = new PopulationBestAverageWorstQualityAnalyzer();
       ParameterizeAnalyzers();
     }
@@ -317 +317 @@
       MoveAnalyzer.Operators.Clear();
       MoveAnalyzer.Operators.Add(moveQualityAnalyzer);
-      /*if (Problem != null) {
+      if (Problem != null) {
         foreach (ISolutionAnalyzer analyzer in Problem.Operators.OfType<ISolutionAnalyzer>().OrderBy(x => x.Name))
           Analyzer.Operators.Add(analyzer);
-      }*/
+      }
     }
     private void ClearMoveParameters() {