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

fixing compile errors due to incorrect merging

Browse source
This commit is contained in:
Michal Maciejewski 2017-12-14 16:19:10 +01:00
parent ae1d4004a5
commit d0ebc2d60b
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -228,13 +228,7 @@ public class VehicleRoutingProblem {
if (tentativeJobs.containsKey(job.getId())) if (tentativeJobs.containsKey(job.getId()))
throw new IllegalArgumentException("The vehicle routing problem already contains a service or shipment with id " + job.getId() + ". Please make sure you use unique ids for all services and shipments."); throw new IllegalArgumentException("The vehicle routing problem already contains a service or shipment with id " + job.getId() + ". Please make sure you use unique ids for all services and shipments.");
if (!(job instanceof Service || job instanceof Shipment)) if (!(job instanceof Service || job instanceof Shipment))
<<<<<<< Upstream, based on branch 'master' of https://github.com/michalmac/jsprit.git
throw new IllegalArgumentException("job must be either a service or a shipment");
=======
throw new IllegalArgumentException("Job must be either a service or a shipment."); throw new IllegalArgumentException("Job must be either a service or a shipment.");
job.setIndex(jobIndexCounter);
incJobIndexCounter();
>>>>>>> b610626 refine error messages
tentativeJobs.put(job.getId(), job); tentativeJobs.put(job.getId(), job);
addLocationToTentativeLocations(job); addLocationToTentativeLocations(job);
return this; return this;