Changeset 3658 for trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing

Timestamp:

05/05/10 23:27:50 (15 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• removed specific analyzer interfaces
• adapted MultiAnalyzer

File:

• trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified) (4 diffs)

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

@@ -81 +81 @@
       get { return (ValueParameter<DoubleValue>)Parameters["EndTemperature"]; }
     }
-    private ValueParameter<MultiAnalyzer<ISolutionAnalyzer>> AnalyzerParameter {
-      get { return (ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>)Parameters["Analyzer"]; }
+    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
     #endregion
@@ -123 +123 @@
       set { EndTemperatureParameter.Value = value; }
     }
-    public MultiAnalyzer<ISolutionAnalyzer> Analyzer {
+    public MultiAnalyzer Analyzer {
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
@@ -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<ISolutionAnalyzer>>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer<ISolutionAnalyzer>()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
       
       RandomCreator randomCreator = new RandomCreator();
@@ -401 +401 @@
       Analyzer.Operators.Add(qualityAnalyzer);
       if (Problem != null) {
-        foreach (ISolutionAnalyzer analyzer in Problem.Operators.OfType<ISolutionAnalyzer>().OrderBy(x => x.Name))
+        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name))
           Analyzer.Operators.Add(analyzer);
       }