Changeset 6759 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin

Timestamp:

09/14/11 13:00:09 (13 years ago)

Author:

svonolfe

Message:

Adapted creators to support pickup and delivery constraints (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs (modified) (3 diffs)

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

@@ -31 +31 @@
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
+using HeuristicLab.Problems.VehicleRouting.Variants;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -84 +85 @@
       PotvinEncoding result = new PotvinEncoding(instance);
 
+      IPickupAndDeliveryProblemInstance pdp = instance as IPickupAndDeliveryProblemInstance; 
+
       List<int> customers = new List<int>();
-      for (int i = 0; i < instance.Cities.Value; i++)
-        customers.Add(i + 1);
+      for (int i = 1; i <= instance.Cities.Value; i++)
+        if(pdp == null || pdp.Demand[i] >= 0)
+          customers.Add(i);
+
       customers.Sort(delegate(int city1, int city2)
           {
@@ -104 +109 @@
         currentTour.Stops.Insert(stopIdx, customers[index]);
 
+        if (pdp != null) {
+          stopIdx = result.FindBestInsertionPlace(currentTour, pdp.PickupDeliveryLocation[customers[index]]);
+          currentTour.Stops.Insert(stopIdx, pdp.PickupDeliveryLocation[customers[index]]);
+        }
+
         CVRPEvaluation evaluation = instance.Evaluate(currentTour) as CVRPEvaluation;
         if (result.Tours.Count < instance.Vehicles.Value && 
           ((adhereTimeWindows && !instance.Feasible(evaluation)) || ((!adhereTimeWindows) && evaluation.Overload > double.Epsilon))) {
-          currentTour.Stops.RemoveAt(stopIdx);
+            currentTour.Stops.Remove(customers[index]);
+            if (pdp != null)
+              currentTour.Stops.Remove(pdp.PickupDeliveryLocation[customers[index]]);
 
           if(currentTour.Stops.Count > 0)