Changeset 8653 for trunk

Timestamp:

09/14/12 10:09:29 (12 years ago)

Author:

svonolfe

Message:

vehicles were not assigned correctly when a solution includes empty trips (#1953)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -69 +69 @@
       foreach (Tour tour in toBeRemoved) {
         int index = Tours.IndexOf(tour);
+        Tours.Remove(tour);
         if (index < VehicleAssignment.Length) {
           int vehicle = VehicleAssignment[index];
-
-          Tours.Remove(tour);
-          for (int i = index; i < VehicleAssignment.Length - 1; i++) {
+          int max = System.Math.Min(VehicleAssignment.Length - 1, Tours.Count);
+
+          for (int i = index; i < max; i++) {
             VehicleAssignment[i] = VehicleAssignment[i + 1];
           }
-          VehicleAssignment[VehicleAssignment.Length - 1] = vehicle;
+          VehicleAssignment[max] = vehicle;
         }
       }