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

remove redundant stuff

Browse source
This commit is contained in:
oblonski 2016-05-31 10:53:44 +02:00
parent 7cb0c694c7
commit 2468ca758e
1 changed files with 4 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

36
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakScheduling.java
View file

@ -29,8 +29,6 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
private Set<VehicleRoute> modifiedRoutes = new HashSet<VehicleRoute>();
private boolean firstRuin = true;
public BreakScheduling(VehicleRoutingProblem vrp, StateManager stateManager, ConstraintManager constraintManager) {
this.stateManager = stateManager;
this.breakInsertionCalculator = new BreakInsertionCalculator(vrp.getTransportCosts(),vrp.getActivityCosts(),new LocalActivityInsertionCostsCalculator(vrp.getTransportCosts(),vrp.getActivityCosts(),stateManager),constraintManager);
@ -68,26 +66,18 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
@Override
public void ruinEnds(Collection<VehicleRoute> routes, Collection<Job> unassignedJobs) {
// if(firstRuin){
// firstRuin = false;
// modifiedRoutes.clear();
// modifiedRoutes.addAll(routes);
// }
for(VehicleRoute route : routes){
Break aBreak = route.getVehicle().getBreak();
boolean removed = route.getTourActivities().removeJob(aBreak);
if(removed) logger.trace("ruin: {}", aBreak.getId());
}
List<Break> breaks = new ArrayList<Break>();
// if(!modifiedRoutes.isEmpty()) {
for (Job j : unassignedJobs) {
if (j instanceof Break) {
breaks.add((Break) j);
}
for (Job j : unassignedJobs) {
if (j instanceof Break) {
breaks.add((Break) j);
}
// }
}
for(Break b : breaks){ unassignedJobs.remove(b); }
// modifiedRoutes.clear();
}
@Override
@ -111,24 +101,6 @@ public class BreakScheduling implements InsertionStartsListener,JobInsertedListe
}
}
}
// if(aBreak != null){
// boolean removed = route.getTourActivities().removeJob(aBreak);
// if(removed){
// logger.trace("ruin: {}", aBreak.getId());
// stateManager.removed(aBreak,route);
// stateManager.reCalculateStates(route);
// }
// if(route.getEnd().getArrTime() > aBreak.getTimeWindow().getEnd()){
// InsertionData iData = breakInsertionCalculator.getInsertionData(route, aBreak, route.getVehicle(), route.getDepartureTime(), route.getDriver(), Double.MAX_VALUE);
// if(!(iData instanceof InsertionData.NoInsertionFound)){
// logger.trace("insert: [jobId={}]{}", aBreak.getId(), iData);
// for(Event e : iData.getEvents()){
// eventListeners.inform(e);
// }
// stateManager.informJobInserted(aBreak,route,0,0);
// }
// }
// }
}
}