Changeset 5752 for branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch

Timestamp:

03/18/11 15:20:24 (13 years ago)

Author:

svonolfe

Message:

Added simulated annealing improvement operator (#1425)

Location:

branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3

Files:

• IShakingOperator.cs (modified) (1 diff)
• ShakingOperator.cs (modified) (1 diff)
• VariableNeighborhoodSearch.cs (modified) (3 diffs)

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

@@ -29 +29 @@
 namespace HeuristicLab.Algorithms.VariableNeighborhoodSearch {
   public interface IShakingOperator: IManipulator {
-    void Parameterize(IProblem problem);
+    void OnProblemChanged(IProblem problem);
   }
 }

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

@@ -59 +59 @@
     }
 
-    public void Parameterize(IProblem problem) {
+    public void OnProblemChanged(IProblem problem) {
       Operators.Clear();
 

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

@@ -143 +143 @@
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       }
+      LocalImprovementParameter.ValueChanged += new EventHandler(LocalImprovementParameter_ValueChanged);
     }
 
@@ -186 +187 @@
       ParameterizeVNSMainLoop();
       ParameterizeAnalyzers();
+    }
+
+    void LocalImprovementParameter_ValueChanged(object sender, EventArgs e) {
+      if (LocalImprovementParameter.Value != null)
+        LocalImprovementParameter.Value.OnProblemChanged(Problem);
     }
     #endregion
@@ -264 +270 @@
       ShakingParameter.Value = (IShakingOperator)Activator.CreateInstance(genericType, new object[]{});
 
-      ShakingParameter.Value.Parameterize(Problem);
+      ShakingParameter.Value.OnProblemChanged(Problem);
     }
     private void UpdateLocalImprovementOperator() {