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' of https://github.com/jsprit/jsprit.git

Browse source
This commit is contained in:
Stefan Schroeder 2013-10-18 12:24:26 +02:00
commit dbc072f664
2 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -21,7 +21,6 @@ can be used, and a dynamic and interactive visualiser greatly enhances the analy
- continues improvement of code, handling and performance - continues improvement of code, handling and performance
- relaxed API to easily build algorithms from scratch - relaxed API to easily build algorithms from scratch
- VRP with pickups and deliveries - VRP with pickups and deliveries
- release 1.0.0
##Documentation ##Documentation
@ -36,6 +35,8 @@ This software is released under [LGPL](http://opensource.org/licenses/LGPL-3.0).
[Add the latest snapshot to your pom](https://github.com/jsprit/jsprit/wiki/Add-latest-snapshot-to-your-pom). [Add the latest snapshot to your pom](https://github.com/jsprit/jsprit/wiki/Add-latest-snapshot-to-your-pom).
[Add the latest release to your pom](https://github.com/jsprit/jsprit/wiki/Add-latest-release-to-your-pom).
##About ##About
The jsprit-project is created and maintained by Stefan Schröder. It is motivated by two issues. The jsprit-project is created and maintained by Stefan Schröder. It is motivated by two issues.

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

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