Skip to content

fix a bug in fast regret #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix a bug in fast regret #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions ...re/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/InsertionDataUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,31 @@ static boolean update(boolean addAllAvailable, Set<String> initialVehicleIds, Ve
relevantVehicles.addAll(fleetManager.getAvailableVehicles(route.getVehicle()));
}
} else relevantVehicles.addAll(fleetManager.getAvailableVehicles());
double bestCost = Double.MAX_VALUE;
InsertionData bestIData = new InsertionData.NoInsertionFound();
for (Vehicle v : relevantVehicles) {
double depTime = v.getEarliestDeparture();
InsertionData iData = insertionCostsCalculator.getInsertionData(route, unassignedJob, v, depTime, route.getDriver(), Double.MAX_VALUE);
if (iData instanceof InsertionData.NoInsertionFound) {
continue;
}
insertionDataSet.add(new VersionedInsertionData(iData, updateRound, route));
if (iData.getInsertionCost() < bestCost) {
bestIData = iData;
bestCost = iData.getInsertionCost();
}
}
Iterator<VersionedInsertionData> iterator = insertionDataSet.iterator();
while (iterator.hasNext()) {
VersionedInsertionData versionedInsertionData = iterator.next();
if (versionedInsertionData.getRoute() == route &&
versionedInsertionData.getVersion() != updateRound)
iterator.remove();
}
insertionDataSet.add(new VersionedInsertionData(bestIData, updateRound, route));
}
return true;
}



static VehicleRoute findRoute(Collection<VehicleRoute> routes, Job job) {
for(VehicleRoute r : routes){
if(r.getVehicle().getBreak() == job) return r;
Expand Down Expand Up @@ -115,16 +126,13 @@ static ScoredJob getBest(boolean switchAllowed, Set<String> initialVehicleIds, V
} else continue;
}
}
int currentDataVersion = updates.get(versionedIData.getRoute());
if(versionedIData.getVersion() == currentDataVersion){
if(best == null) {
best = versionedIData.getiData();
bestRoute = versionedIData.getRoute();
}
else {
secondBest = versionedIData.getiData();
break;
}
if(best == null) {
best = versionedIData.getiData();
bestRoute = versionedIData.getRoute();
}
else {
secondBest = versionedIData.getiData();
break;
}
}
VehicleRoute emptyRoute = VehicleRoute.emptyRoute();
Expand Down Expand Up @@ -157,6 +165,11 @@ static ScoredJob getBest(boolean switchAllowed, Set<String> initialVehicleIds, V
else if(scoredJob.getScore() > bestScoredJob.getScore()){
bestScoredJob = scoredJob;
}
else if (scoredJob.getScore() == bestScoredJob.getScore()) {
if (scoredJob.getJob().getId().compareTo(bestScoredJob.getJob().getId()) <= 0) {
bestScoredJob = scoredJob;
}
}
}
return bestScoredJob;
}
Expand Down