Changeset 4378 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

Timestamp:

09/10/10 13:00:54 (14 years ago)

Author:

svonolfe

Message:

Improved performance of PotvinEncoding(#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (1 diff)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -147 +147 @@
 
     public bool Feasible(IVRPEncoding solution) {
-      return EvaluatorParameter.Value.Feasible(this, solution);
+      return EvaluatorParameter.Value.Feasible(
+        EvaluatorParameter.Value.Evaluate(
+          this, solution));
     }
 
     public bool Feasible(Tour tour) {
-      return EvaluatorParameter.Value.Feasible(this, tour);
+      return EvaluatorParameter.Value.Feasible(
+        EvaluatorParameter.Value.Evaluate(
+        this, tour));
     }
 
     public double Evaluate(IVRPEncoding solution) {
-      return EvaluatorParameter.Value.Evaluate(this, solution);
+      return EvaluatorParameter.Value.Evaluate(this, solution).Quality;
     }
 
     public double Evaluate(Tour tour) {
-      return EvaluatorParameter.Value.Evaluate(this, tour);
+      return EvaluatorParameter.Value.Evaluate(this, tour).Quality;
     }