mirror of
https://github.com/graphhopper/jsprit.git
synced 2020-01-24 07:45:05 +01:00
Merge branch 'master' into relaxAPI
This commit is contained in:
commit
b641a3b22d
9 changed files with 28 additions and 15 deletions
|
|
@ -151,12 +151,6 @@ public class TourActivities {
|
|||
activityRemoved = true;
|
||||
}
|
||||
}
|
||||
else if(c instanceof ServiceActivity){
|
||||
if(job.equals(((ServiceActivity) c).getJob())){
|
||||
tourActivities.remove(c);
|
||||
activityRemoved = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
assert jobRemoved == activityRemoved : "job removed, but belonging activity not.";
|
||||
return activityRemoved;
|
||||
|
|
@ -203,9 +197,6 @@ public class TourActivities {
|
|||
Job job = ((JobActivity) act).getJob();
|
||||
jobs.add(job);
|
||||
}
|
||||
else if(act instanceof ServiceActivity){
|
||||
jobs.add(((ServiceActivity) act).getJob());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue