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

Timestamp:

07/28/11 14:16:21 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk (#1561) into branch (#1177)

File:

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

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

@@ -80 +80 @@
 
     public double GetTourLength(Tour tour) {
-      double length = 0;
-
-      if (tour.Stops.Count > 0) {
-        List<int> cities = new List<int>();
-        cities.Add(0);
-        foreach (int city in tour.Stops) {
-          cities.Add(city);
-        }
-        cities.Add(0);
-
-        for (int i = 1; i < cities.Count; i++) {
-          length += ProblemInstance.GetDistance(cities[i - 1], cities[i]);
-        }
-      }  
-
-      return length;
+      return tour.GetTourLength(ProblemInstance);
     }
 
@@ -105 +90 @@
         tour.Stops.Insert(i, city);
 
-        VRPEvaluation eval = ProblemInstance.EvaluatorParameter.Value.Evaluate(ProblemInstance, tour);
+        VRPEvaluation eval = ProblemInstance.Evaluate(tour);
         double quality = eval.Quality + eval.Penalty * (PenaltyFactor - 1.0);
 
@@ -122 +107 @@
     }
 
-    public bool FindInsertionPlace(int city, int routeToAvoid, out int route, out int place) {
+    public bool FindInsertionPlace(int city, int routeToAvoid, bool allowInfeasible, out int route, out int place) {
       route = -1;
       place = -1;
-      double minDetour = 0;
+      bool bestFeasible = false;
+      double minDetour = double.MaxValue;
 
       for (int tour = 0; tour < Tours.Count; tour++) {
         if (tour != routeToAvoid) {
-          double length = GetTourLength(Tours[tour]);
+          for (int i = 0; i <= Tours[tour].Stops.Count; i++) {
+            double length = GetTourLength(Tours[tour]);
 
-          for (int i = 0; i <= Tours[tour].Stops.Count; i++) {
             Tours[tour].Stops.Insert(i, city);
 
-            VRPEvaluation eval = ProblemInstance.EvaluatorParameter.Value.Evaluate(
-              ProblemInstance, Tours[tour]);
-            if (ProblemInstance.EvaluatorParameter.Value.Feasible(eval)) {
-              double newLength = eval.Distance;
+            bool feasible = ProblemInstance.Feasible(Tours[tour]);
 
+            if (feasible || allowInfeasible && !bestFeasible) {
+              double newLength = GetTourLength(Tours[tour]);
               double detour = newLength - length;
 
-              if (route <= 0 || detour < minDetour) {
+              if (route < 0 || detour < minDetour || feasible && !bestFeasible) {
                 route = tour;
                 place = i;
                 minDetour = detour;
+
+                if (feasible)
+                  bestFeasible = true;
               }
             }