Changeset 7276
- Timestamp:
- 01/05/12 10:55:39 (13 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances
- Files:
-
- 10 edited
-
MultiDepotVRP/MDCVRP/MDCVRPEvaluator.cs (modified) (2 diffs)
-
MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWEvaluator.cs (modified) (2 diffs)
-
MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWEvaluator.cs (modified) (2 diffs)
-
MultiDepotVRP/MultiDepotVRPEvaluator.cs (modified) (1 diff)
-
SingleDepotVRP/CVRP/CVRPEvaluator.cs (modified) (2 diffs)
-
SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs (modified) (2 diffs)
-
SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs (modified) (2 diffs)
-
SingleDepotVRP/SingleDepotVRPEvaluator.cs (modified) (1 diff)
-
VRPEvaluation.cs (modified) (1 diff)
-
VRPEvaluator.cs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPEvaluator.cs
r6883 r7276 50 50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 double originalQuality = eval.Quality; 52 53 53 54 IHeterogenousCapacitatedProblemInstance cvrpInstance = instance as IHeterogenousCapacitatedProblemInstance; … … 99 100 eval.Quality += penalty; 100 101 tourInfo.Penalty = penalty; 102 tourInfo.Quality = eval.Quality - originalQuality; 101 103 } 102 104 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWEvaluator.cs
r6883 r7276 50 50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 double originalQuality = eval.Quality; 52 53 53 54 IHeterogenousCapacitatedProblemInstance cvrpInstance = instance as IHeterogenousCapacitatedProblemInstance; … … 183 184 eval.Quality += time * vrptw.TimeFactor.Value; 184 185 tourInfo.Penalty = tourPenalty; 186 tourInfo.Quality = eval.Quality - originalQuality; 185 187 } 186 188 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWEvaluator.cs
r6883 r7276 54 54 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 55 55 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 56 double originalQuality = eval.Quality; 56 57 57 58 IHeterogenousCapacitatedProblemInstance cvrpInstance = instance as IHeterogenousCapacitatedProblemInstance; … … 163 164 eval.Quality += time * vrptw.TimeFactor.Value; 164 165 tourInfo.Penalty = tourPenalty; 166 tourInfo.Quality = eval.Quality - originalQuality; 165 167 } 166 168 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MultiDepotVRPEvaluator.cs
r6883 r7276 73 73 74 74 eval.Quality += quality; 75 tourInfo.Quality = quality; 75 76 } 76 77 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs
r6883 r7276 50 50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); ; 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 double originalQuality = eval.Quality; 52 53 53 54 IHomogenousCapacitatedProblemInstance cvrpInstance = instance as IHomogenousCapacitatedProblemInstance; … … 101 102 eval.Quality += penalty; 102 103 tourInfo.Penalty = penalty; 104 tourInfo.Quality = eval.Quality - originalQuality; 103 105 } 104 106 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs
r6883 r7276 50 50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 double originalQuality = eval.Quality; 52 53 53 54 IHomogenousCapacitatedProblemInstance cvrpInstance = instance as IHomogenousCapacitatedProblemInstance; … … 168 169 eval.Quality += time * vrptw.TimeFactor.Value; 169 170 tourInfo.Penalty = tourPenalty; 171 tourInfo.Quality = eval.Quality - originalQuality; 170 172 } 171 173 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs
r6883 r7276 54 54 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 55 55 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 56 double originalQuality = eval.Quality; 56 57 57 58 IHomogenousCapacitatedProblemInstance cvrpInstance = instance as IHomogenousCapacitatedProblemInstance; … … 151 152 eval.Quality += time * vrptw.TimeFactor.Value; 152 153 tourInfo.Penalty = tourPenalty; 154 tourInfo.Quality = eval.Quality - originalQuality; 153 155 } 154 156 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs
r6883 r7276 72 72 eval.VehicleUtilization += 1; 73 73 74 tourInfo.Quality = quality; 74 75 eval.Quality += quality; 75 76 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluation.cs
r6883 r7276 51 51 public class TourInsertionInfo { 52 52 public double Penalty { get; set; } 53 public double Quality { get; set; } 53 54 54 55 public int Vehicle { get; set; } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs
r6851 r7276 110 110 instance, 111 111 solution, 112 eval.InsertionInfo.GetTourInsertionInfo(tour), index, 112 eval.InsertionInfo.GetTourInsertionInfo(tour), 113 index, 113 114 customer, out tourFeasible); 114 115
Note: See TracChangeset
for help on using the changeset viewer.
