Changeset 6851 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/ExtendedPotvin/Creators/IterativeInsertionCreator.cs

Timestamp:

09/29/11 15:51:56 (13 years ago)

Author:

svonolfe

Message:

Added support for multi depot CVRP instances (#1177)

Location:

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

Files:

• . (added)
• Creators (added)
• Creators/IterativeInsertionCreator.cs (moved) (moved from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs) (6 diffs)

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

@@ -33 +33 @@
 using HeuristicLab.Problems.VehicleRouting.Variants;
 
-namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
+namespace HeuristicLab.Problems.VehicleRouting.Encodings.ExtendedPotvin {
   [Item("IterativeInsertionCreator", "Creates a randomly initialized VRP solution.")]
   [StorableClass]
-  public sealed class IterativeInsertionCreator : PotvinCreator, IStochasticOperator {
+  public sealed class IterativeInsertionCreator : ExtendedPotvinCreator, IStochasticOperator {
     #region IStochasticOperator Members
     public ILookupParameter<IRandom> RandomParameter {
@@ -65 +65 @@
 
     private static double CalculateAngleToDepot(IVRPProblemInstance instance, int city) {
-      double dx = instance.Coordinates[0, 0];
-      double dy = instance.Coordinates[0, 1];
+      double dx = instance.GetCoordinates(0)[0];
+      double dy = instance.GetCoordinates(0)[1];
 
-      double cx = instance.Coordinates[city, 0];
-      double cy = instance.Coordinates[city, 1];
+      double cx = instance.GetCoordinates(city)[0];
+      double cy = instance.GetCoordinates(city)[1];
 
       double alpha = Math.Atan((cx - dx) / (dy - cy)) * (180.0 / Math.PI);
@@ -82 +82 @@
     }
 
-    private static PotvinEncoding CreateSolution(IVRPProblemInstance instance, IRandom random, bool adhereTimeWindows) {
-      PotvinEncoding result = new PotvinEncoding(instance);
+    private static ExtendedPotvinEncoding CreateSolution(IVRPProblemInstance instance, IRandom random, bool adhereTimeWindows) {
+      ExtendedPotvinEncoding result = new ExtendedPotvinEncoding(instance);
 
       IPickupAndDeliveryProblemInstance pdp = instance as IPickupAndDeliveryProblemInstance; 
@@ -89 +89 @@
       List<int> customers = new List<int>();
       for (int i = 1; i <= instance.Cities.Value; i++)
-        if(pdp == null || pdp.Demand[i] >= 0)
+        if(pdp == null || pdp.GetDemand(i) >= 0)
           customers.Add(i);
 
@@ -107 +107 @@
         int index = (i + j) % customers.Count;
 
-        int stopIdx = result.FindBestInsertionPlace(currentTour, customers[index]);
+        int stopIdx = 0;
+        if(currentTour.Stops.Count > 0)
+          result.FindBestInsertionPlace(currentTour, customers[index]);
         currentTour.Stops.Insert(stopIdx, customers[index]);
 
@@ -122 +124 @@
               currentTour.Stops.Remove(pdp.PickupDeliveryLocation[customers[index]]);
 
-          if(currentTour.Stops.Count > 0)
-            result.Tours.Add(currentTour);
+          if (currentTour.Stops.Count == 0)
+            result.Tours.Remove(currentTour);
           currentTour = new Tour();
+          result.Tours.Add(currentTour);
           
           currentTour.Stops.Add(customers[index]);