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

reset vra changes - no need to serialize vra any more

Browse source
This commit is contained in:
hilaminster 2019-12-01 11:50:38 +02:00
parent b63a4af6cf
commit 5fa3f92712
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
View file

@ -42,7 +42,6 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.BreakActivity
import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity;
import com.graphhopper.jsprit.core.problem.vehicle.FiniteFleetManagerFactory;
import com.graphhopper.jsprit.core.problem.vehicle.InfiniteFleetManagerFactory;
import com.graphhopper.jsprit.core.problem.vehicle.Vehicle;
import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager;
import com.graphhopper.jsprit.core.util.NoiseMaker;
import com.graphhopper.jsprit.core.util.RandomNumberGeneration;
@ -461,13 +460,10 @@ public class Jsprit {
private VehicleRoutingAlgorithm create(final VehicleRoutingProblem vrp) {
ini(vrp);
if (vehicleFleetManager == null) {
// this allow us to serialize the vra as vrp.getVehicles() return unmodifiable collection
Set<Vehicle> vehicles = new HashSet<>();
vehicles.addAll(vrp.getVehicles());
if (vrp.getFleetSize().equals(VehicleRoutingProblem.FleetSize.INFINITE)) {
vehicleFleetManager = new InfiniteFleetManagerFactory(vehicles).createFleetManager();
vehicleFleetManager = new InfiniteFleetManagerFactory(vrp.getVehicles()).createFleetManager();
} else {
FiniteFleetManagerFactory finiteFleetManagerFactory = new FiniteFleetManagerFactory(vehicles);
FiniteFleetManagerFactory finiteFleetManagerFactory = new FiniteFleetManagerFactory(vrp.getVehicles());
finiteFleetManagerFactory.setRandom(random);
vehicleFleetManager = finiteFleetManagerFactory.createFleetManager();
}

5
jsprit-io/src/main/java/com/graphhopper/jsprit/io/algorithm/VehicleRoutingAlgorithms.java
View file

@ -667,10 +667,7 @@ public class VehicleRoutingAlgorithms {
return new InfiniteFleetManagerFactory(vrp.getVehicles()).createFleetManager();
} else if (vrp.getFleetSize().equals(FleetSize.FINITE)) {
// this allow us to serialize the vra as vrp.getVehicles() return unmodifiable collection
Set<Vehicle> vehicles = new HashSet<>();
vehicles.addAll(vrp.getVehicles());
return new FiniteFleetManagerFactory(vehicles).createFleetManager();
return new FiniteFleetManagerFactory(vrp.getVehicles()).createFleetManager();
}
throw new IllegalStateException("fleet size can only be infinite or finite. " +
"makes sure your config file contains one of these options");