Changeset 11905 for stable/HeuristicLab.Problems.VehicleRouting

Timestamp:

02/05/15 10:39:46 (10 years ago)

Author:

abeham

Message:

#2232: merged to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs (modified) (4 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

@@ -37 +37 @@
   [StorableClass]
   public class AlbaLambdaInterchangeLocalImprovementOperator : VRPOperator, IStochasticOperator, ILocalImprovementOperator {
-    public Type ProblemType {
-      get { return typeof(VehicleRoutingProblem); }
-    }
-
-    [Storable]
-    private VehicleRoutingProblem problem;
-    public IProblem Problem {
-      get { return problem; }
-      set { problem = (VehicleRoutingProblem)value; }
-    }
 
     public IValueLookupParameter<IntValue> MaximumIterationsParameter {
@@ -84 +74 @@
     protected AlbaLambdaInterchangeLocalImprovementOperator(AlbaLambdaInterchangeLocalImprovementOperator original, Cloner cloner)
       : base(original, cloner) {
-        this.problem = cloner.Clone(original.problem);
     }
     public AlbaLambdaInterchangeLocalImprovementOperator()
@@ -102 +91 @@
     }
 
-    public static void Apply(AlbaEncoding solution, int maxIterations, 
+    public static void Apply(AlbaEncoding solution, int maxIterations,
       int lambda, int samples, IRandom random, IVRPProblemInstance problemInstance, ref double quality, out int evaluatedSolutions) {
       evaluatedSolutions = 0;
@@ -120 +109 @@
           }
         }
-        if (bestMove != null) 
+        if (bestMove != null)
           AlbaLambdaInterchangeMoveMaker.Apply(solution, bestMove);
       }

stable/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;