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

Timestamp:

09/06/11 13:00:12 (13 years ago)

Author:

svonolfe

Message:

Added support for pickups and deliveries (#1177)

Location:

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

Files:

• Crossovers/PotvinInsertionBasedCrossover.cs (modified) (2 diffs)
• PotvinEncoding.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.cs

@@ -27 +27 @@
 using System;
 using HeuristicLab.Parameters;
+using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
@@ -151 +152 @@
       int city, bool allowInfeasible, out int place) {
       place = -1;
+
+      if (tour.Stops.Contains(city))
+        return false;
+
       bool bestFeasible = false;
       double minDetour = 0;
 
+      VRPEvaluation eval = ProblemInstance.Evaluate(tour);
+      double length = eval.Quality;
       for (int i = 0; i <= tour.Stops.Count; i++) {
-        double length = tour.GetTourLength(ProblemInstance);
-
         tour.Stops.Insert(i, city);
 
-        bool feasible = ProblemInstance.Feasible(tour);
+        eval = ProblemInstance.Evaluate(tour);
+        bool feasible = ProblemInstance.Feasible(eval);
 
         if (feasible || allowInfeasible && !bestFeasible) {
-          double newLength = tour.GetTourLength(ProblemInstance);
+          double newLength = eval.Quality;
           double detour = newLength - length;
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/PotvinEncoding.cs

@@ -35 +35 @@
   [Item("PotvinEncoding", "Represents a potvin encoding of VRP solutions. It is implemented as described in Potvin, J.-Y. and Bengio, S. (1996). The Vehicle Routing Problem with Time Windows - Part II: Genetic Search. INFORMS Journal of Computing, 8:165–172.")]
   [StorableClass]
-  public class PotvinEncoding : TourEncoding, ISingleDepotEncoding, ITimeWindowedEncoding, IHomogenousCapacitatedEncoding {   
+  public class PotvinEncoding : TourEncoding {   
     [Storable]
     public List<int> Unrouted { get; set; }
@@ -115 +115 @@
       for (int tour = 0; tour < Tours.Count; tour++) {
         if (tour != routeToAvoid) {
+          VRPEvaluation eval = ProblemInstance.Evaluate(Tours[tour]);
+          double length = eval.Quality;
+
           for (int i = 0; i <= Tours[tour].Stops.Count; i++) {
-            double length = GetTourLength(Tours[tour]);
-
             Tours[tour].Stops.Insert(i, city);
 
-            bool feasible = ProblemInstance.Feasible(Tours[tour]);
+            eval = ProblemInstance.Evaluate(Tours[tour]);
+            bool feasible = ProblemInstance.Feasible(eval);
 
             if (feasible || allowInfeasible && !bestFeasible) {
-              double newLength = GetTourLength(Tours[tour]);
+              double newLength = eval.Quality;
               double detour = newLength - length;