Changeset 14645

Timestamp:

02/03/17 14:47:52 (7 years ago)

Author:

pfleck

Message:

#2707

• Fixed a bug in cluster creators.
• Added the vehicle rr to the each tour in the solution view.

Location:

branches/HeuristicLab.VRPEnhancements

Files:

• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/GeographicDistanceClusterCreator.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/TemporalDistanceClusterCreator.cs (modified) (1 diff)

branches/HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.cs

@@ -93 +93 @@
       if (Content != null && Content.Solution != null) {
         foreach (Tour tour in Content.Solution.GetTours()) {
+          int tourIndex = Content.Solution.GetTourIndex(tour);
+          int vehidleIndex = Content.Solution.GetVehicleAssignment(tourIndex);
+          sb.AppendFormat("Vehicle #{0}:", vehidleIndex);
           foreach (int city in tour.Stops) {
+            sb.Append(" ");
             sb.Append(city);
-            sb.Append(" ");
           }
           sb.AppendLine();

branches/HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/GeographicDistanceClusterCreator.cs

@@ -74 +74 @@
           // (a) shuffle
           cluster.ShuffleInPlace(random);
-          newTour.Stops.AddRange(cluster);
           foreach (var customer in cluster) {
             newTour.Stops.Add(customer + 1);

branches/HeuristicLab.VRPEnhancements/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/TemporalDistanceClusterCreator.cs

@@ -73 +73 @@
           // (a) shuffle
           cluster.ShuffleInPlace(random);
-          newTour.Stops.AddRange(cluster);
           foreach (var customer in cluster) {
             newTour.Stops.Add(customer + 1);