trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

clean up VehicleRoutingAlgorithm.addInitialSolution()

Browse source
This commit is contained in:
Michal Maciejewski 2019-05-07 13:58:41 +02:00
parent 89c1562b60
commit 990a4e7f68
No known key found for this signature in database
GPG key ID: 015947E60A2AD77B
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/VehicleRoutingAlgorithm.java
View file

@ -135,23 +135,28 @@ public class VehicleRoutingAlgorithm {
this.objectiveFunction = objectiveFunction; this.objectiveFunction = objectiveFunction;
} }
/** /**
* Adds solution to the collection of initial solutions. * Adds solution to the collection of initial solutions.
* *
* @param solution the solution to be added * This method may lead to errors if tour activities in the solution are different to the
*/ * ones in the VRP (including differences in indexing)
public void addInitialSolution(VehicleRoutingProblemSolution solution) { *
* @param solution the solution to be added
*/
public void addInitialSolution(VehicleRoutingProblemSolution solution) {
// We will make changes so let's make a copy // We will make changes so let's make a copy
solution = VehicleRoutingProblemSolution.copyOf(solution); solution = VehicleRoutingProblemSolution.copyOf(solution);
verify(solution); verifyAndAdaptSolution(solution);
initialSolutions.add(solution); initialSolutions.add(solution);
} }
private void verify(VehicleRoutingProblemSolution solution) { //this method may lead to errors if tour activities in the solution are different to the ones in the VRP
Set<Job> allJobs = new HashSet<Job>(problem.getJobs().values()); //(including differences in indexing)
allJobs.removeAll(solution.getUnassignedJobs()); private void verifyAndAdaptSolution(VehicleRoutingProblemSolution solution) {
Set<Job> jobsNotInSolution = new HashSet<Job>(problem.getJobs().values());
jobsNotInSolution.removeAll(solution.getUnassignedJobs());
for (VehicleRoute route : solution.getRoutes()) { for (VehicleRoute route : solution.getRoutes()) {
allJobs.removeAll(route.getTourActivities().getJobs()); jobsNotInSolution.removeAll(route.getTourActivities().getJobs());
if (route.getVehicle().getIndex() == 0) if (route.getVehicle().getIndex() == 0)
throw new IllegalStateException("vehicle used in initial solution has no index. probably a vehicle is used that has not been added to the " + throw new IllegalStateException("vehicle used in initial solution has no index. probably a vehicle is used that has not been added to the " +
" the VehicleRoutingProblem. only use vehicles that have already been added to the problem."); " the VehicleRoutingProblem. only use vehicles that have already been added to the problem.");
@ -164,7 +169,9 @@ public class VehicleRoutingAlgorithm {
} }
} }
solution.getUnassignedJobs().addAll(allJobs); //if solution is partial (not all jobs are considered), add these jobs to solution.unassignedJobs
solution.getUnassignedJobs().addAll(jobsNotInSolution);
//update the cost of solution (regardless if partial or not)
solution.setCost(getObjectiveFunction().getCosts(solution)); solution.setCost(getObjectiveFunction().getCosts(solution));
// if (nuJobs != problem.getJobs().values().size()) { // if (nuJobs != problem.getJobs().values().size()) {