diff --git a/jsprit-core/src/main/java/algorithms/VehicleFleetManagerImpl.java b/jsprit-core/src/main/java/algorithms/VehicleFleetManagerImpl.java index 3671e252..7b92762a 100644 --- a/jsprit-core/src/main/java/algorithms/VehicleFleetManagerImpl.java +++ b/jsprit-core/src/main/java/algorithms/VehicleFleetManagerImpl.java @@ -250,6 +250,7 @@ class VehicleFleetManagerImpl implements VehicleFleetManager { if(vehicles.isEmpty() || vehicle instanceof NoVehicle){ return; } + if(vehicle.getType().getTypeId().contains("penalty")) return; boolean locked = lockedVehicles.add(vehicle); removeVehicle(vehicle); if(!locked){ @@ -266,6 +267,7 @@ class VehicleFleetManagerImpl implements VehicleFleetManager { return; } if(vehicle == null) return; + if(vehicle.getType().getTypeId().contains("penalty")) return; lockedVehicles.remove(vehicle); addVehicle(vehicle); } diff --git a/jsprit-examples/input/algorithmConfig.xml b/jsprit-examples/input/algorithmConfig.xml index 0834be4b..ddf54736 100755 --- a/jsprit-examples/input/algorithmConfig.xml +++ b/jsprit-examples/input/algorithmConfig.xml @@ -46,7 +46,7 @@ - 0.5 + 0.3 @@ -61,7 +61,22 @@ - 0.5 + 0.3 + + + + + + + + + 0.1 + + + + + + 0.4 diff --git a/jsprit-examples/src/main/java/examples/ConcurrentMultipleDepotExampleWithPenaltyVehicles.java b/jsprit-examples/src/main/java/examples/ConcurrentMultipleDepotExampleWithPenaltyVehicles.java index 903d9256..86ef08ae 100644 --- a/jsprit-examples/src/main/java/examples/ConcurrentMultipleDepotExampleWithPenaltyVehicles.java +++ b/jsprit-examples/src/main/java/examples/ConcurrentMultipleDepotExampleWithPenaltyVehicles.java @@ -56,7 +56,7 @@ public class ConcurrentMultipleDepotExampleWithPenaltyVehicles { int depotCounter = 1; for(Coordinate depotCoord : Arrays.asList(firstDepotCoord,second)){ for(int i=0;i solutions = vra.searchSolutions(); SolutionPrinter.print(Solutions.getBest(solutions)); diff --git a/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java b/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java index 5bfb837a..88dc4e5b 100644 --- a/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java +++ b/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java @@ -54,7 +54,7 @@ public class MultipleDepotExampleWithPenaltyVehicles { int depotCounter = 1; for(Coordinate depotCoord : Arrays.asList(firstDepotCoord,second)){ for(int i=0;i