Changeset 7821 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/Encodings

Timestamp:

05/15/12 10:42:00 (13 years ago)

Author:

svonolfe

Message:

Worked on VRP path relinking (#1331)

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs (modified) (4 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/Alba/LocalImprovement/AlbaLambdaInterchangeLocalImprovementOperator.cs

@@ -101 +101 @@
     }
 
-    public static void Apply(AlbaEncoding solution, int maxIterations, 
+    public static void Apply(AlbaEncoding solution, int maxIterations, bool firstImprovement,
       int lambda, int samples, IRandom random, ref double quality, out int evaluatedSolutions, 
       DoubleMatrix distanceMatrix, IntValue vehicles, DoubleArray dueTime, DoubleArray serviceTime, DoubleArray readyTime,
@@ -110 +110 @@
 
       evaluatedSolutions = 0;
+
+      if (quality == -1) {
+        quality = VRPEvaluator.Evaluate(solution, vehicles, dueTime, serviceTime, readyTime,
+          demand, capacity, fleetUsageFactor, timeFactor, distanceFactor,
+          overloadPenalty, tardinessPenalty, coordinates,
+          distanceMatrixParameter, useDistanceMatrix).Quality;
+        evaluatedSolutions++;
+      }
 
       for (int i = 0; i < maxIterations; i++) {
@@ -126 +134 @@
 
           evaluatedSolutions++;
-          if (moveQuality < quality || quality == -1) {
+          if (moveQuality < quality) {
             quality = moveQuality;
             bestMove = move;
+
+            if (firstImprovement)
+              break;
           }
         }
@@ -155 +166 @@
       int evaluatedSolutions;
 
-      Apply(solution, maxIterations, lambda, samples, random, ref quality, out evaluatedSolutions,
+      Apply(solution, maxIterations, false, lambda, samples, random, ref quality, out evaluatedSolutions,
         problem.DistanceMatrix, problem.Vehicles, problem.DueTime, problem.ServiceTime,
         problem.ReadyTime, problem.Demand, problem.Capacity, problem.Coordinates,