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

reproduced bug #112

Browse source
This commit is contained in:
oblonski 2014-07-30 10:08:29 +02:00
parent 63cd55ebb7
commit c32507329d
3 changed files with 221 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -288,25 +288,43 @@ public class VehicleRoutingProblem {
}
@SuppressWarnings("deprecation")
public Builder addInitialVehicleRoute(VehicleRoute route){
addVehicle(route.getVehicle());
for(Job job : route.getTourActivities().getJobs()){
jobsInInitialRoutes.add(job.getId());
if(job instanceof Service) {
tentative_coordinates.put(((Service)job).getLocationId(), ((Service)job).getCoord());
}
if(job instanceof Shipment){
Shipment shipment = (Shipment)job;
tentative_coordinates.put(shipment.getPickupLocation(), shipment.getPickupCoord());
tentative_coordinates.put(shipment.getDeliveryLocation(), shipment.getDeliveryCoord());
}
}
addVehicle((AbstractVehicle)route.getVehicle());
for(TourActivity act : route.getActivities()){
AbstractActivity abstractAct = (AbstractActivity) act;
abstractAct.setIndex(activityIndexCounter);
incActivityIndexCounter();
if(act instanceof TourActivity.JobActivity) {
Job job = ((TourActivity.JobActivity) act).getJob();
jobsInInitialRoutes.add(job.getId());
registerLocation(job);
registerJobAndActivity(abstractAct, job);
}
}
initialRoutes.add(route);
return this;
}
public Builder addInitialVehicleRoutes(Collection<VehicleRoute> routes){
private void registerLocation(Job job) {
if (job instanceof Service) tentative_coordinates.put(((Service) job).getLocationId(), ((Service) job).getCoord());
if (job instanceof Shipment) {
Shipment shipment = (Shipment) job;
tentative_coordinates.put(shipment.getPickupLocation(), shipment.getPickupCoord());
tentative_coordinates.put(shipment.getDeliveryLocation(), shipment.getDeliveryCoord());
}
}
private void registerJobAndActivity(AbstractActivity abstractAct, Job job) {
if(activityMap.containsKey(job)) activityMap.get(job).add(abstractAct);
else{
List<AbstractActivity> actList = new ArrayList<AbstractActivity>();
actList.add(abstractAct);
activityMap.put(job,actList);
}
}
public Builder addInitialVehicleRoutes(Collection<VehicleRoute> routes){
for(VehicleRoute r : routes){
addInitialVehicleRoute(r);
}