Changeset 4520 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP

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/SingleDepotVRP/CVRP

Files:

• CVRPEvaluator.cs (modified) (1 diff)
• CVRPTW/CVRPTWEvaluator.cs (modified) (1 diff)

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;
     }