Changeset 7615 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.VariableNeighborhoodSearch

Timestamp:

03/15/12 09:11:17 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7462:7609 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (1 diff)

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

@@ -302 +302 @@
     }
     private void UpdateShakingOperators() {
+      IMultiNeighborhoodShakingOperator oldShakingOperator = ShakingOperator;
+      IMultiNeighborhoodShakingOperator defaultShakingOperator = Problem.Operators.OfType<IMultiNeighborhoodShakingOperator>().FirstOrDefault();
       ShakingOperatorParameter.ValidValues.Clear();
-      foreach (IMultiNeighborhoodShakingOperator op in Problem.Operators.OfType<IMultiNeighborhoodShakingOperator>()) {
+      foreach (IMultiNeighborhoodShakingOperator op in Problem.Operators.OfType<IMultiNeighborhoodShakingOperator>().OrderBy(op => op.Name)) {
         ShakingOperatorParameter.ValidValues.Add(op);
         op.CurrentNeighborhoodIndexParameter.ActualName = "CurrentNeighborhoodIndex";
         op.NeighborhoodCountParameter.ActualName = "NeighborhoodCount";
+      }
+      if (oldShakingOperator != null) {
+        IMultiNeighborhoodShakingOperator shakingOperator = ShakingOperatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldShakingOperator.GetType());
+        if (shakingOperator != null) ShakingOperator = shakingOperator;
+        else oldShakingOperator = null;
+      }
+      if (oldShakingOperator == null && defaultShakingOperator != null) {
+        ShakingOperator = defaultShakingOperator;
       }
     }