Changeset 4270 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR

Timestamp:

08/20/10 11:43:31 (14 years ago)

Author:

svonolfe

Message:

Code cleanup (#1039)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR

Files:

• GVREncoding.cs (modified) (2 diffs)
• Manipulators/GVRInsertionManipulator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/GVREncoding.cs

@@ -40 +40 @@
 
     public override List<Tour> GetTours(ILookupParameter<DoubleMatrix> distanceMatrix = null, int maxVehicles = int.MaxValue) {
-      List<Tour> tours = new List<Tour>();
-      Tour newTour = new Tour();
-      double currentDemand = 0;
+      List<Tour> tours = new List<Tour>();    
 
-      int toursProcessed = 0;
       foreach (Tour tour in base.Tours) {
-        if (maxVehicles > tours.Count) {
-          newTour = new Tour();
-          currentDemand = 0;
-        }
+        Tour newTour = new Tour();
+        double currentDemand = 0;
 
         foreach (int city in tour.Cities) {
           currentDemand += demand[city];
 
-          if (maxVehicles > tours.Count && 
-            currentDemand > capacity.Value) {
+          if (currentDemand > capacity.Value) {
             if(newTour.Cities.Count > 0)
               tours.Add(newTour);
@@ -67 +61 @@
         }
 
-        if (newTour.Cities.Count > 0 &&
-          maxVehicles > tours.Count)
+        if (newTour.Cities.Count > 0)
           tours.Add(newTour);
+      }
 
-        toursProcessed++;
-      }
+      //repair if there are too many vehicles used
+      while (tours.Count > maxVehicles) {
+        Tour tour = tours[tours.Count - 1];
+        tours[tours.Count - 2].Cities.AddRange(tour.Cities);
+
+        tours.Remove(tour);
+      } 
 
       return tours;

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/GVR/Manipulators/GVRInsertionManipulator.cs

@@ -55 +55 @@
       } else {
         Tour newTour = individual.Tours[random.Next(individual.Tours.Count)];
-        int newPosition = newTour.Cities.Count;
+        int newPosition = random.Next(newTour.Cities.Count + 1);
 
         newTour.Cities.Insert(newPosition, customer);