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

add location info for scheduling breaks with route builder

Browse source
This commit is contained in:
oblonski 2017-04-19 14:04:19 +02:00
parent 271d251c35
commit 933e2ca120
No known key found for this signature in database
GPG key ID: 179DE487285680D1
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java
View file

@ -19,6 +19,7 @@ package com.graphhopper.jsprit.core.problem.solution.route;
import com.graphhopper.jsprit.core.problem.AbstractActivity; import com.graphhopper.jsprit.core.problem.AbstractActivity;
import com.graphhopper.jsprit.core.problem.JobActivityFactory; import com.graphhopper.jsprit.core.problem.JobActivityFactory;
import com.graphhopper.jsprit.core.problem.Location;
import com.graphhopper.jsprit.core.problem.driver.Driver; import com.graphhopper.jsprit.core.problem.driver.Driver;
import com.graphhopper.jsprit.core.problem.driver.DriverImpl; import com.graphhopper.jsprit.core.problem.driver.DriverImpl;
import com.graphhopper.jsprit.core.problem.job.*; import com.graphhopper.jsprit.core.problem.job.*;
@ -186,6 +187,16 @@ public class VehicleRoute {
return addService(service,service.getTimeWindow()); return addService(service,service.getTimeWindow());
} }
private Builder addBreakInternally(Break currentBreak, TimeWindow timeWindow, Location breakLocation) {
List<AbstractActivity> acts = jobActivityFactory.createActivities(currentBreak);
BreakActivity act = (BreakActivity) acts.get(0);
act.setTheoreticalEarliestOperationStartTime(timeWindow.getStart());
act.setTheoreticalLatestOperationStartTime(timeWindow.getEnd());
act.setLocation(breakLocation);
tourActivities.addActivity(act);
return this;
}
public Builder addService(Service service, TimeWindow timeWindow) { public Builder addService(Service service, TimeWindow timeWindow) {
if (service == null) throw new IllegalArgumentException("service must not be null"); if (service == null) throw new IllegalArgumentException("service must not be null");
List<AbstractActivity> acts = jobActivityFactory.createActivities(service); List<AbstractActivity> acts = jobActivityFactory.createActivities(service);
@ -196,16 +207,25 @@ public class VehicleRoute {
return this; return this;
} }
@Deprecated
public Builder addBreak(Break currentbreak) { public Builder addBreak(Break currentbreak) {
if (currentbreak == null) throw new IllegalArgumentException("break must not be null"); if (currentbreak == null) throw new IllegalArgumentException("break must not be null");
return addBreak(currentbreak, currentbreak.getTimeWindow()); return addBreak(currentbreak, currentbreak.getTimeWindow());
} }
@Deprecated
public Builder addBreak(Break currentbreak, TimeWindow timeWindow) { public Builder addBreak(Break currentbreak, TimeWindow timeWindow) {
if (currentbreak == null) throw new IllegalArgumentException("break must not be null"); if (currentbreak == null) throw new IllegalArgumentException("break must not be null");
return addService(currentbreak,timeWindow); return addService(currentbreak,timeWindow);
} }
public Builder addBreak(Break currentBreak, TimeWindow timeWindow, Location breakLocation) {
if (currentBreak == null) throw new IllegalArgumentException("break must not be null");
return addBreakInternally(currentBreak, timeWindow, breakLocation);
}
/** /**
* Adds a pickup to this route. * Adds a pickup to this route.
* *