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

clean TourActivities - remove redundant code

Browse source
This commit is contained in:
oblonski 2013-10-18 05:26:34 +02:00
parent ba75c095de
commit e9a3f98671
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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() {