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.copyAndGetActivities such that it returns an empty list if no activities to copy

Browse source
This commit is contained in:
oblonski 2014-07-23 23:14:14 +02:00
parent 8e3977e78f
commit 4e6d91ac01
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ public class VehicleRoutingProblem {
private JobActivityFactory jobActivityFactory = new JobActivityFactory() { private JobActivityFactory jobActivityFactory = new JobActivityFactory() {
@Override @Override
public List<AbstractActivity> createActivity(Job job) { public List<AbstractActivity> createActivities(Job job) {
List<AbstractActivity> acts = new ArrayList<AbstractActivity>(); List<AbstractActivity> acts = new ArrayList<AbstractActivity>();
if(job instanceof Service){ if(job instanceof Service){
acts.add(serviceActivityFactory.createActivity((Service) job)); acts.add(serviceActivityFactory.createActivity((Service) job));
@ -287,7 +287,7 @@ public class VehicleRoutingProblem {
Shipment shipment = (Shipment)job; Shipment shipment = (Shipment)job;
addShipment(shipment); addShipment(shipment);
} }
List<AbstractActivity> jobActs = jobActivityFactory.createActivity(job); List<AbstractActivity> jobActs = jobActivityFactory.createActivities(job);
for(AbstractActivity act : jobActs){ for(AbstractActivity act : jobActs){
act.setIndex(activityIndexCounter); act.setIndex(activityIndexCounter);
incActivityIndexCounter(); incActivityIndexCounter();
@ -739,9 +739,11 @@ public class VehicleRoutingProblem {
public List<AbstractActivity> copyAndGetActivities(Job job){ public List<AbstractActivity> copyAndGetActivities(Job job){
List<AbstractActivity> acts = new ArrayList<AbstractActivity>(); List<AbstractActivity> acts = new ArrayList<AbstractActivity>();
if(activityMap.containsKey(job)) {
for (AbstractActivity act : activityMap.get(job)) { for (AbstractActivity act : activityMap.get(job)) {
acts.add((AbstractActivity) act.duplicate()); acts.add((AbstractActivity) act.duplicate());
} }
}
return acts; return acts;
} }