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

Timestamp:

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

Author:

svonolfe

Message:

Added support for pickups and deliveries (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Crossovers/PotvinInsertionBasedCrossover.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;