diff --git a/jsprit-instances/src/main/java/readers/ChristophidesReader.java b/jsprit-instances/src/main/java/readers/ChristophidesReader.java index fdc82879..15aa5325 100644 --- a/jsprit-instances/src/main/java/readers/ChristophidesReader.java +++ b/jsprit-instances/src/main/java/readers/ChristophidesReader.java @@ -93,7 +93,7 @@ public class ChristophidesReader { else if(counter == 1){ String id = Integer.valueOf(counter).toString(); Coordinate depotCoord = makeCoord(tokens[0].trim(),tokens[1].trim()); - VehicleTypeImpl vehicleType = VehicleType.Builder.newInstance("christophidesType", vehicleCapacity). + VehicleTypeImpl vehicleType = VehicleTypeImpl.Builder.newInstance("christophidesType", vehicleCapacity). setCostPerDistance(1.0).setFixedCost(100).build(); Vehicle vehicle = VehicleImpl.Builder.newInstance("christophidesVehicle").setLatestArrival(endTime).setLocationId(id).setLocationCoord(depotCoord). setType(vehicleType).build(); diff --git a/jsprit-instances/src/main/java/readers/CordeauReader.java b/jsprit-instances/src/main/java/readers/CordeauReader.java index eebde2c0..f557512b 100644 --- a/jsprit-instances/src/main/java/readers/CordeauReader.java +++ b/jsprit-instances/src/main/java/readers/CordeauReader.java @@ -34,6 +34,7 @@ import readers.CordeauReader; import util.Coordinate; import basics.VehicleRoutingProblem.FleetSize; +import basics.route.PenaltyVehicleType; import basics.route.VehicleImpl; import basics.route.VehicleImpl.Builder; import basics.route.VehicleType; @@ -101,7 +102,7 @@ public class CordeauReader { int duration = Integer.parseInt(tokens[0].trim()); if(duration == 0) duration = 999999; int capacity = Integer.parseInt(tokens[1].trim()); - VehicleTypeImpl vehicleType = VehicleType.Builder.newInstance(counter + "_cordeauType", capacity). + VehicleTypeImpl vehicleType = VehicleTypeImpl.Builder.newInstance(counter + "_cordeauType", capacity). setCostPerDistance(1.0).setFixedCost(0).build(); List builders = new ArrayList(); for(int vehicleCounter=0;vehicleCounter