Changeset 3689 for trunk/sources/HeuristicLab.Algorithms.LocalSearch

Timestamp:

05/07/10 02:08:30 (15 years ago)

Author:

abeham

Message:

#893

• fixed wiring in the algorithms

File:

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

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

@@ -126 +126 @@
       get { return (LocalSearchMainLoop)SolutionsCreator.Successor; }
     }
+    [Storable]
     private BestAverageWorstQualityAnalyzer moveQualityAnalyzer;
     #endregion
@@ -167 +168 @@
       lsMainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
 
+      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
       Initialize();
     }
@@ -172 +177 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       LocalSearch clone = (LocalSearch)base.Clone(cloner);
+      clone.moveQualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(moveQualityAnalyzer);
       clone.Initialize();
       return clone;
@@ -257 +263 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeAnalyzers();
-      UpdateAnalyzers();
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -267 +271 @@
       MoveGeneratorParameter.ValueChanged += new EventHandler(MoveGeneratorParameter_ValueChanged);
       MoveEvaluatorParameter.ValueChanged += new EventHandler(MoveEvaluatorParameter_ValueChanged);
-    }
-    private void InitializeAnalyzers() {
-      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      ParameterizeAnalyzers();
     }
     private void UpdateMoveGenerator() {