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

remove deprecated methods dealing with old location concept

Browse source
This commit is contained in:
oblonski 2015-04-22 00:43:53 +02:00
parent 917d5d3d2c
commit b3af33ccf9
22 changed files with 201 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

6
jsprit-instances/src/main/java/jsprit/instance/reader/LuiShenReader.java
View file

@ -22,7 +22,6 @@ import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.VehicleRoutingProblem.FleetSize;
import jsprit.core.problem.job.Service;
import jsprit.core.problem.solution.route.activity.TimeWindow;
import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.problem.vehicle.VehicleImpl;
import jsprit.core.problem.vehicle.VehicleTypeImpl;
import jsprit.core.util.Coordinate;
@ -123,8 +122,9 @@ public class LuiShenReader {
VehicleTypeImpl type = typeBuilder.build();
Vehicle reprVehicle = VehicleImpl.Builder.newInstance(vehicleId).setEarliestStart(start).setLatestArrival(end).
setStartLocationId(locationId).setStartLocationCoordinate(coord).setType(type).build();
VehicleImpl reprVehicle = VehicleImpl.Builder.newInstance(vehicleId).setEarliestStart(start).setLatestArrival(end).
setStartLocation(Location.Builder.newInstance().setId(locationId).setCoordinate(coord).build())
.setType(type).build();
vrpBuilder.addVehicle(reprVehicle);

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

@ -159,8 +159,9 @@ public class TSPLIB95Reader {
vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE);
for(Integer depotId : depotIds){
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();
VehicleImpl vehicle = VehicleImpl.Builder.newInstance("vehicle")
.setStartLocation(Location.Builder.newInstance().setId(depotId.toString()).setCoordinate(coords[depotId - 1]).build())
.setType(type).build();
vrpBuilder.addVehicle(vehicle);
}