Changeset 3626

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

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategy.cs (modified) (previous)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified) (6 diffs)
• HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified) (6 diffs)
• HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs (modified) (4 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() {

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

@@ -81 +81 @@
       get { return (ValueParameter<DoubleValue>)Parameters["EndTemperature"]; }
     }
-    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
-      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
+    private ValueParameter<MultiAnalyzer<ISolutionAnalyzer>> AnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>)Parameters["Analyzer"]; }
     }
     #endregion
@@ -123 +123 @@
       set { EndTemperatureParameter.Value = value; }
     }
-    public MultiAnalyzer Analyzer {
+    public MultiAnalyzer<ISolutionAnalyzer> Analyzer {
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
@@ -141 +141 @@
       get { return annealingOperators; }
     }
-    private BestAverageWorstQualityAnalyzer qualityAnalyzer;
+    private SolutionQualityAnalyzer qualityAnalyzer;
     #endregion
 
@@ -158 +158 @@
       Parameters.Add(new ValueParameter<DoubleValue>("StartTemperature", "The initial temperature.", new DoubleValue(100)));
       Parameters.Add(new ValueParameter<DoubleValue>("EndTemperature", "The final temperature which should be reached when iterations reaches maximum iterations.", new DoubleValue(1e-6)));
-      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer<ISolutionAnalyzer>()));
       
       RandomCreator randomCreator = new RandomCreator();
@@ -297 +297 @@
     }
     private void InitializeAnalyzers() {
-      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      qualityAnalyzer = new SolutionQualityAnalyzer();
       ParameterizeAnalyzers();
     }
@@ -401 +401 @@
       Analyzer.Operators.Add(qualityAnalyzer);
       if (Problem != null) {
-        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name))
+        foreach (ISolutionAnalyzer analyzer in Problem.Operators.OfType<ISolutionAnalyzer>().OrderBy(x => x.Name))
           Analyzer.Operators.Add(analyzer);
       }

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs

@@ -116 +116 @@
       VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector1 = new ResultsCollector();
+      SubScopesProcessor subScopesProcessor0 = new SubScopesProcessor();
       Placeholder analyzer1 = new Placeholder();
       SubScopesProcessor sssp = new SubScopesProcessor();
@@ -131 +132 @@
       Comparator iterationsComparator = new Comparator();
       ResultsCollector resultsCollector2 = new ResultsCollector();
+      SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       Placeholder analyzer2 = new Placeholder();
       ConditionalBranch iterationsTermination = new ConditionalBranch();
@@ -189 +191 @@
       OperatorGraph.InitialOperator = variableCreator;
       variableCreator.Successor = resultsCollector1;
-      resultsCollector1.Successor = analyzer1;
-      analyzer1.Successor = sssp;
+      resultsCollector1.Successor = subScopesProcessor0;
+      subScopesProcessor0.Operators.Add(analyzer1);
+      subScopesProcessor0.Successor = sssp;
       sssp.Operators.Add(resultsCollector);
       resultsCollector.Successor = null;
@@ -205 +208 @@
       iterationsCounter.Successor = iterationsComparator;
       iterationsComparator.Successor = resultsCollector2;
-      resultsCollector2.Successor = analyzer2;
-      analyzer2.Successor = iterationsTermination;
+      resultsCollector2.Successor = subScopesProcessor1;
+      subScopesProcessor1.Operators.Add(analyzer2);
+      subScopesProcessor1.Successor = iterationsTermination;
       iterationsTermination.TrueBranch = null;
       iterationsTermination.FalseBranch = annealingOperator;