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

Timestamp:

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

Author:

abeham

Message:

#893

• fixed wiring in the algorithms

File:

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

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

@@ -143 +143 @@
       get { return (TabuSearchMainLoop)SolutionsCreator.Successor; }
     }
+    [Storable]
     private BestAverageWorstQualityAnalyzer moveQualityAnalyzer;
+    [Storable]
     private TabuNeighborhoodAnalyzer tabuNeighborhoodAnalyzer;
     #endregion
@@ -188 +190 @@
       tsMainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
 
+      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      tabuNeighborhoodAnalyzer = new TabuNeighborhoodAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
       Initialize();
     }
@@ -195 +202 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       TabuSearch clone = (TabuSearch)base.Clone(cloner);
+      clone.moveQualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(moveQualityAnalyzer);
+      clone.tabuNeighborhoodAnalyzer = (TabuNeighborhoodAnalyzer)cloner.Clone(tabuNeighborhoodAnalyzer);
       clone.Initialize();
       return clone;
@@ -313 +322 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeAnalyzers();
-      UpdateAnalyzers();
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -325 +332 @@
       TabuCheckerParameter.ValueChanged += new EventHandler(TabuCheckerParameter_ValueChanged);
       SampleSizeParameter.NameChanged += new EventHandler(SampleSizeParameter_NameChanged);
-    }
-    private void InitializeAnalyzers() {
-      moveQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      tabuNeighborhoodAnalyzer = new TabuNeighborhoodAnalyzer();
-      ParameterizeAnalyzers();
     }
     private void UpdateMoveGenerator() {