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 pull request #386 from michalmac/master

Browse source 
changes in jsprit-instance readers
This commit is contained in:
Stefan Schröder 2017-11-06 09:36:54 +01:00 • committed by GitHub
commit 78cf643384
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -447,7 +447,6 @@ public class VehicleRoutingProblem {
return new VehicleRoutingProblem(this); return new VehicleRoutingProblem(this);
} }
@SuppressWarnings("UnusedDeclaration")
public Builder addLocation(String locationId, Coordinate coordinate) { public Builder addLocation(String locationId, Coordinate coordinate) {
tentative_coordinates.put(locationId, coordinate); tentative_coordinates.put(locationId, coordinate);
return this; return this;
@ -473,7 +472,6 @@ public class VehicleRoutingProblem {
* @param vehicles vehicles to be added * @param vehicles vehicles to be added
* @return this builder * @return this builder
*/ */
@SuppressWarnings("deprecation")
public Builder addAllVehicles(Collection<? extends Vehicle> vehicles) { public Builder addAllVehicles(Collection<? extends Vehicle> vehicles) {
for (Vehicle v : vehicles) { for (Vehicle v : vehicles) {
addVehicle(v); addVehicle(v);

5
jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java
View file

@ -103,14 +103,11 @@ public class BelhaizaReader {
System.out.println("fix: " + fixedCostPerVehicle + "; perDistance: 1.0; perWaitingTime: 0.8"); System.out.println("fix: " + fixedCostPerVehicle + "; perDistance: 1.0; perWaitingTime: 0.8");
VehicleTypeImpl vehicleType = typeBuilder.build(); VehicleTypeImpl vehicleType = typeBuilder.build();
double end = Double.parseDouble(tokens[8])*timeProjectionFactor; double end = Double.parseDouble(tokens[8])*timeProjectionFactor;
for(int i=0;i<10;i++) { VehicleImpl vehicle = VehicleImpl.Builder.newInstance("solomonVehicle").setEarliestStart(0.).setLatestArrival(end)
VehicleImpl vehicle = VehicleImpl.Builder.newInstance("solomonVehicle"+(i+1)).setEarliestStart(0.).setLatestArrival(end)
.setStartLocation(Location.Builder.newInstance().setId(customerId) .setStartLocation(Location.Builder.newInstance().setId(customerId)
.setCoordinate(coord).build()).setType(vehicleType).build(); .setCoordinate(coord).build()).setType(vehicleType).build();
vrpBuilder.addVehicle(vehicle); vrpBuilder.addVehicle(vehicle);
} }
}
else{ else{
Service.Builder serviceBuilder = Service.Builder.newInstance(customerId); Service.Builder serviceBuilder = Service.Builder.newInstance(customerId);
serviceBuilder.addSizeDimension(0, demand).setLocation(Location.Builder.newInstance().setCoordinate(coord).setId(customerId).build()).setServiceTime(serviceTime); serviceBuilder.addSizeDimension(0, demand).setLocation(Location.Builder.newInstance().setCoordinate(coord).setId(customerId).build()).setServiceTime(serviceTime);

2
jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java
View file

@ -86,7 +86,7 @@ public class LuiShenReader {
if (counter == 10) { if (counter == 10) {
createVehicles(vehicleFile, costScenario, customerId, coord, start, end); createVehicles(vehicleFile, costScenario, customerId, coord, start, end);
} else { } else {
Service service = Service.Builder.newInstance("" + counter).addSizeDimension(0, demand) Service service = Service.Builder.newInstance("" + (counter - 10)).addSizeDimension(0, demand)
.setLocation(Location.Builder.newInstance().setCoordinate(coord).setId(customerId).build()).setServiceTime(serviceTime) .setLocation(Location.Builder.newInstance().setCoordinate(coord).setId(customerId).build()).setServiceTime(serviceTime)
.setTimeWindow(TimeWindow.newInstance(start, end)).build(); .setTimeWindow(TimeWindow.newInstance(start, end)).build();
vrpBuilder.addJob(service); vrpBuilder.addJob(service);