Changeset 6909 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift

Timestamp:

10/12/11 15:45:48 (13 years ago)

Author:

svonolfe

Message:

Fixed more isses that occured in dynamic instances (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift

Files:

• PotvinPDShiftMultiMoveGenerator.cs (modified) (1 diff)
• PotvinPDShiftSingleMoveGenerator.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftMultiMoveGenerator.cs

@@ -64 +64 @@
 
       for (int i = 0; i < SampleSizeParameter.ActualValue.Value; i++) {
-        result.Add(PotvinPDShiftSingleMoveGenerator.Apply(individual, ProblemInstance, RandomParameter.ActualValue));
+        var move = PotvinPDShiftSingleMoveGenerator.Apply(individual, ProblemInstance, RandomParameter.ActualValue);
+        if (move != null)
+          result.Add(move);
       }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDShift/PotvinPDShiftSingleMoveGenerator.cs

@@ -62 +62 @@
       IPickupAndDeliveryProblemInstance pdp = problemInstance as IPickupAndDeliveryProblemInstance;
       for (int i = 1; i <= individual.Cities; i++) {
-        if(pdp == null || pdp.GetDemand(i) >= 0)
+        if (pdp == null || pdp.GetDemand(i) >= 0)
           cities.Add(i);
       }
 
-      int city = cities[rand.Next(cities.Count)];
-      Tour oldTour = individual.Tours.Find(t => t.Stops.Contains(city));
-      int oldTourIndex = individual.Tours.IndexOf(oldTour);
+      if (cities.Count > 1 && individual.Tours.Count > 1) {
+        int city = cities[rand.Next(cities.Count)];
+        Tour oldTour = individual.Tours.Find(t => t.Stops.Contains(city));
+        int oldTourIndex = individual.Tours.IndexOf(oldTour);
 
-      int max = individual.Tours.Count;
-      if (individual.Tours.Count < problemInstance.Vehicles.Value)
-        max = max - 1;
+        int max = individual.Tours.Count;
+        if (individual.Tours.Count < problemInstance.Vehicles.Value)
+          max = max - 1;
 
-      int newTourIndex = rand.Next(max);
-      if (newTourIndex >= oldTourIndex)
-        newTourIndex++;
+        int newTourIndex = rand.Next(max);
+        if (newTourIndex >= oldTourIndex)
+          newTourIndex++;
 
-      return new PotvinPDShiftMove(city, oldTourIndex, newTourIndex, individual);
+        return new PotvinPDShiftMove(city, oldTourIndex, newTourIndex, individual);
+      } else {
+        return null;
+      }             
     }