Changeset 17698 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP
- Timestamp:
- 07/24/20 00:58:42 (4 years ago)
- Location:
- branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPEvaluator.cs
r17226 r17698 40 40 } 41 41 42 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncod ingsolution) {42 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncodedSolution solution) { 43 43 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); ; 44 44 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); … … 98 98 } 99 99 100 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncod ingsolution, TourInsertionInfo tourInsertionInfo, int index, int customer,100 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncodedSolution solution, TourInsertionInfo tourInsertionInfo, int index, int customer, 101 101 out bool feasible) { 102 102 CVRPInsertionInfo insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index) as CVRPInsertionInfo; -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPPDTW/CVRPPDTWEvaluator.cs
r17226 r17698 42 42 } 43 43 44 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncod ingsolution) {44 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncodedSolution solution) { 45 45 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 46 46 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); … … 167 167 } 168 168 169 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncod ingsolution, TourInsertionInfo tourInsertionInfo, int index, int customer,169 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncodedSolution solution, TourInsertionInfo tourInsertionInfo, int index, int customer, 170 170 out bool feasible) { 171 171 CVRPPDTWInsertionInfo insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index) as CVRPPDTWInsertionInfo; -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/CVRP/CVRPTW/CVRPTWEvaluator.cs
r17226 r17698 45 45 } 46 46 47 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncod ingsolution) {47 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncodedSolution solution) { 48 48 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 49 49 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); … … 149 149 } 150 150 151 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncod ingsolution, TourInsertionInfo tourInsertionInfo, int index, int customer,151 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncodedSolution solution, TourInsertionInfo tourInsertionInfo, int index, int customer, 152 152 out bool feasible) { 153 153 CVRPTWInsertionInfo insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index) as CVRPTWInsertionInfo; -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPEvaluator.cs
r17226 r17698 30 30 [StorableType("1E0DECD9-54BF-4F69-A743-228C481749A0")] 31 31 public class SingleDepotVRPEvaluator : VRPEvaluator { 32 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncod ingsolution) {32 protected override void EvaluateTour(VRPEvaluation eval, IVRPProblemInstance instance, Tour tour, IVRPEncodedSolution solution) { 33 33 TourInsertionInfo tourInfo = new TourInsertionInfo(solution.GetVehicleAssignment(solution.GetTourIndex(tour))); 34 34 eval.InsertionInfo.AddTourInsertionInfo(tourInfo); … … 66 66 } 67 67 68 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncod ingsolution, TourInsertionInfo tourInsertionInfo, int index, int customer,68 protected override double GetTourInsertionCosts(IVRPProblemInstance instance, IVRPEncodedSolution solution, TourInsertionInfo tourInsertionInfo, int index, int customer, 69 69 out bool feasible) { 70 70 StopInsertionInfo insertionInfo = tourInsertionInfo.GetStopInsertionInfo(index); -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/SingleDepotVRP/SingleDepotVRPProblemInstance.cs
r17226 r17698 22 22 using System.Collections.Generic; 23 23 using System.Linq; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 26 27 using HeuristicLab.Data; 27 28 using HeuristicLab.Optimization; 28 using HEAL.Attic;29 29 using HeuristicLab.PluginInfrastructure; 30 30 using HeuristicLab.Problems.VehicleRouting.Interfaces;
Note: See TracChangeset
for help on using the changeset viewer.