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

Timestamp:

05/05/10 02:52:59 (14 years ago)

Author:

abeham

Message:

Updated local search to make use of Analyzers #999

File:

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

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

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Algorithms.LocalSearch {
@@ -71 +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"]; }
+    }
     #endregion
 
@@ -102 +109 @@
       set { SampleSizeParameter.Value = value; }
     }
+    public MultiAnalyzer MoveAnalyzer {
+      get { return MoveAnalyzerParameter.Value; }
+      set { MoveAnalyzerParameter.Value = value; }
+    }
+    public MultiAnalyzer Analyzer {
+      get { return AnalyzerParameter.Value; }
+      set { AnalyzerParameter.Value = value; }
+    }
     private RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
@@ -111 +126 @@
       get { return (LocalSearchMainLoop)SolutionsCreator.Successor; }
     }
-    #endregion
-
+    private BestAverageWorstQualityAnalyzer moveQualityAnalyzer;
+    #endregion
+
+    [StorableConstructor]
+    private LocalSearch(bool deserializing) : base(deserializing) { }
     public LocalSearch()
       : base() {
@@ -122 +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()));
+      
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
@@ -144 +164 @@
       lsMainLoop.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
       lsMainLoop.ResultsParameter.ActualName = "Results";
+      lsMainLoop.MoveAnalyzerParameter.ActualName = MoveAnalyzerParameter.Name;
+      lsMainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
 
       Initialize();
     }
-    [StorableConstructor]
-    private LocalSearch(bool deserializing) : base(deserializing) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -173 +193 @@
       ParameterizeMoveEvaluators();
       ParameterizeMoveMakers();
+      ParameterizeAnalyzers();
       UpdateMoveGenerator();
       UpdateMoveParameters();
+      UpdateAnalyzers();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -189 +211 @@
       ParameterizeMoveEvaluators();
       ParameterizeMoveMakers();
+      ParameterizeAnalyzers();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.Problem_EvaluatorChanged(sender, e);
@@ -202 +225 @@
       UpdateMoveGenerator();
       UpdateMoveParameters();
+      UpdateAnalyzers();
       ParameterizeMainLoop();
       ParameterizeMoveEvaluators();
@@ -219 +243 @@
       ParameterizeMoveEvaluators();
       ParameterizeMoveMakers();
+      ParameterizeAnalyzers();
     }
     private void MoveEvaluator_MoveQualityParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -224 +249 @@
       ParameterizeMoveEvaluators();
       ParameterizeMoveMakers();
+      ParameterizeAnalyzers();
     }
     #endregion
@@ -230 +256 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
+      InitializeAnalyzers();
+      UpdateAnalyzers();
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -238 +266 @@
       MoveGeneratorParameter.ValueChanged += new EventHandler(MoveGeneratorParameter_ValueChanged);
       MoveEvaluatorParameter.ValueChanged += new EventHandler(MoveEvaluatorParameter_ValueChanged);
+    }
+    private void InitializeAnalyzers() {
+      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      ParameterizeAnalyzers();
     }
     private void UpdateMoveGenerator() {
@@ -281 +313 @@
       }
     }
+    private void UpdateAnalyzers() {
+      Analyzer.Operators.Clear();
+      MoveAnalyzer.Operators.Clear();
+      MoveAnalyzer.Operators.Add(moveQualityAnalyzer);
+      /*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();
@@ -312 +353 @@
       }
     }
+    private void ParameterizeAnalyzers() {
+      moveQualityAnalyzer.ResultsParameter.ActualName = "Results";
+      if (Problem != null) {
+        moveQualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+        if (MoveEvaluator != null)
+          moveQualityAnalyzer.QualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
+        moveQualityAnalyzer.BestKnownQualityParameter.ActualName = Problem.BestKnownQualityParameter.Name;
+      }
+    }
     #endregion
   }