Changeset 6838 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs

Timestamp:

09/27/11 13:29:56 (13 years ago)

Author:

svonolfe

Message:

Updated interface of evaluator - added individual (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/PickupDelivery/PDRearrange/PotvinPDRearrangeMoveMaker.cs

@@ -61 +61 @@
     public static void InsertPair(PotvinEncoding solution, Tour tour, int source, int target, IVRPProblemInstance problemInstance, int positionToAvoid = -1, int positionToAvoid2 = -1) {
       int stops = tour.Stops.Count;
-      VRPEvaluation eval = problemInstance.Evaluate(tour);
+      VRPEvaluation eval = problemInstance.EvaluateTour(tour, solution);
       double minCosts = double.MaxValue;
       int sourceLocation = -1;
@@ -68 +68 @@
       for (int i = 0; i <= stops; i++) {
         tour.Stops.Insert(i, source);
-        VRPEvaluation tourEval = problemInstance.Evaluate(tour);
+        VRPEvaluation tourEval = problemInstance.EvaluateTour(tour, solution);
         double sourceCosts = tourEval.Quality - eval.Quality;