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

Merge branch 'master' into PickupAndDelivery

Browse source
This commit is contained in:
oblonski 2013-10-18 05:30:52 +02:00
commit 6eddbbbef7
8 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>jsprit</groupId>
<artifactId>jsprit</artifactId>
<version>0.0.4-SNAPSHOT</version>
<version>0.0.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsprit-core</artifactId>

10
jsprit-core/src/main/java/basics/route/TourActivities.java
View file

@ -145,12 +145,6 @@ public class TourActivities {
activityRemoved = true;
}
}
else if(c instanceof ServiceActivity){
if(job.equals(((ServiceActivity) c).getJob())){
tourActivities.remove(c);
activityRemoved = true;
}
}
}
if(jobRemoved != activityRemoved) throw new IllegalStateException("job removed, but belonging activity not.");
return activityRemoved;
@ -177,14 +171,10 @@ public class TourActivities {
}
private void addJob(TourActivity act) {
if(act instanceof JobActivity){
Job job = ((JobActivity) act).getJob();
jobs.add(job);
}
else if(act instanceof ServiceActivity){
jobs.add(((ServiceActivity) act).getJob());
}
}
public int jobSize() {