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

modified core.problem.VehicleRoutingProblem.Builder to deal with jobs

Browse source 
being part of initial routes

i.e. these jobs do not appear in jobMap of problem since they are not
variable anymore
This commit is contained in:
oblonski 2014-04-25 23:32:29 +02:00
parent 5327cf11ba
commit eaa0a9e5e4
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java
View file

@ -161,6 +161,10 @@ public class VehicleRoutingProblem {
private Map<String,Job> jobs;
private Map<String,Job> tentativeJobs = new HashMap<String,Job>();
private Set<String> jobsInInitialRoutes = new HashSet<String>();
private Collection<Service> services;
private Map<String, Coordinate> coordinates;
@ -298,21 +302,25 @@ public class VehicleRoutingProblem {
* @throws IllegalStateException if job is neither a shipment nor a service, or jobId has already been added.
*/
public Builder addJob(Job job) {
if(jobs.containsKey(job.getId())) throw new IllegalStateException("jobList already contains a job with id " + job.getId() + ". make sure you use unique ids for your jobs (i.e. service and shipments)");
if(tentativeJobs.containsKey(job.getId())) throw new IllegalStateException("jobList already contains a job with id " + job.getId() + ". make sure you use unique ids for your jobs (i.e. service and shipments)");
if(!(job instanceof Service || job instanceof Shipment)) throw new IllegalStateException("job must be either a service or a shipment");
tentativeJobs.put(job.getId(), job);
return this;
}
private void addJobToFinalJobMap(Job job){
if(job instanceof Service) {
addService((Service) job);
return this;
}
else if(job instanceof Shipment){
addShipment((Shipment)job);
return this;
}
throw new IllegalStateException("job must be either a service or a shipment");
}
public Builder addInitialVehicleRoute(VehicleRoute route){
addVehicle(route.getVehicle());
for(Job job : route.getTourActivities().getJobs()){
jobsInInitialRoutes.add(job.getId());
if(job instanceof Service) coordinates.put(((Service)job).getLocationId(), ((Service)job).getCoord());
if(job instanceof Shipment){
Shipment shipment = (Shipment)job;
@ -393,6 +401,11 @@ public class VehicleRoutingProblem {
addPenaltyVehicles();
}
}
for(Job job : tentativeJobs.values()){
if(!jobsInInitialRoutes.contains(job.getId())){
addJobToFinalJobMap(job);
}
}
return new VehicleRoutingProblem(this);
}
@ -528,7 +541,7 @@ public class VehicleRoutingProblem {
* @return collection of jobs
*/
public Collection<Job> getAddedJobs(){
return Collections.unmodifiableCollection(jobs.values());
return Collections.unmodifiableCollection(tentativeJobs.values());
}
/**