From b40204685c93c9be82d9b30a74925c4a0cfefea8 Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Tue, 9 Jul 2013 14:02:55 +0200 Subject: [PATCH] internal changes --- .../src/main/java/algorithms/InsertionFactory.java | 2 +- .../java/algorithms/ResetAndIniFleetManager.java | 11 ++++++++--- .../.settings/org.eclipse.core.resources.prefs | 1 - .../test/java/readers/ChristophidesReaderTest.java | 14 +++++++------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/jsprit-core/src/main/java/algorithms/InsertionFactory.java b/jsprit-core/src/main/java/algorithms/InsertionFactory.java index cc15b8d0..b7cc4093 100644 --- a/jsprit-core/src/main/java/algorithms/InsertionFactory.java +++ b/jsprit-core/src/main/java/algorithms/InsertionFactory.java @@ -119,7 +119,7 @@ class InsertionFactory { // // } - insertionStrategy.addListener(new RemoveEmptyVehicles(vehicleFleetManager)); +// insertionStrategy.addListener(new RemoveEmptyVehicles(vehicleFleetManager)); insertionStrategy.addListener(new ResetAndIniFleetManager(vehicleFleetManager)); insertionStrategy.addAllListener(insertionListeners); // insertionStrategy.addListener(new FindCheaperVehicle( diff --git a/jsprit-core/src/main/java/algorithms/ResetAndIniFleetManager.java b/jsprit-core/src/main/java/algorithms/ResetAndIniFleetManager.java index 721a407e..be009119 100644 --- a/jsprit-core/src/main/java/algorithms/ResetAndIniFleetManager.java +++ b/jsprit-core/src/main/java/algorithms/ResetAndIniFleetManager.java @@ -20,6 +20,7 @@ ******************************************************************************/ package algorithms; +import java.util.ArrayList; import java.util.Collection; import org.apache.log4j.Logger; @@ -41,10 +42,14 @@ class ResetAndIniFleetManager implements InsertionStartsListener{ @Override public void informInsertionStarts(Collection vehicleRoutes, int nOfJobs2Recreate) { vehicleFleetManager.unlockAll(); - for(VehicleRoute route : vehicleRoutes){ -// if(!route.isEmpty()){ + Collection routes = new ArrayList(vehicleRoutes); + for(VehicleRoute route : routes){ + if(route.isEmpty()){ + vehicleRoutes.remove(route); + } + else{ vehicleFleetManager.lock(route.getVehicle()); -// } + } } } diff --git a/jsprit-instances/.settings/org.eclipse.core.resources.prefs b/jsprit-instances/.settings/org.eclipse.core.resources.prefs index afad9066..06a5cf64 100644 --- a/jsprit-instances/.settings/org.eclipse.core.resources.prefs +++ b/jsprit-instances/.settings/org.eclipse.core.resources.prefs @@ -1,6 +1,5 @@ eclipse.preferences.version=1 encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 encoding//src/test/java=UTF-8 encoding//src/test/resources=UTF-8 encoding/=UTF-8 diff --git a/jsprit-instances/src/test/java/readers/ChristophidesReaderTest.java b/jsprit-instances/src/test/java/readers/ChristophidesReaderTest.java index d58963aa..cc8b31d4 100644 --- a/jsprit-instances/src/test/java/readers/ChristophidesReaderTest.java +++ b/jsprit-instances/src/test/java/readers/ChristophidesReaderTest.java @@ -34,7 +34,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_nuOfCustomersIsCorrect(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); assertEquals(50,vrp.getJobs().values().size()); } @@ -42,7 +42,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_fleetSizeIsInfinite(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); assertEquals(FleetSize.INFINITE,vrp.getFleetSize()); } @@ -50,7 +50,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_vehicleCapacitiesAreCorrect(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); for(Vehicle v : vrp.getVehicles()){ assertEquals(160,v.getCapacity()); @@ -60,7 +60,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_vehicleLocationsAreCorrect_and_correspondToDepotLocation(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); for(Vehicle v : vrp.getVehicles()){ assertEquals(30.0,v.getCoord().getX(),0.01); @@ -71,7 +71,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_vehicleDurationsAreCorrect(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc13.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc13.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); for(Vehicle v : vrp.getVehicles()){ assertEquals(0.0,v.getEarliestDeparture(),0.01); @@ -82,7 +82,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_demandOfCustomerOneIsCorrect(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc1.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); assertEquals(7,vrp.getJobs().get("1").getCapacityDemand()); } @@ -90,7 +90,7 @@ public class ChristophidesReaderTest { @Test public void whenReadingInstance_serviceDurationOfCustomerTwoIsCorrect(){ VehicleRoutingProblem.Builder builder = VehicleRoutingProblem.Builder.newInstance(); - new ChristophidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc13.txt").getPath()); + new ChristofidesReader(builder).read(this.getClass().getClassLoader().getResource("vrpnc13.txt").getPath()); VehicleRoutingProblem vrp = builder.build(); assertEquals(50.0,((Service)vrp.getJobs().get("2")).getServiceDuration(),0.1); }