Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

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

branches/GP-MoveOperators/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

@@ -58 +58 @@
       get { return (FixedValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
     }
-    public ConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
-      get { return (ConstrainedValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }
-    }
-    public ConstrainedValueParameter<IMultiNeighborhoodShakingOperator> ShakingOperatorParameter {
-      get { return (ConstrainedValueParameter<IMultiNeighborhoodShakingOperator>)Parameters["ShakingOperator"]; }
+    public IConstrainedValueParameter<ILocalImprovementOperator> LocalImprovementParameter {
+      get { return (IConstrainedValueParameter<ILocalImprovementOperator>)Parameters["LocalImprovement"]; }
+    }
+    public IConstrainedValueParameter<IMultiNeighborhoodShakingOperator> ShakingOperatorParameter {
+      get { return (IConstrainedValueParameter<IMultiNeighborhoodShakingOperator>)Parameters["ShakingOperator"]; }
     }
     private FixedValueParameter<IntValue> MaximumIterationsParameter {
@@ -294 +294 @@
         LocalImprovementParameter.ValidValues.Clear();
       } else {
-        LocalImprovementParameter.ValidValues.RemoveWhere(x => !x.ProblemType.IsAssignableFrom(Problem.GetType()));
+        foreach (var entry in LocalImprovementParameter.ValidValues.ToList()) {
+          if (!entry.ProblemType.IsAssignableFrom(Problem.GetType())) {
+            LocalImprovementParameter.ValidValues.Remove(entry);
+          }
+        }
         foreach (ILocalImprovementOperator op in ApplicationManager.Manager.GetInstances<ILocalImprovementOperator>().Where(x => x.ProblemType.IsAssignableFrom(Problem.GetType()))) {
           if (!LocalImprovementParameter.ValidValues.Any(x => x.GetType() == op.GetType()))