Changeset 4378 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Timestamp:

09/10/10 13:00:54 (14 years ago)

Author:

svonolfe

Message:

Improved performance of PotvinEncoding(#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings

Files:

• Alba/Moves/AlbaMoveMaker.cs (modified) (1 diff)
• Potvin/PotvinEncoding.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/AlbaMoveMaker.cs

@@ -39 +39 @@
       : base() {
     }
-
-    public override IOperation Apply() {
-      IVRPEncoding solution = VRPToursParameter.ActualValue;
-      if (!(solution is AlbaEncoding)) {
-        //VRPToursParameter.ActualValue = AlbaEncoding.ConvertFrom(solution, VehiclesParameter.ActualValue.Value,
-        //  DistanceMatrixParameter);
-      }
-
-      return base.Apply();
-    }
   }
 }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -99 +99 @@
       for (int tour = 0; tour < Tours.Count; tour++) {
         if (tour != routeToAvoid) {
+          double length = GetTourLength(Tours[tour]);
+
           for (int i = 0; i <= Tours[tour].Stops.Count; i++) {
-            double length = GetTourLength(Tours[tour]);
-
             Tours[tour].Stops.Insert(i, city);
 
-            if (ProblemInstance.Feasible(Tours[tour])) {
-              double newLength = GetTourLength(Tours[tour]);
+            VRPEvaluation eval = ProblemInstance.EvaluatorParameter.Value.Evaluate(
+              ProblemInstance, Tours[tour]);
+            if (ProblemInstance.EvaluatorParameter.Value.Feasible(eval)) {
+              double newLength = eval.Distance;
 
               double detour = newLength - length;