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

fix update all routes bug

Browse source
This commit is contained in:
oblonski 2016-07-18 08:50:18 +02:00
parent 5307e65c10
commit dda2cb4452
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/RegretInsertionConcurrentFast.java
View file

@ -174,20 +174,20 @@ public class RegretInsertionConcurrentFast extends AbstractInsertionStrategy {
priorityQueues[unassignedJob.getIndex()] = new TreeSet<VersionedInsertionData>(InsertionDataUpdater.getComparator()); priorityQueues[unassignedJob.getIndex()] = new TreeSet<VersionedInsertionData>(InsertionDataUpdater.getComparator());
} }
if(firstRun) { if(firstRun) {
makeCallables(tasks, true, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified);
updatedAllRoutes = true; updatedAllRoutes = true;
makeCallables(tasks, updatedAllRoutes, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified);
} }
else{ else{
if(dependencyTypes == null || dependencyTypes[unassignedJob.getIndex()] == null){ if(dependencyTypes == null || dependencyTypes[unassignedJob.getIndex()] == null){
makeCallables(tasks, false, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified); makeCallables(tasks, updatedAllRoutes, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified);
} }
else { else {
DependencyType dependencyType = dependencyTypes[unassignedJob.getIndex()]; DependencyType dependencyType = dependencyTypes[unassignedJob.getIndex()];
if (dependencyType.equals(DependencyType.INTER_ROUTE) || dependencyType.equals(DependencyType.INTRA_ROUTE)) { if (dependencyType.equals(DependencyType.INTER_ROUTE) || dependencyType.equals(DependencyType.INTRA_ROUTE)) {
makeCallables(tasks, false, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified);
updatedAllRoutes = true; updatedAllRoutes = true;
makeCallables(tasks, updatedAllRoutes, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified);
} else { } else {
makeCallables(tasks, true, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified); makeCallables(tasks, updatedAllRoutes, priorityQueues[unassignedJob.getIndex()], updateRound, unassignedJob, routes, lastModified);
} }
} }
} }