Changeset 4520 for branches/VRP

Timestamp:

09/27/10 16:00:18 (14 years ago)

Author:

svonolfe

Message:

Improved VRP evaluation (#1177)

Location:

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

Files:

• SingleDepotVRP/CVRP/CVRPEvaluator.cs (modified) (1 diff)
• SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs (modified) (1 diff)
• VRPEvaluator.cs (modified) (2 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs

@@ -93 +93 @@
     }
 
-    protected override void UpdateResultParameters(VRPEvaluation tourEvaluation) {
-      base.UpdateResultParameters(tourEvaluation);
+    protected override void SetResultParameters(VRPEvaluation tourEvaluation) {
+      base.SetResultParameters(tourEvaluation);
 
-      OverloadParameter.ActualValue.Value += (tourEvaluation as CVRPEvaluation).Overload;
+      OverloadParameter.ActualValue.Value = (tourEvaluation as CVRPEvaluation).Overload;
     }
     

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs

@@ -130 +130 @@
     }
 
-    protected override void UpdateResultParameters(VRPEvaluation tourEvaluation) {
-      base.UpdateResultParameters(tourEvaluation);
+    protected override void SetResultParameters(VRPEvaluation tourEvaluation) {
+      base.SetResultParameters(tourEvaluation);
 
-      TardinessParameter.ActualValue.Value += (tourEvaluation as CVRPTWEvaluation).Tardiness;
-      TravelTimeParameter.ActualValue.Value += (tourEvaluation as CVRPTWEvaluation).TravelTime;
+      TardinessParameter.ActualValue.Value = (tourEvaluation as CVRPTWEvaluation).Tardiness;
+      TravelTimeParameter.ActualValue.Value = (tourEvaluation as CVRPTWEvaluation).TravelTime;
     }
     

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

@@ -78 +78 @@
     }
 
-    protected virtual void UpdateResultParameters(VRPEvaluation tourEvaluation) {
-      QualityParameter.ActualValue.Value += tourEvaluation.Quality;
-      VehcilesUtilizedParameter.ActualValue.Value += tourEvaluation.VehicleUtilization;
-      DistanceParameter.ActualValue.Value += tourEvaluation.Distance;
+    protected virtual void SetResultParameters(VRPEvaluation tourEvaluation) {
+      QualityParameter.ActualValue.Value = tourEvaluation.Quality;
+      VehcilesUtilizedParameter.ActualValue.Value = tourEvaluation.VehicleUtilization;
+      DistanceParameter.ActualValue.Value = tourEvaluation.Distance;
     }
 
@@ -111 +111 @@
 
     public override IOperation Apply() {
-      double quality = 0;
       InitResultParameters();
 
+      VRPEvaluation evaluation = CreateTourEvaluation();
       foreach (Tour tour in VRPToursParameter.ActualValue.GetTours()) {
-        VRPEvaluation tourEvaluation = EvaluateTour(ProblemInstance, tour);
-        quality += tourEvaluation.Quality;
+        EvaluateTour(evaluation, ProblemInstance, tour);
+      }
+      SetResultParameters(evaluation);
 
-        UpdateResultParameters(tourEvaluation);
-      }
-
-      QualityParameter.ActualValue = new DoubleValue(quality);
+      QualityParameter.ActualValue = new DoubleValue(evaluation.Quality);
 
       return base.Apply();