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

Timestamp:

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

Author:

svonolfe

Message:

Improved performance of PotvinEncoding(#1177)

Location:

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

Files:

• CVRPEvaluator.cs (modified) (2 diffs)
• CVRPTW/CVRPTWEvaluator.cs (modified) (2 diffs)

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

@@ -73 +73 @@
       eval.Quality += instance.DistanceFactor.Value * distance;
 
-      eval.Distance = distance;
-      eval.VehicleUtilization = 1;
+      eval.Distance += distance;
+      eval.VehicleUtilization += 1;
 
       double capacity = cvrpInstance.Capacity.Value;
@@ -81 +81 @@
       }
 
-      (eval as CVRPEvaluation).Overload = overweight;
+      (eval as CVRPEvaluation).Overload += overweight;
       double penalty = overweight * cvrpInstance.OverloadPenalty.Value;
       eval.Penalty += penalty;

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

@@ -101 +101 @@
       eval.Quality += instance.FleetUsageFactor.Value;
       eval.Quality += instance.DistanceFactor.Value * distance;
-      eval.Distance = distance;
-      eval.VehicleUtilization = 1;
+      eval.Distance += distance;
+      eval.VehicleUtilization += 1;
 
       double capacity = cvrpInstance.Capacity.Value;
@@ -109 +109 @@
       }
 
-      (eval as CVRPEvaluation).Overload = overweight;
+      (eval as CVRPEvaluation).Overload += overweight;
       double penalty = overweight * cvrpInstance.OverloadPenalty.Value;
       eval.Penalty += penalty;
       eval.Quality += penalty;
 
-      (eval as CVRPTWEvaluation).Tardiness = tardiness;
-      (eval as CVRPTWEvaluation).TravelTime = time;
+      (eval as CVRPTWEvaluation).Tardiness += tardiness;
+      (eval as CVRPTWEvaluation).TravelTime += time;
 
       penalty = tardiness * vrptw.TardinessPenalty.Value;