Changeset 6713

Timestamp:

09/06/11 16:57:00 (13 years ago)

Author:

svonolfe

Message:

Fixed minor bugs (#1177)

Location:

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

Files:

• General/TourEncoding.cs (modified) (1 diff)
• Potvin/Creators/IterativeInsertionCreator.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -43 +43 @@
       foreach(Tour tour in Tours) {
         if (tour.Stops.Count > 0)
-          result.Add(tour);
+          result.Add(tour.Clone() as Tour);
       }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs

@@ -96 +96 @@
 
       Tour currentTour = new Tour();
-      result.Tours.Add(currentTour);
+
       int j = random.Next(customers.Count);
       for (int i = 0; i < customers.Count; i++) {
@@ -109 +109 @@
           currentTour.Stops.RemoveAt(stopIdx);
 
+          if(currentTour.Stops.Count > 0)
+            result.Tours.Add(currentTour);
           currentTour = new Tour();
-          result.Tours.Add(currentTour);
+          
           currentTour.Stops.Add(customers[index]);
         }
       }
+
+      if (currentTour.Stops.Count > 0)
+        result.Tours.Add(currentTour);
 
       return result;