Changeset 6450 for trunk

Timestamp:

06/20/11 13:53:07 (14 years ago)

Author:

svonolfe

Message:

Further improved performance (#1561)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/PotvinEncoding.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Potvin/PotvinEncoding.cs

@@ -73 +73 @@
       route = -1;
       place = -1;
-      bool bestFeasible = false;
       double minDetour = 0;
 
@@ -86 +85 @@
               capacity, distMatrix);
 
-            if (!bestFeasible || feasible) {
+            if (feasible) {
               double newLength = Tours[tour].GetLength(distMatrix);
               double detour = newLength - length;
 
-              if (route <= 0 || detour < minDetour || (!(bestFeasible && !feasible)) && detour < minDetour || (feasible && !bestFeasible)) {
+              if (route <= 0 || detour < minDetour) {
                 route = tour;
                 place = i;
                 minDetour = detour;
-
-                if (feasible)
-                  bestFeasible = true;
               }
             }