From 358010de9132226e4307b9bb00cf6208e4d5a462 Mon Sep 17 00:00:00 2001 From: oblonski Date: Fri, 1 Apr 2016 12:02:46 +0200 Subject: [PATCH] modify to use external RNG --- .../problem/vehicle/FiniteFleetManagerFactory.java | 1 + .../core/problem/vehicle/VehicleFleetManagerImpl.java | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index adabb440..cb750427 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -58,6 +58,7 @@ public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory { if (vehicles.isEmpty()) throw new IllegalStateException("vehicle-collection is empty. this must not be"); VehicleFleetManagerImpl vehicleFleetManager = new VehicleFleetManagerImpl(vehicles); vehicleFleetManager.setRandom(random); + vehicleFleetManager.init(); return vehicleFleetManager; } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java index 380f0523..51426554 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleFleetManagerImpl.java @@ -81,20 +81,23 @@ class VehicleFleetManagerImpl implements VehicleFleetManager { private Random random = RandomNumberGeneration.getRandom(); - public VehicleFleetManagerImpl(Collection vehicles) { + VehicleFleetManagerImpl(Collection vehicles) { super(); this.vehicles = vehicles; int arrSize = vehicles.size() + 2; locked = new boolean[arrSize]; vehicleArr = new Vehicle[arrSize]; - initializeVehicleTypes(); - logger.debug("initialise {}",this); } - public void setRandom(Random random) { + void setRandom(Random random) { this.random = random; } + void init(){ + initializeVehicleTypes(); + logger.debug("initialise {}",this); + } + @Override public String toString() { return "[name=finiteVehicles]";