Changeset 11302 for trunk

Timestamp:

08/26/14 12:57:50 (10 years ago)

Author:

pfleck

Message:

#2232
VNS always clears all LocalImprovement operators when changing problem.
Added missing AlbaLambdaLocalImprovementOperator in VRP.

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

@@ -293 +293 @@
     }
     private void InitializeLocalImprovementOperators() {
-      if (Problem == null) {
-        LocalImprovementParameter.ValidValues.Clear();
-      } else {
-        foreach (var algOp in LocalImprovementParameter.ValidValues.OfType<ILocalImprovementAlgorithmOperator>()) {
-          if (!algOp.ProblemType.IsInstanceOfType(Problem)) {
-            LocalImprovementParameter.ValidValues.Remove(algOp);
-          }
-        }
+      LocalImprovementParameter.ValidValues.Clear();
+      if (Problem != null) {
         // Regular ILocalImprovementOperators queried from Problem
         foreach (var op in Problem.Operators.OfType<ILocalImprovementOperator>().Where(x => !(x is ILocalImprovementAlgorithmOperator))) {

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances;
+using HeuristicLab.Problems.VehicleRouting.Encodings.Alba;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.Interpreters;
@@ -263 +264 @@
             defaultCreator = creator;
         }
+        Operators.Add(new AlbaLambdaInterchangeLocalImprovementOperator());
         if (defaultCreator != null)
           solutionCreatorParameter.Value = defaultCreator;