Changeset 6883 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4
- Timestamp:
- 10/06/11 12:27:40 (13 years ago)
- Location:
- branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPEvaluator.cs
r6854 r6883 48 48 49 49 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 50 TourInsertionInfo tourInfo = new TourInsertionInfo( );50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 52 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPPDTW/MDCVRPPDTWEvaluator.cs
r6856 r6883 48 48 49 49 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 50 TourInsertionInfo tourInfo = new TourInsertionInfo( );50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 52 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MDCVRP/MDCVRPTW/MDCVRPTWEvaluator.cs
r6855 r6883 52 52 53 53 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 54 TourInsertionInfo tourInfo = new TourInsertionInfo( );54 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 55 55 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 56 56 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/MultiDepotVRP/MultiDepotVRPEvaluator.cs
r6854 r6883 41 41 public class MultiDepotVRPEvaluator: VRPEvaluator { 42 42 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 43 TourInsertionInfo tourInfo = new TourInsertionInfo( );43 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 44 44 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 45 45 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs
r6851 r6883 48 48 49 49 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 50 TourInsertionInfo tourInfo = new TourInsertionInfo( );50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); ; 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 52 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs
r6855 r6883 48 48 49 49 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 50 TourInsertionInfo tourInfo = new TourInsertionInfo( );50 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 51 51 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 52 52 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs
r6855 r6883 52 52 53 53 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 54 TourInsertionInfo tourInfo = new TourInsertionInfo( );54 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 55 55 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 56 56 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs
r6851 r6883 41 41 public class SingleDepotVRPEvaluator: VRPEvaluator { 42 42 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncoding solution) { 43 TourInsertionInfo tourInfo = new TourInsertionInfo( );43 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 44 44 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); 45 45 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluation.cs
r6752 r6883 52 52 public double Penalty { get; set; } 53 53 54 public int Vehicle { get; set; } 55 54 56 private List<StopInsertionInfo> stopInsertionInfos; 55 57 56 public TourInsertionInfo( )58 public TourInsertionInfo(int vehicle) 57 59 : base() { 58 60 stopInsertionInfos = new List<StopInsertionInfo>(); 61 Vehicle = vehicle; 59 62 } 60 63
Note: See TracChangeset
for help on using the changeset viewer.