diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java b/jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java index 4ff5f3c2..6ade4941 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java +++ b/jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java @@ -5,7 +5,6 @@ import jsprit.core.problem.VehicleRoutingProblem; import jsprit.core.problem.job.Service; import jsprit.core.problem.solution.route.activity.TimeWindow; import jsprit.core.problem.vehicle.VehicleImpl; -import jsprit.core.util.Coordinate; import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,7 +56,7 @@ public class LopezIbanezBlumReader { int nodeIndex = lineCount - 2 - noNodes; String[] twTokens = line.split("\\s+"); if(nodeIndex == 0){ - VehicleImpl travelingSalesman = VehicleImpl.Builder.newInstance(""+nodeIndex).setStartLocation(Location.newInstance(nodeIndex)) + VehicleImpl travelingSalesman = VehicleImpl.Builder.newInstance("traveling_salesman").setStartLocation(Location.newInstance(nodeIndex)) .setEarliestStart(Double.parseDouble(twTokens[0])).setLatestArrival(Double.parseDouble(twTokens[1])).build(); builder.addVehicle(travelingSalesman); } @@ -107,12 +106,6 @@ public class LopezIbanezBlumReader { } } - private Coordinate makeCoord(String xString, String yString) { - double x = Double.parseDouble(xString); - double y = Double.parseDouble(yString); - return new Coordinate(x,y); - } - private BufferedReader getReader(String solomonFile) { BufferedReader reader = null; try { diff --git a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java b/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java index c18ae829..06cb52e7 100644 --- a/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java +++ b/jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java @@ -150,7 +150,7 @@ public class TSPLIB95Reader { close(reader); vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE); for(Integer depotId : depotIds){ - VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("typeId").addCapacityDimension(0,capacity).build(); + VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("type").addCapacityDimension(0,capacity).build(); VehicleImpl vehicle = VehicleImpl.Builder.newInstance("vehicle").setStartLocationId(depotId.toString()) .setStartLocationCoordinate(coords[depotId - 1]).setType(type).build(); vrpBuilder.addVehicle(vehicle); @@ -160,7 +160,7 @@ public class TSPLIB95Reader { String id = "" + (i + 1); if(depotIds.isEmpty()){ if(i==0) { - VehicleImpl vehicle = VehicleImpl.Builder.newInstance("start") + VehicleImpl vehicle = VehicleImpl.Builder.newInstance("traveling_salesman") .setStartLocation(Location.Builder.newInstance().setId(id) .setCoordinate(coords[i]).setIndex(i).build())