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

Timestamp:

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

Author:

abeham

Message:

#893

• fixed wiring in the algorithms

File:

• trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs (modified) (6 diffs)

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

@@ -136 +136 @@
       get { return (SimulatedAnnealingMainLoop)SolutionsCreator.Successor; }
     }
-
-    private List<IDiscreteDoubleValueModifier> annealingOperators;
-    private IEnumerable<IDiscreteDoubleValueModifier> AnnealingOperators {
-      get { return annealingOperators; }
-    }
+    [Storable]
     private QualityAnalyzer qualityAnalyzer;
     #endregion
@@ -186 +182 @@
       mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
 
+      foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
+        AnnealingOperatorParameter.ValidValues.Add(op);
+      ParameterizeAnnealingOperators();
+
+      qualityAnalyzer = new QualityAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
       Initialize();
     }
@@ -191 +195 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       SimulatedAnnealing clone = (SimulatedAnnealing)base.Clone(cloner);
+      clone.qualityAnalyzer = (QualityAnalyzer)cloner.Clone(qualityAnalyzer);
       clone.Initialize();
       return clone;
@@ -276 +281 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeAnalyzers();
-      UpdateAnalyzers();
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -286 +289 @@
       MoveGeneratorParameter.ValueChanged += new EventHandler(MoveGeneratorParameter_ValueChanged);
       MoveEvaluatorParameter.ValueChanged += new EventHandler(MoveEvaluatorParameter_ValueChanged);
-      InitializeAnnealingOperators();
-    }
-    private void InitializeAnnealingOperators() {
-      annealingOperators = new List<IDiscreteDoubleValueModifier>();
-      annealingOperators.AddRange(ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name));
-      ParameterizeAnnealingOperators();
-      AnnealingOperatorParameter.ValidValues.Clear();
-      foreach (IDiscreteDoubleValueModifier op in annealingOperators)
-        AnnealingOperatorParameter.ValidValues.Add(op);
-    }
-    private void InitializeAnalyzers() {
-      qualityAnalyzer = new QualityAnalyzer();
-      ParameterizeAnalyzers();
     }
     private void UpdateMoveGenerator() {
@@ -383 +373 @@
     }
     private void ParameterizeAnnealingOperators() {
-      foreach (IDiscreteDoubleValueModifier op in annealingOperators) {
+      foreach (IDiscreteDoubleValueModifier op in AnnealingOperatorParameter.ValidValues) {
         op.IndexParameter.ActualName = "Iterations";
         op.StartIndexParameter.Value = new IntValue(0);