Changeset 7518 for trunk

Timestamp:

02/24/12 13:07:15 (13 years ago)

Author:

mkommend

Message:

#1691: Updated VariableNeighborHoodSearch to use default operators for the shaking factor parameter.

File:

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

trunk/sources/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;
       }
     }