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

Timestamp:

05/10/10 17:19:34 (14 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.LocalSearch/3.3

Files:

• LocalSearch.cs (modified) (3 diffs)
• LocalSearchMainLoop.cs (modified) (1 diff)

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

@@ -197 +197 @@
       ParameterizeSolutionsCreator();
       ParameterizeMainLoop();
-      ParameterizeMoveEvaluators();
-      ParameterizeMoveMakers();
-      ParameterizeAnalyzers();
       UpdateMoveGenerator();
       UpdateMoveParameters();
       UpdateAnalyzers();
+      ParameterizeMoveEvaluators();
+      ParameterizeMoveMakers();
+      ParameterizeAnalyzers();
+      ParameterizeIterationBasedOperators();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -236 +237 @@
       ParameterizeMoveMakers();
       ParameterizeAnalyzers();
+      ParameterizeIterationBasedOperators();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -366 +368 @@
       }
     }
+    private void ParameterizeIterationBasedOperators() {
+      if (Problem != null) {
+        foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
+          op.IterationsParameter.ActualName = "Iterations";
+          op.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
+        }
+      }
+    }
     #endregion
   }

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

@@ -137 +137 @@
       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 LocalSearch expects this to be called Iterations
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedMoves", new IntValue(0)));