Changeset 5735 for branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

Timestamp:

03/17/11 14:35:58 (14 years ago)

Author:

svonolfe

Message:

Implemented review comments of swagner (#1425)

File:

• branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (4 diffs)

branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

@@ -39 +39 @@
       get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    private ValueParameter<ILocalImprovement> LocalImprovementParameter {
-      get { return (ValueParameter<ILocalImprovement>)Parameters["LocalImprovement"]; }
+    private ValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
+      get { return (ValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }
     }
     private ValueParameter<IShakingOperator> ShakingParameter {
@@ -90 +90 @@
       Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       Parameters.Add(new ValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
-      Parameters.Add(new ValueParameter<ILocalImprovement>("LocalImprovement", "The local improvement operation", new LocalSearchImprovement()));
+      Parameters.Add(new ValueParameter<ILocalImprovementOperator>("LocalImprovement", "The local improvement operation", new LocalSearchImprovementOperator()));
       Parameters.Add(new ValueParameter<IShakingOperator>("Shaking", "The shaking operation"));
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
@@ -215 +215 @@
       if (Problem != null) {
         foreach (IIterationBasedOperator op in Problem.Operators.OfType<IIterationBasedOperator>()) {
-          op.IterationsParameter.ActualName = "OuterIterations";
+          op.IterationsParameter.ActualName = "Iterations";
           op.MaximumIterationsParameter.ActualName = "MaximumIterations";
         }
@@ -267 +267 @@
     }
     private void UpdateLocalImprovementOperator() {
-      LocalImprovementParameter.Value.Parameterize(Problem);
+      LocalImprovementParameter.Value.OnProblemChanged(Problem);
     }
     private void UpdateAnalyzers() {