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

rename vehicle id

Browse source
This commit is contained in:
oblonski 2015-03-24 09:14:29 +01:00
parent 76ea79bb71
commit 1cd1733a7a
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
jsprit-instances/src/main/java/jsprit/instance/reader/LopezIbanezBlumReader.java
View file

@ -5,7 +5,6 @@ import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.job.Service; import jsprit.core.problem.job.Service;
import jsprit.core.problem.solution.route.activity.TimeWindow; import jsprit.core.problem.solution.route.activity.TimeWindow;
import jsprit.core.problem.vehicle.VehicleImpl; import jsprit.core.problem.vehicle.VehicleImpl;
import jsprit.core.util.Coordinate;
import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix; import jsprit.core.util.FastVehicleRoutingTransportCostsMatrix;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -57,7 +56,7 @@ public class LopezIbanezBlumReader {
int nodeIndex = lineCount - 2 - noNodes; int nodeIndex = lineCount - 2 - noNodes;
String[] twTokens = line.split("\\s+"); String[] twTokens = line.split("\\s+");
if(nodeIndex == 0){ 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(); .setEarliestStart(Double.parseDouble(twTokens[0])).setLatestArrival(Double.parseDouble(twTokens[1])).build();
builder.addVehicle(travelingSalesman); 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) { private BufferedReader getReader(String solomonFile) {
BufferedReader reader = null; BufferedReader reader = null;
try { try {

4
jsprit-instances/src/main/java/jsprit/instance/reader/TSPLIB95Reader.java
View file

@ -150,7 +150,7 @@ public class TSPLIB95Reader {
close(reader); close(reader);
vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE); vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE);
for(Integer depotId : depotIds){ 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()) VehicleImpl vehicle = VehicleImpl.Builder.newInstance("vehicle").setStartLocationId(depotId.toString())
.setStartLocationCoordinate(coords[depotId - 1]).setType(type).build(); .setStartLocationCoordinate(coords[depotId - 1]).setType(type).build();
vrpBuilder.addVehicle(vehicle); vrpBuilder.addVehicle(vehicle);
@ -160,7 +160,7 @@ public class TSPLIB95Reader {
String id = "" + (i + 1); String id = "" + (i + 1);
if(depotIds.isEmpty()){ if(depotIds.isEmpty()){
if(i==0) { if(i==0) {
VehicleImpl vehicle = VehicleImpl.Builder.newInstance("start") VehicleImpl vehicle = VehicleImpl.Builder.newInstance("traveling_salesman")
.setStartLocation(Location.Builder.newInstance().setId(id) .setStartLocation(Location.Builder.newInstance().setId(id)
.setCoordinate(coords[i]).setIndex(i).build()) .setCoordinate(coords[i]).setIndex(i).build())