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

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.TabuSearch/3.3

Files:

• TabuSearch.cs (modified) (3 diffs)
• TabuSearchMainLoop.cs (modified) (1 diff)

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

@@ -236 +236 @@
       ParameterizeTabuChecker();
       ParameterizeAnalyzers();
+      ParameterizeIterationBasedOperators();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -278 +279 @@
       ParameterizeTabuChecker();
       ParameterizeAnalyzers();
+      ParameterizeIterationBasedOperators();
       base.Problem_OperatorsChanged(sender, e);
     }
@@ -470 +472 @@
       }
     }
+    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.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -148 +148 @@
       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 TabuSearch expects this to be called Iterations
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedMoves", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("EmptyNeighborhood", new BoolValue(false)));