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

Timestamp:

03/05/12 10:15:50 (13 years ago)

Author:

svonolfe

Message:

Fixed minor issues (#1177)

File:

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

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

@@ -130 +130 @@
       PotvinEncoding solution = new PotvinEncoding(instance);
 
-      TourEncoding.ConvertFrom(route, solution);
+      solution.Tours = new ItemList<Tour>();
+
+      Tour tour = new Tour();
+      int routeIdx = 0;
+      for (int i = 0; i < route.Count; i++) {
+        if (route[i] <= 0) {
+          if (tour.Stops.Count > 0) {
+            solution.Tours.Add(tour);
+            tour = new Tour();
+          }
+          int vehicle = -route[i];
+          solution.VehicleAssignment[routeIdx] = vehicle;
+          routeIdx++;
+        } else {
+          tour.Stops.Add(route[i]);
+        }
+      }
+
+      solution.Repair();
 
       return solution;