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

Timestamp:

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

Author:

svonolfe

Message:

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

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins

Files:

• Manipulators/PrinsLSManipulator.cs (modified) (1 diff)
• PrinsEncoding.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsLSManipulator.cs

@@ -49 +49 @@
 
     protected double GetQuality(PrinsEncoding individual) {
-      return ProblemInstance.Evaluate(individual);
+      return ProblemInstance.Evaluate(individual).Quality;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/PrinsEncoding.cs

@@ -61 +61 @@
 
           VRPEvaluation eval =
-            ProblemInstance.EvaluatorParameter.Value.Evaluate(ProblemInstance,
-             tour);
+            ProblemInstance.Evaluate(tour);
 
           double cost = eval.Quality;
-          feasible = ProblemInstance.EvaluatorParameter.Value.Feasible(eval);
+          feasible = ProblemInstance.Feasible(eval);
 
           if (feasible) {