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

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/Creators/IterativeInsertionCreator.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Creators/IterativeInsertionCreator.cs

@@ -83 +83 @@
     private static PotvinEncoding CreateSolution(IVRPProblemInstance instance, IRandom random, bool adhereTimeWindows) {
       PotvinEncoding result = new PotvinEncoding(instance);
-      IVRPEvaluator eval = instance.EvaluatorParameter.Value;
 
       List<int> customers = new List<int>();
@@ -105 +104 @@
         currentTour.Stops.Insert(stopIdx, customers[index]);
 
-        CVRPEvaluation evaluation = eval.Evaluate(instance, currentTour) as CVRPEvaluation;
+        CVRPEvaluation evaluation = instance.Evaluate(currentTour) as CVRPEvaluation;
         if (result.Tours.Count < instance.Vehicles.Value && 
-          ((adhereTimeWindows && !eval.Feasible(evaluation)) || ((!adhereTimeWindows) && evaluation.Overload > double.Epsilon))) {
+          ((adhereTimeWindows && !instance.Feasible(evaluation)) || ((!adhereTimeWindows) && evaluation.Overload > double.Epsilon))) {
           currentTour.Stops.RemoveAt(stopIdx);