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

Timestamp:

05/10/10 17:19:34 (15 years ago)

Author:

abeham

Message:

#893

• Fixed wiring of iteration based operators like the michalewicz manipulators for real vector encoding

Location:

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3

Files:

• SimulatedAnnealing.cs (modified) (3 diffs)
• SimulatedAnnealingMainLoop.cs (modified) (1 diff)

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

@@ -217 +217 @@
       UpdateMoveGenerator();
       UpdateMoveParameters();
+      UpdateAnalyzers();
       ParameterizeMoveEvaluators();
       ParameterizeMoveMakers();
       ParameterizeMoveGenerators();
       ParameterizeAnalyzers();
-      UpdateAnalyzers();
+      ParameterizeIterationBasedOperators();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -255 +256 @@
       ParameterizeMoveMakers();
       ParameterizeMoveGenerators();
+      ParameterizeIterationBasedOperators();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -388 +390 @@
       }
     }
+    private void ParameterizeIterationBasedOperators() {
+      if (Problem != null) {
+        foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
+          op.IterationsParameter.ActualName = "Iterations";
+          op.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
+        }
+      }
+    }
     private void UpdateAnalyzers() {
       Analyzer.Operators.Clear();

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

@@ -135 +135 @@
       Placeholder analyzer2 = new Placeholder();
       ConditionalBranch iterationsTermination = new ConditionalBranch();
-      
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0))); // Class SimulatedAnnealing expects this to be called Iterations
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("Temperature", new DoubleValue(double.MaxValue)));