Changeset 3636 for trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

Timestamp:

05/05/10 14:52:19 (14 years ago)

Author:

abeham

Message:

#999

• changes in LS
  • counting evaluated moves
  • tracking best quality which is needed by the algorithm
• changes in TS
  • adapted to analyzer
  • added a neighborhood analyzer that shows what percentage of the neighborhood is tabu

File:

• trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (17 diffs)

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

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Algorithms.TabuSearch {
@@ -80 +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"]; }
+    }
     #endregion
 
@@ -119 +126 @@
       set { MaximumIterationsParameter.Value = value; }
     }
+    public MultiAnalyzer<IPopulationAnalyzer> MoveAnalyzer {
+      get { return MoveAnalyzerParameter.Value; }
+      set { MoveAnalyzerParameter.Value = value; }
+    }
+    public MultiAnalyzer<ISolutionAnalyzer> Analyzer {
+      get { return AnalyzerParameter.Value; }
+      set { AnalyzerParameter.Value = value; }
+    }
     private RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
@@ -128 +143 @@
       get { return (TabuSearchMainLoop)SolutionsCreator.Successor; }
     }
+    private PopulationBestAverageWorstQualityAnalyzer moveQualityAnalyzer;
+    private TabuNeighborhoodAnalyzer tabuNeighborhoodAnalyzer;
     #endregion
 
@@ -142 +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>()));
+      
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
@@ -166 +185 @@
       tsMainLoop.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
       tsMainLoop.ResultsParameter.ActualName = "Results";
+      tsMainLoop.MoveAnalyzerParameter.ActualName = MoveAnalyzerParameter.Name;
+      tsMainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
 
       Initialize();
@@ -199 +220 @@
       UpdateMoveGenerator();
       UpdateMoveParameters();
+      UpdateAnalyzers();
       ParameterizeMoveGenerators();
       ParameterizeMoveEvaluator();
@@ -204 +226 @@
       ParameterizeTabuMaker();
       ParameterizeTabuChecker();
+      ParameterizeAnalyzers();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -220 +243 @@
       ParameterizeTabuMaker();
       ParameterizeTabuChecker();
+      ParameterizeAnalyzers();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.Problem_EvaluatorChanged(sender, e);
@@ -237 +261 @@
       UpdateMoveGenerator();
       UpdateMoveParameters();
+      UpdateAnalyzers();
       ParameterizeMainLoop();
       ParameterizeMoveGenerators();
@@ -243 +268 @@
       ParameterizeTabuMaker();
       ParameterizeTabuChecker();
+      ParameterizeAnalyzers();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -261 +287 @@
       ParameterizeTabuMaker();
       ParameterizeTabuChecker();
+      ParameterizeAnalyzers();
     }
     private void MoveEvaluator_MoveQualityParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -268 +295 @@
       ParameterizeTabuMaker();
       ParameterizeTabuChecker();
+      ParameterizeAnalyzers();
     }
     private void TabuCheckerParameter_ValueChanged(object sender, EventArgs e) {
       ParameterizeMainLoop();
+      ParameterizeAnalyzers();
     }
     private void TabuChecker_MoveTabuParameter_ActualNameChanged(object sender, EventArgs e) {
       ParameterizeMainLoop();
+      ParameterizeAnalyzers();
     }
     private void SampleSizeParameter_NameChanged(object sender, EventArgs e) {
@@ -283 +313 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
+      InitializeAnalyzers();
+      UpdateAnalyzers();
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -293 +325 @@
       TabuCheckerParameter.ValueChanged += new EventHandler(TabuCheckerParameter_ValueChanged);
       SampleSizeParameter.NameChanged += new EventHandler(SampleSizeParameter_NameChanged);
+    }
+    private void InitializeAnalyzers() {
+      moveQualityAnalyzer = new PopulationBestAverageWorstQualityAnalyzer();
+      tabuNeighborhoodAnalyzer = new TabuNeighborhoodAnalyzer();
+      ParameterizeAnalyzers();
     }
     private void UpdateMoveGenerator() {
@@ -349 +386 @@
       }
     }
+    private void UpdateAnalyzers() {
+      Analyzer.Operators.Clear();
+      MoveAnalyzer.Operators.Clear();
+      MoveAnalyzer.Operators.Add(moveQualityAnalyzer);
+      MoveAnalyzer.Operators.Add(tabuNeighborhoodAnalyzer);
+      if (Problem != null) {
+        foreach (ISolutionAnalyzer analyzer in Problem.Operators.OfType<ISolutionAnalyzer>().OrderBy(x => x.Name))
+          Analyzer.Operators.Add(analyzer);
+      }
+    }
     private void ClearMoveParameters() {
       MoveMakerParameter.ValidValues.Clear();
@@ -405 +452 @@
       }
     }
+    private void ParameterizeAnalyzers() {
+      moveQualityAnalyzer.ResultsParameter.ActualName = "Results";
+      tabuNeighborhoodAnalyzer.ResultsParameter.ActualName = "Results";
+      tabuNeighborhoodAnalyzer.PercentTabuParameter.ActualName = "PercentTabu";
+      if (Problem != null) {
+        moveQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+        if (MoveEvaluator != null)
+          moveQualityAnalyzer.QualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
+        moveQualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
+        if (TabuChecker != null)
+          tabuNeighborhoodAnalyzer.IsTabuParameter.ActualName = TabuChecker.MoveTabuParameter.ActualName;
+      }
+    }
     #endregion
   }