Changeset 11931 for stable/HeuristicLab.Problems.VehicleRouting

Timestamp:

02/06/15 09:24:18 (10 years ago)

Author:

abeham

Message:

#2229: merged to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/VRPInterpreter.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -36 +36 @@
     public List<int> Unrouted { get; set; }
 
+    // VehicleAssignment[tour] retreives the assigned vehicle for the given tour
     [Storable]
     public Permutation VehicleAssignment { get; private set; }

stable/HeuristicLab.Problems.VehicleRouting/3.4/Interpreters/VRPInterpreter.cs

@@ -20 +20 @@
 #endregion
 
+using System.IO;
 using HeuristicLab.Data;
 using HeuristicLab.Problems.Instances;
@@ -44 +45 @@
         }
 
+        if (data.BestKnownTourVehicleAssignment != null) {
+          if (data.BestKnownTourVehicleAssignment.Length != solution.VehicleAssignment.Length)
+            throw new InvalidDataException("Number of vehicles of the best known tour does not match the number vehicles of the instance.");
+          for (int i = 0; i < data.BestKnownTourVehicleAssignment.Length; i++)
+            solution.VehicleAssignment[i] = data.BestKnownTourVehicleAssignment[i];
+        }
+
         return solution;
       } else {
@@ -51 +59 @@
 
     protected abstract IVRPProblemInstance CreateProblemInstance();
-    
+
     public VRPInstanceDescription Interpret(IVRPData data) {
       VRPInstanceDescription result = new VRPInstanceDescription();