Changeset 4378 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP
- Timestamp:
- 09/10/10 13:00:54 (14 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs
r4377 r4378 73 73 eval.Quality += instance.DistanceFactor.Value * distance; 74 74 75 eval.Distance = distance;76 eval.VehicleUtilization = 1;75 eval.Distance += distance; 76 eval.VehicleUtilization += 1; 77 77 78 78 double capacity = cvrpInstance.Capacity.Value; … … 81 81 } 82 82 83 (eval as CVRPEvaluation).Overload = overweight;83 (eval as CVRPEvaluation).Overload += overweight; 84 84 double penalty = overweight * cvrpInstance.OverloadPenalty.Value; 85 85 eval.Penalty += penalty; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs
r4377 r4378 101 101 eval.Quality += instance.FleetUsageFactor.Value; 102 102 eval.Quality += instance.DistanceFactor.Value * distance; 103 eval.Distance = distance;104 eval.VehicleUtilization = 1;103 eval.Distance += distance; 104 eval.VehicleUtilization += 1; 105 105 106 106 double capacity = cvrpInstance.Capacity.Value; … … 109 109 } 110 110 111 (eval as CVRPEvaluation).Overload = overweight;111 (eval as CVRPEvaluation).Overload += overweight; 112 112 double penalty = overweight * cvrpInstance.OverloadPenalty.Value; 113 113 eval.Penalty += penalty; 114 114 eval.Quality += penalty; 115 115 116 (eval as CVRPTWEvaluation).Tardiness = tardiness;117 (eval as CVRPTWEvaluation).TravelTime = time;116 (eval as CVRPTWEvaluation).Tardiness += tardiness; 117 (eval as CVRPTWEvaluation).TravelTime += time; 118 118 119 119 penalty = tardiness * vrptw.TardinessPenalty.Value;
Note: See TracChangeset
for help on using the changeset viewer.