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

Timestamp:

09/30/11 15:23:48 (13 years ago)

Author:

svonolfe

Message:

Added vehicle assignment manipulator and move for multi depot instances (#1177)

Location:

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

Files:

• IterativeInsertionCreator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs) (5 diffs)
• PushForwardInsertionCreator.cs (copied) (copied from branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/ExtendedPotvin/Creators/PushForwardInsertionCreator.cs) (2 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 {
@@ -64 +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);
@@ -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.GetDemand(i) >= 0)
+          customers.Add(i);
+
       customers.Sort(delegate(int city1, int city2)
           {
@@ -96 +101 @@
 
       Tour currentTour = new Tour();
+      result.Tours.Add(currentTour);
 
       int j = random.Next(customers.Count);
@@ -101 +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]);
 
-        CVRPEvaluation evaluation = instance.Evaluate(currentTour) as CVRPEvaluation;
+        if (pdp != null) {
+          stopIdx = result.FindBestInsertionPlace(currentTour, pdp.GetPickupDeliveryLocation(customers[index]));
+          currentTour.Stops.Insert(stopIdx, pdp.GetPickupDeliveryLocation(customers[index]));
+        }
+
+        CVRPEvaluation evaluation = instance.EvaluateTour(currentTour, result) 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.GetPickupDeliveryLocation(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]);
+          if (pdp != null) {
+            currentTour.Stops.Add(pdp.GetPickupDeliveryLocation(customers[index]));
+          }
         }
       }
 
-      if (currentTour.Stops.Count > 0)
-        result.Tours.Add(currentTour);
+      if (currentTour.Stops.Count == 0)
+        result.Tours.Remove(currentTour);
 
       return result;

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

@@ -33 +33 @@
 using HeuristicLab.Problems.VehicleRouting.Variants;
 
-namespace HeuristicLab.Problems.VehicleRouting.Encodings.ExtendedPotvin {
+namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
   [Item("PushForwardInsertionCreator", "Creates a randomly initialized VRP solution.")]
   [StorableClass]
-  public sealed class PushForwardInsertionCreator : ExtendedPotvinCreator, IStochasticOperator {
+  public sealed class PushForwardInsertionCreator : PotvinCreator, IStochasticOperator {
     #region IStochasticOperator Members
     public ILookupParameter<IRandom> RandomParameter {
@@ -116 +116 @@
     }
 
-    private static ExtendedPotvinEncoding CreateSolution(IVRPProblemInstance problemInstance, IRandom random,
+    private static PotvinEncoding CreateSolution(IVRPProblemInstance problemInstance, IRandom random,
       double alphaValue = 0.7, double betaValue = 0.1, double gammaValue = 0.2,
       double alphaVariance = 0.5, double betaVariance = 0.07, double gammaVariance = 0.14) {
-      ExtendedPotvinEncoding result = new ExtendedPotvinEncoding(problemInstance);
+      PotvinEncoding result = new PotvinEncoding(problemInstance);
 
       double alpha, beta, gamma;