From e3acb05b0afb2917a8abbfbbd7589fb5a26e4735 Mon Sep 17 00:00:00 2001 From: Michal Maciejewski Date: Mon, 6 Nov 2017 00:02:02 +0100 Subject: [PATCH 1/3] unnecessary @SuppressWarnings removed --- .../graphhopper/jsprit/core/problem/VehicleRoutingProblem.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java index 4e88701e..99a1788e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java @@ -447,7 +447,6 @@ public class VehicleRoutingProblem { return new VehicleRoutingProblem(this); } - @SuppressWarnings("UnusedDeclaration") public Builder addLocation(String locationId, Coordinate coordinate) { tentative_coordinates.put(locationId, coordinate); return this; @@ -473,7 +472,6 @@ public class VehicleRoutingProblem { * @param vehicles vehicles to be added * @return this builder */ - @SuppressWarnings("deprecation") public Builder addAllVehicles(Collection vehicles) { for (Vehicle v : vehicles) { addVehicle(v); From b3b154cdd64fcd4bda87ac423225baa4d7d344bf Mon Sep 17 00:00:00 2001 From: Michal Maciejewski Date: Mon, 6 Nov 2017 00:03:16 +0100 Subject: [PATCH 2/3] count LiuShen services from 1, instead of 11 --- .../com/graphhopper/jsprit/instance/reader/LuiShenReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java index 9215b5e2..b6ec812b 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/LuiShenReader.java @@ -86,7 +86,7 @@ public class LuiShenReader { if (counter == 10) { createVehicles(vehicleFile, costScenario, customerId, coord, start, end); } 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) .setTimeWindow(TimeWindow.newInstance(start, end)).build(); vrpBuilder.addJob(service); From 0946dc239ef9c8388f086444f32c469f6ec24738 Mon Sep 17 00:00:00 2001 From: Michal Maciejewski Date: Mon, 6 Nov 2017 00:05:27 +0100 Subject: [PATCH 3/3] Belhaiza is INFINITE -> create only 1 vehicle --- .../jsprit/instance/reader/BelhaizaReader.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java index f17218dc..401f70fe 100644 --- a/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java +++ b/jsprit-instances/src/main/java/com/graphhopper/jsprit/instance/reader/BelhaizaReader.java @@ -103,13 +103,10 @@ public class BelhaizaReader { System.out.println("fix: " + fixedCostPerVehicle + "; perDistance: 1.0; perWaitingTime: 0.8"); VehicleTypeImpl vehicleType = typeBuilder.build(); double end = Double.parseDouble(tokens[8])*timeProjectionFactor; - for(int i=0;i<10;i++) { - VehicleImpl vehicle = VehicleImpl.Builder.newInstance("solomonVehicle"+(i+1)).setEarliestStart(0.).setLatestArrival(end) - .setStartLocation(Location.Builder.newInstance().setId(customerId) + VehicleImpl vehicle = VehicleImpl.Builder.newInstance("solomonVehicle").setEarliestStart(0.).setLatestArrival(end) + .setStartLocation(Location.Builder.newInstance().setId(customerId) .setCoordinate(coord).build()).setType(vehicleType).build(); - vrpBuilder.addVehicle(vehicle); - } - + vrpBuilder.addVehicle(vehicle); } else{ Service.Builder serviceBuilder = Service.Builder.newInstance(customerId);