Changeset 4378 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.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/VRPEvaluator.cs (modified) (2 diffs)

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

@@ -84 +84 @@
     }
 
-    protected VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour) {
+    private VRPEvaluation EvaluateTour(IVRPProblemInstance instance, Tour tour) {
       VRPEvaluation evaluation = CreateTourEvaluation();
       EvaluateTour(evaluation, instance, tour);
@@ -92 +92 @@
     #region IVRPEvaluator Members
 
-    public bool Feasible(IVRPProblemInstance instance, IVRPEncoding solution) {
-      bool feasible = true;
+    public bool Feasible(VRPEvaluation evaluation) {
+      return evaluation.Penalty < double.Epsilon;
+    }
+
+    public VRPEvaluation Evaluate(IVRPProblemInstance instance, IVRPEncoding solution) {
+      VRPEvaluation evaluation = CreateTourEvaluation();
 
       foreach (Tour tour in solution.GetTours()) {
-        if (!Feasible(instance, tour)) {
-          feasible = false;
-          break;
-        }
+        EvaluateTour(evaluation, instance, tour);
       }
 
-      return feasible;
+      return evaluation;
     }
 
-    public bool Feasible(IVRPProblemInstance instance, Tour tour) {
-      return EvaluateTour(instance, tour).Penalty < double.Epsilon;
-    }
-
-    public double Evaluate(IVRPProblemInstance instance, IVRPEncoding solution) {
-      double quality = 0;
-
-      foreach (Tour tour in solution.GetTours()) {
-        quality += Evaluate(instance, tour);
-      }
-
-      return quality;
-    }
-
-    public double Evaluate(IVRPProblemInstance instance, Tour tour) {
-      return EvaluateTour(instance, tour).Quality;
+    public VRPEvaluation Evaluate(IVRPProblemInstance instance, Tour tour) {
+      return EvaluateTour(instance, tour);
     }