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

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

Location:

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3

Files:

• TabuNeighborhoodAnalyzer.cs (modified) (1 diff)
• TabuSearch.cs (modified) (4 diffs)

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Algorithms.TabuSearch {
-  public class TabuNeighborhoodAnalyzer : SingleSuccessorOperator, IPopulationAnalyzer {
+  public class TabuNeighborhoodAnalyzer : SingleSuccessorOperator, IAnalyzer {
     public SubScopesLookupParameter<BoolValue> IsTabuParameter {
       get { return (SubScopesLookupParameter<BoolValue>)Parameters["IsTabu"]; }

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

@@ -81 +81 @@
       get { return (ValueParameter<IntValue>)Parameters["SampleSize"]; }
     }
-    private ValueParameter<MultiAnalyzer<IPopulationAnalyzer>> MoveAnalyzerParameter {
-      get { return (ValueParameter<MultiAnalyzer<IPopulationAnalyzer>>)Parameters["MoveAnalyzer"]; }
-    }
-    private ValueParameter<MultiAnalyzer<ISolutionAnalyzer>> AnalyzerParameter {
-      get { return (ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>)Parameters["Analyzer"]; }
+    private ValueParameter<MultiAnalyzer> MoveAnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer>)Parameters["MoveAnalyzer"]; }
+    }
+    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
+      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
     #endregion
@@ -126 +126 @@
       set { MaximumIterationsParameter.Value = value; }
     }
-    public MultiAnalyzer<IPopulationAnalyzer> MoveAnalyzer {
+    public MultiAnalyzer MoveAnalyzer {
       get { return MoveAnalyzerParameter.Value; }
       set { MoveAnalyzerParameter.Value = value; }
     }
-    public MultiAnalyzer<ISolutionAnalyzer> Analyzer {
+    public MultiAnalyzer Analyzer {
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
@@ -159 +159 @@
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
       Parameters.Add(new ValueParameter<IntValue>("SampleSize", "The neighborhood size for stochastic sampling move generators", new IntValue(100)));
-      Parameters.Add(new ValueParameter<MultiAnalyzer<IPopulationAnalyzer>>("MoveAnalyzer", "The operator used to analyze the moves.", new MultiAnalyzer<IPopulationAnalyzer>()));
-      Parameters.Add(new ValueParameter<MultiAnalyzer<ISolutionAnalyzer>>("Analyzer", "The operator used to analyze the solution.", new MultiAnalyzer<ISolutionAnalyzer>()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer>("MoveAnalyzer", "The operator used to analyze the moves.", new MultiAnalyzer()));
+      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the solution.", new MultiAnalyzer()));
       
       RandomCreator randomCreator = new RandomCreator();
@@ -392 +392 @@
       MoveAnalyzer.Operators.Add(tabuNeighborhoodAnalyzer);
       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);
       }