added soft constraints to shipment calc

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/CalculatorBuilder.java

@@ -252,7 +252,7 @@ class CalculatorBuilder {
 			actInsertionCalc = activityInsertionCostCalculator;
 		}
 
-		ShipmentInsertionCalculator shipmentInsertion = new ShipmentInsertionCalculator(vrp.getTransportCosts(), actInsertionCalc, constraintManager, constraintManager);
+		ShipmentInsertionCalculator shipmentInsertion = new ShipmentInsertionCalculator(vrp.getTransportCosts(), actInsertionCalc, constraintManager);
 		ServiceInsertionCalculator serviceInsertion = new ServiceInsertionCalculator(vrp.getTransportCosts(), actInsertionCalc, constraintManager);
 		
 		JobCalculatorSwitcher switcher = new JobCalculatorSwitcher();

jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculator.java

@@ -19,7 +19,10 @@ package jsprit.core.algorithm.recreate;
 import java.util.List;
 
 import jsprit.core.algorithm.recreate.ActivityInsertionCostsCalculator.ActivityInsertionCosts;
+import jsprit.core.problem.constraint.ConstraintManager;
 import jsprit.core.problem.constraint.HardActivityStateLevelConstraint;
+import jsprit.core.problem.constraint.SoftActivityConstraint;
+import jsprit.core.problem.constraint.SoftRouteConstraint;
 import jsprit.core.problem.constraint.HardActivityStateLevelConstraint.ConstraintsStatus;
 import jsprit.core.problem.constraint.HardRouteStateLevelConstraint;
 import jsprit.core.problem.cost.VehicleRoutingTransportCosts;
@@ -36,7 +39,6 @@ import jsprit.core.problem.solution.route.activity.TourShipmentActivityFactory;
 import jsprit.core.problem.vehicle.Vehicle;
 import jsprit.core.problem.vehicle.VehicleImpl.NoVehicle;
 import jsprit.core.util.CalculationUtils;
-import jsprit.core.util.Neighborhood;
 
 import org.apache.log4j.Logger;
 
@@ -51,23 +53,28 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 	
 	private HardActivityStateLevelConstraint hardActivityLevelConstraint;
 	
+	private SoftRouteConstraint softRouteConstraint;
+	
+	private SoftActivityConstraint softActivityConstraint;
+	
 	private ActivityInsertionCostsCalculator activityInsertionCostsCalculator;
 	
 	private VehicleRoutingTransportCosts transportCosts;
 	
 	private TourShipmentActivityFactory activityFactory;
 	
-	public void setNeighborhood(Neighborhood neighborhood) {
+	private AdditionalAccessEgressCalculator additionalAccessEgressCalculator;
-		logger.info("initialise neighborhood " + neighborhood);
-	}
 	
-	public ShipmentInsertionCalculator(VehicleRoutingTransportCosts routingCosts, ActivityInsertionCostsCalculator activityInsertionCostsCalculator, HardRouteStateLevelConstraint hardRouteLevelConstraint, HardActivityStateLevelConstraint hardActivityLevelConstraint) {
+	public ShipmentInsertionCalculator(VehicleRoutingTransportCosts routingCosts, ActivityInsertionCostsCalculator activityInsertionCostsCalculator, ConstraintManager constraintManager) {
 		super();
 		this.activityInsertionCostsCalculator = activityInsertionCostsCalculator;
-		this.hardRouteLevelConstraint = hardRouteLevelConstraint;
+		this.hardRouteLevelConstraint = constraintManager;
-		this.hardActivityLevelConstraint = hardActivityLevelConstraint;
+		this.hardActivityLevelConstraint = constraintManager;
+		this.softActivityConstraint = constraintManager;
+		this.softRouteConstraint = constraintManager;
 		this.transportCosts = routingCosts;
 		activityFactory = new DefaultShipmentActivityFactory();
+		additionalAccessEgressCalculator = new AdditionalAccessEgressCalculator(routingCosts);
 		logger.info("initialise " + this);
 	}
 	
@@ -93,6 +100,10 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 		}
 		
 		double bestCost = bestKnownCosts;
+		
+		double additionalICostsAtRouteLevel = softRouteConstraint.getCosts(insertionContext);
+		additionalICostsAtRouteLevel += additionalAccessEgressCalculator.getCosts(insertionContext);
+		
 		Shipment shipment = (Shipment)jobToInsert;
 		TourActivity pickupShipment = activityFactory.createPickup(shipment);
 		TourActivity deliverShipment = activityFactory.createDelivery(shipment);
@@ -122,6 +133,7 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 				pickupShipmentLoopBroken = true;
 				break;
 			}
+			double additionalPickupICosts = softActivityConstraint.getCosts(insertionContext, prevAct, pickupShipment, activities.get(i), prevActEndTime);
 			ActivityInsertionCosts pickupAIC = calculate(insertionContext,prevAct,pickupShipment,activities.get(i),prevActEndTime);
 			TourActivity prevAct_deliveryLoop = pickupShipment;
 			double shipmentPickupArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocationId(), pickupShipment.getLocationId(), prevActEndTime, newDriver, newVehicle);
@@ -132,8 +144,10 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 			for(int j=i;j<activities.size();j++){
 				ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, activities.get(j), prevActEndTime_deliveryLoop); 
 				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
+					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, activities.get(j), prevActEndTime_deliveryLoop);
 					ActivityInsertionCosts deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment,activities.get(j),prevActEndTime_deliveryLoop);
-					double totalActivityInsertionCosts = pickupAIC.getAdditionalCosts() + deliveryAIC.getAdditionalCosts();
+					double totalActivityInsertionCosts = pickupAIC.getAdditionalCosts() + deliveryAIC.getAdditionalCosts() 
+							+ additionalICostsAtRouteLevel + additionalPickupICosts + additionalDeliveryICosts;
 					if(totalActivityInsertionCosts < bestCost){
 						bestCost = totalActivityInsertionCosts;
 						pickupInsertionIndex = i;
@@ -152,8 +166,10 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 			if(!deliverShipmentLoopBroken){ //check insertion between lastAct and endOfTour
 				ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
 				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
+					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
 					ActivityInsertionCosts deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment,end,prevActEndTime_deliveryLoop);
-					double totalActivityInsertionCosts = pickupAIC.getAdditionalCosts() + deliveryAIC.getAdditionalCosts();
+					double totalActivityInsertionCosts = pickupAIC.getAdditionalCosts() + deliveryAIC.getAdditionalCosts() 
+							+ additionalICostsAtRouteLevel + additionalPickupICosts + additionalDeliveryICosts;
 					if(totalActivityInsertionCosts < bestCost){
 						bestCost = totalActivityInsertionCosts;
 						pickupInsertionIndex = i;
@@ -169,8 +185,8 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 		if(!pickupShipmentLoopBroken){ //check insertion of pickupShipment and deliverShipment at just before tour ended
 			ConstraintsStatus pickupShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, pickupShipment, end, prevActEndTime);
 			if(pickupShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
+				double additionalPickupICosts = softActivityConstraint.getCosts(insertionContext, prevAct, pickupShipment, end, prevActEndTime);
 				ActivityInsertionCosts pickupAIC = calculate(insertionContext,prevAct,pickupShipment,end,prevActEndTime);
-
 				TourActivity prevAct_deliveryLoop = pickupShipment;
 				double shipmentPickupArrTime = prevActEndTime + transportCosts.getTransportTime(prevAct.getLocationId(), pickupShipment.getLocationId(), prevActEndTime, newDriver, newVehicle);
 				double shipmentPickupEndTime = CalculationUtils.getActivityEndTime(shipmentPickupArrTime, pickupShipment);
@@ -178,8 +194,10 @@ final class ShipmentInsertionCalculator implements JobInsertionCostsCalculator{
 				
 				ConstraintsStatus deliverShipmentConstraintStatus = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
 				if(deliverShipmentConstraintStatus.equals(ConstraintsStatus.FULFILLED)){
+					double additionalDeliveryICosts = softActivityConstraint.getCosts(insertionContext, prevAct_deliveryLoop, deliverShipment, end, prevActEndTime_deliveryLoop);
 					ActivityInsertionCosts deliveryAIC = calculate(insertionContext,prevAct_deliveryLoop,deliverShipment,end,prevActEndTime_deliveryLoop);
-					double totalActivityInsertionCosts = pickupAIC.getAdditionalCosts() + deliveryAIC.getAdditionalCosts();
+					double totalActivityInsertionCosts = pickupAIC.getAdditionalCosts() + deliveryAIC.getAdditionalCosts() 
+							+ additionalICostsAtRouteLevel + additionalPickupICosts + additionalDeliveryICosts;
 					if(totalActivityInsertionCosts < bestCost){
 						bestCost = totalActivityInsertionCosts;
 						pickupInsertionIndex = activities.size();

jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java

@@ -28,6 +28,7 @@ import jsprit.core.problem.job.Shipment;
 import jsprit.core.problem.misc.JobInsertionContext;
 import jsprit.core.problem.solution.route.VehicleRoute;
 import jsprit.core.problem.solution.route.activity.TourActivity;
+import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter;
 import jsprit.core.problem.vehicle.Vehicle;
 import jsprit.core.problem.vehicle.VehicleImpl;
 import jsprit.core.problem.vehicle.VehicleType;
@@ -97,7 +98,9 @@ public class ServiceInsertionAndLoadConstraintsTest {
 	}
 
 	private void createInsertionCalculator(HardRouteStateLevelConstraint hardRouteLevelConstraint) {
-		insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, hardRouteLevelConstraint, hardActivityLevelConstraint);
+		ConstraintManager constraintManager = new ConstraintManager(mock(VehicleRoutingProblem.class), mock(RouteAndActivityStateGetter.class));
+		constraintManager.addConstraint(hardRouteLevelConstraint);
+		insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager);
 	}
 	
 	@Test
@@ -137,7 +140,7 @@ public class ServiceInsertionAndLoadConstraintsTest {
 		
 		JobCalculatorSwitcher switcher = new JobCalculatorSwitcher();
 		ServiceInsertionCalculator serviceInsertionCalc = new ServiceInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager);
-		ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, hardRouteLevelConstraint, constraintManager);
+		ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager);
 		switcher.put(Pickup.class, serviceInsertionCalc);
 		switcher.put(Delivery.class, serviceInsertionCalc);
 		switcher.put(Shipment.class, insertionCalculator);

jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java

@@ -24,6 +24,7 @@ import jsprit.core.problem.job.Shipment;
 import jsprit.core.problem.misc.JobInsertionContext;
 import jsprit.core.problem.solution.route.VehicleRoute;
 import jsprit.core.problem.solution.route.activity.TourActivity;
+import jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter;
 import jsprit.core.problem.vehicle.Vehicle;
 import jsprit.core.problem.vehicle.VehicleImpl;
 import jsprit.core.problem.vehicle.VehicleType;
@@ -93,7 +94,9 @@ public class ShipmentInsertionCalculatorTest {
 	}
 
 	private void createInsertionCalculator(HardRouteStateLevelConstraint hardRouteLevelConstraint) {
-		insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, hardRouteLevelConstraint, hardActivityLevelConstraint);
+		ConstraintManager constraintManager = new ConstraintManager(mock(VehicleRoutingProblem.class), mock(RouteAndActivityStateGetter.class));
+		constraintManager.addConstraint(hardRouteLevelConstraint);
+		insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager);
 	}
 	
 	@Test
@@ -199,7 +202,7 @@ public class ShipmentInsertionCalculatorTest {
 		constraintManager.addConstraint(new ShipmentPickupsFirstConstraint(),Priority.CRITICAL);
 				
 		ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, 
-				hardRouteLevelConstraint, constraintManager);
+				constraintManager);
 		
 		
 		InsertionData iData = insertionCalculator.getInsertionData(route, shipment3, vehicle, 0.0, DriverImpl.noDriver(), Double.MAX_VALUE);
@@ -241,7 +244,7 @@ public class ShipmentInsertionCalculatorTest {
 		
 		JobCalculatorSwitcher switcher = new JobCalculatorSwitcher();
 		ServiceInsertionCalculator serviceInsertionCalc = new ServiceInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager);
-		ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, hardRouteLevelConstraint, constraintManager);
+		ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager);
 		switcher.put(Pickup.class, serviceInsertionCalc);
 		switcher.put(Shipment.class, insertionCalculator);
 		

jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java

@@ -45,8 +45,12 @@ import jsprit.core.problem.solution.route.activity.TourActivities;
 import jsprit.core.problem.solution.route.activity.TourActivity;
 import jsprit.core.problem.vehicle.Vehicle;
 import jsprit.core.problem.vehicle.VehicleImpl;
+import jsprit.core.problem.vehicle.VehicleType;
+import jsprit.core.problem.vehicle.VehicleTypeImpl;
 import jsprit.core.util.Coordinate;
 import jsprit.core.util.EuclideanDistanceCalculator;
+import jsprit.core.util.Locations;
+import jsprit.core.util.ManhattanDistanceCalculator;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -85,80 +89,46 @@ public class TestCalculatesServiceInsertion {
 		costs = mock(VehicleRoutingTransportCosts.class);
 		vehicle = mock(Vehicle.class);
 		when(vehicle.getCapacity()).thenReturn(1000);
-		when(vehicle.getLocationId()).thenReturn("depot");
+		when(vehicle.getLocationId()).thenReturn("0,0");
 		when(vehicle.getEarliestDeparture()).thenReturn(0.0);
 		when(vehicle.getLatestArrival()).thenReturn(100.0);
 		when(vehicle.isReturnToDepot()).thenReturn(true);
+		VehicleType t1 = VehicleTypeImpl.Builder.newInstance("t1", 1000).setCostPerDistance(1.0).build();
+		vehicle = VehicleImpl.Builder.newInstance("vehicle").setLatestArrival(100.0).setLocationId("0,0").setType(t1).build();
 		
-		newVehicle = mock(Vehicle.class);
+		VehicleType t2 = VehicleTypeImpl.Builder.newInstance("t2", 1000).setCostPerDistance(2.0).build();
-		when(newVehicle.getCapacity()).thenReturn(1000);
+		newVehicle = VehicleImpl.Builder.newInstance("newVehicle").setLatestArrival(100.0).setLocationId("0,0").setType(t2).build();
-		when(newVehicle.getLocationId()).thenReturn("depot");
-		when(newVehicle.getEarliestDeparture()).thenReturn(0.0);
-		when(newVehicle.getLatestArrival()).thenReturn(100.0);
-		when(newVehicle.isReturnToDepot()).thenReturn(true);
 		
 		driver = DriverImpl.noDriver();
 		
-		when(costs.getTransportCost("depot", "1", 0.0, driver, vehicle)).thenReturn(10.0);
+		final Locations locations = new Locations(){
-		when(costs.getTransportCost("depot", "2", 0.0, driver, vehicle)).thenReturn(20.0);
+
-		when(costs.getTransportCost("depot", "3", 0.0, driver, vehicle)).thenReturn(10.0);
+			@Override
-		when(costs.getTransportCost("1", "2", 0.0, driver, vehicle)).thenReturn(10.0);
+			public Coordinate getCoord(String id) {
-		when(costs.getTransportCost("1", "3", 0.0, driver, vehicle)).thenReturn(20.0);
+				//assume: locationId="x,y"
-		when(costs.getTransportCost("2", "3", 0.0, driver, vehicle)).thenReturn(10.0);
+				String[] splitted = id.split(",");
+				return Coordinate.newInstance(Double.parseDouble(splitted[0]), 
+						Double.parseDouble(splitted[1]));
+			}
+			
+		};
+		costs = new AbstractForwardVehicleRoutingTransportCosts() {
+			
+			@Override
+			public double getTransportTime(String fromId, String toId,double departureTime, Driver driver, Vehicle vehicle) {
+				return ManhattanDistanceCalculator.calculateDistance(locations.getCoord(fromId), locations.getCoord(toId));
+			}
+			
+			@Override
+			public double getTransportCost(String fromId, String toId, double departureTime, Driver driver, Vehicle vehicle) {
+				return vehicle.getType().getVehicleCostParams().perDistanceUnit*ManhattanDistanceCalculator.calculateDistance(locations.getCoord(fromId), locations.getCoord(toId));
+			}
+		};
+
 		
-		when(costs.getTransportCost("1", "depot", 0.0, driver, vehicle)).thenReturn(10.0);
+		first = Service.Builder.newInstance("1", 0).setLocationId("0,10").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
-		when(costs.getTransportCost("2", "depot", 0.0, driver, vehicle)).thenReturn(20.0);
+		second = Service.Builder.newInstance("3", 0).setLocationId("10,0").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
-		when(costs.getTransportCost("3", "depot", 0.0, driver, vehicle)).thenReturn(10.0);
+		third = Service.Builder.newInstance("2", 0).setLocationId("10,10").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
-		when(costs.getTransportCost("2", "1", 0.0, driver, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("3", "1", 0.0, driver, vehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("3", "2", 0.0, driver, vehicle)).thenReturn(10.0);
-		
-		when(costs.getTransportCost("depot", "1", 0.0, driver, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("depot", "2", 0.0, driver, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("depot", "3", 0.0, driver, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("1", "2", 0.0, driver, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("1", "3", 0.0, driver, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("2", "3", 0.0, driver, newVehicle)).thenReturn(20.0);
-		
-		when(costs.getTransportCost("1", "depot", 0.0, driver, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("2", "depot", 0.0, driver, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("3", "depot", 0.0, driver, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("2", "1", 0.0, driver, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("3", "1", 0.0, driver, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("3", "2", 0.0, driver, newVehicle)).thenReturn(20.0);
-	
-		when(costs.getTransportCost("depot", "1", 0.0, null, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("depot", "2", 0.0, null, vehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("depot", "3", 0.0, null, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("1", "2", 0.0, null, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("1", "3", 0.0, null, vehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("2", "3", 0.0, null, vehicle)).thenReturn(10.0);
-		
-		when(costs.getTransportCost("1", "depot", 0.0, null, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("2", "depot", 0.0, null, vehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("3", "depot", 0.0, null, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("2", "1", 0.0, null, vehicle)).thenReturn(10.0);
-		when(costs.getTransportCost("3", "1", 0.0, null, vehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("3", "2", 0.0, null, vehicle)).thenReturn(10.0);
-		
-		when(costs.getTransportCost("depot", "1", 0.0, null, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("depot", "2", 0.0, null, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("depot", "3", 0.0, null, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("1", "2", 0.0, null, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("1", "3", 0.0, null, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("2", "3", 0.0, null, newVehicle)).thenReturn(20.0);
-		
-		when(costs.getTransportCost("1", "depot", 0.0, null, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("2", "depot", 0.0, null, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("3", "depot", 0.0, null, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("2", "1", 0.0, null, newVehicle)).thenReturn(20.0);
-		when(costs.getTransportCost("3", "1", 0.0, null, newVehicle)).thenReturn(40.0);
-		when(costs.getTransportCost("3", "2", 0.0, null, newVehicle)).thenReturn(20.0);
-	
-		
-		first = Service.Builder.newInstance("1", 0).setLocationId("1").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
-		second = Service.Builder.newInstance("3", 0).setLocationId("3").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
-		third = Service.Builder.newInstance("2", 0).setLocationId("2").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
 		Collection<Job> jobs = new ArrayList<Job>();
 		jobs.add(first);
 		jobs.add(second);
@@ -279,12 +249,11 @@ public class TestCalculatesServiceInsertion {
 	@Test
 	public void whenInsertingJobAndCurrRouteAndVehicleHaveTheSameLocation_accessEggressCalcShouldReturnZero(){
 		VehicleRoute route = VehicleRoute.Builder.newInstance(newVehicle, DriverImpl.noDriver())
-				.addService(Service.Builder.newInstance("1", 0).setLocationId("1").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build())
+				.addService(first)
 				.build();
 		
 		AdditionalAccessEgressCalculator accessEgressCalc = new AdditionalAccessEgressCalculator(costs);
-		Job job = Service.Builder.newInstance("1", 0).setLocationId("1").setTimeWindow(TimeWindow.newInstance(0.0, 100.0)).build();
+		JobInsertionContext iContex = new JobInsertionContext(route, first, newVehicle, mock(Driver.class), 0.0);
-		JobInsertionContext iContex = new JobInsertionContext(route, job, newVehicle, mock(Driver.class), 0.0);
 		assertEquals(0.0, accessEgressCalc.getCosts(iContex),0.01);
 	}
 	

jsprit-examples/src/main/java/jsprit/examples/BicycleMessenger.java

@@ -239,7 +239,7 @@ public class BicycleMessenger {
 		//if you want, terminate it after 1000 iterations with no change
 //		algorithm.setPrematureAlgorithmTermination(new IterationWithoutImprovementTermination(1000));
 //		algorithm.addListener(new AlgorithmSearchProgressChartListener("output/progress.png"));
-		algorithm.setNuOfIterations(200);
+		algorithm.setNuOfIterations(2000);
 		Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
 		
 		//this is just to ensure that solution meet the above constraints

jsprit-examples/src/main/java/jsprit/examples/EnRoutePickupAndDeliveryWithMultipleDepotsExample.java

@@ -63,11 +63,20 @@ public class EnRoutePickupAndDeliveryWithMultipleDepotsExample {
 		vehicleBuilder1.setType(vehicleType);
 		Vehicle vehicle1 = vehicleBuilder1.build();
 		
-		Builder vehicleBuilder2 = VehicleImpl.Builder.newInstance("vehicles@[50,50]");
+		Builder vehicleBuilder2 = VehicleImpl.Builder.newInstance("vehicles@[30,30]");
-		vehicleBuilder2.setLocationCoord(Coordinate.newInstance(50, 50));
+		vehicleBuilder2.setLocationCoord(Coordinate.newInstance(30, 30));
 		vehicleBuilder2.setType(vehicleType);
 		Vehicle vehicle2 = vehicleBuilder2.build();
 		
+		Builder vehicleBuilder3 = VehicleImpl.Builder.newInstance("vehicles@[10,30]");
+		vehicleBuilder3.setLocationCoord(Coordinate.newInstance(10, 30));
+		vehicleBuilder3.setType(vehicleType);
+		Vehicle vehicle3 = vehicleBuilder3.build();
+		
+		Builder vehicleBuilder4 = VehicleImpl.Builder.newInstance("vehicles@[30,10]");
+		vehicleBuilder4.setLocationCoord(Coordinate.newInstance(30, 10));
+		vehicleBuilder4.setType(vehicleType);
+		Vehicle vehicle4 = vehicleBuilder4.build();
 		
 		/*
 		 * build shipments at the required locations, each with a capacity-demand of 1.
@@ -84,17 +93,31 @@ public class EnRoutePickupAndDeliveryWithMultipleDepotsExample {
 		Shipment shipment3 = Shipment.Builder.newInstance("3", 1).setPickupCoord(Coordinate.newInstance(15, 7)).setDeliveryCoord(Coordinate.newInstance(14, 9)).build();
 		Shipment shipment4 = Shipment.Builder.newInstance("4", 1).setPickupCoord(Coordinate.newInstance(15, 13)).setDeliveryCoord(Coordinate.newInstance(14, 11)).build();
 		
-		Shipment shipment5 = Shipment.Builder.newInstance("5", 1).setPickupCoord(Coordinate.newInstance(55, 57)).setDeliveryCoord(Coordinate.newInstance(56, 59)).build();
+		Shipment shipment5 = Shipment.Builder.newInstance("5", 1).setPickupCoord(Coordinate.newInstance(25, 27)).setDeliveryCoord(Coordinate.newInstance(26, 29)).build();
-		Shipment shipment6 = Shipment.Builder.newInstance("6", 1).setPickupCoord(Coordinate.newInstance(55, 63)).setDeliveryCoord(Coordinate.newInstance(56, 61)).build();
+		Shipment shipment6 = Shipment.Builder.newInstance("6", 1).setPickupCoord(Coordinate.newInstance(25, 33)).setDeliveryCoord(Coordinate.newInstance(26, 31)).build();
 		
-		Shipment shipment7 = Shipment.Builder.newInstance("7", 1).setPickupCoord(Coordinate.newInstance(65, 57)).setDeliveryCoord(Coordinate.newInstance(64, 59)).build();
+		Shipment shipment7 = Shipment.Builder.newInstance("7", 1).setPickupCoord(Coordinate.newInstance(35, 27)).setDeliveryCoord(Coordinate.newInstance(34, 29)).build();
-		Shipment shipment8 = Shipment.Builder.newInstance("8", 1).setPickupCoord(Coordinate.newInstance(65, 63)).setDeliveryCoord(Coordinate.newInstance(64, 61)).build();
+		Shipment shipment8 = Shipment.Builder.newInstance("8", 1).setPickupCoord(Coordinate.newInstance(35, 33)).setDeliveryCoord(Coordinate.newInstance(34, 31)).build();
+		
+		Shipment shipment9 = Shipment.Builder.newInstance("9", 1).setPickupCoord(Coordinate.newInstance(5, 27)).setDeliveryCoord(Coordinate.newInstance(6, 29)).build();
+		Shipment shipment10 = Shipment.Builder.newInstance("10", 1).setPickupCoord(Coordinate.newInstance(5, 33)).setDeliveryCoord(Coordinate.newInstance(6, 31)).build();
+		
+		Shipment shipment11 = Shipment.Builder.newInstance("11", 1).setPickupCoord(Coordinate.newInstance(15, 27)).setDeliveryCoord(Coordinate.newInstance(14, 29)).build();
+		Shipment shipment12 = Shipment.Builder.newInstance("12", 1).setPickupCoord(Coordinate.newInstance(15, 33)).setDeliveryCoord(Coordinate.newInstance(14, 31)).build();
+		
+		Shipment shipment13 = Shipment.Builder.newInstance("13", 1).setPickupCoord(Coordinate.newInstance(25, 7)).setDeliveryCoord(Coordinate.newInstance(26, 9)).build();
+		Shipment shipment14 = Shipment.Builder.newInstance("14", 1).setPickupCoord(Coordinate.newInstance(25, 13)).setDeliveryCoord(Coordinate.newInstance(26, 11)).build();
+		
+		Shipment shipment15 = Shipment.Builder.newInstance("15", 1).setPickupCoord(Coordinate.newInstance(35, 7)).setDeliveryCoord(Coordinate.newInstance(34, 9)).build();
+		Shipment shipment16 = Shipment.Builder.newInstance("16", 1).setPickupCoord(Coordinate.newInstance(35, 13)).setDeliveryCoord(Coordinate.newInstance(34, 11)).build();
 		
 		
 		VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance();
-		vrpBuilder.addVehicle(vehicle1).addVehicle(vehicle2);
+		vrpBuilder.addVehicle(vehicle1).addVehicle(vehicle2).addVehicle(vehicle3).addVehicle(vehicle4);
 		vrpBuilder.addJob(shipment1).addJob(shipment2).addJob(shipment3).addJob(shipment4);
 		vrpBuilder.addJob(shipment5).addJob(shipment6).addJob(shipment7).addJob(shipment8);
+		vrpBuilder.addJob(shipment9).addJob(shipment10).addJob(shipment11).addJob(shipment12);
+		vrpBuilder.addJob(shipment13).addJob(shipment14).addJob(shipment15).addJob(shipment16);
 		
 		vrpBuilder.setFleetSize(FleetSize.FINITE);
 		VehicleRoutingProblem problem = vrpBuilder.build();
@@ -102,8 +125,8 @@ public class EnRoutePickupAndDeliveryWithMultipleDepotsExample {
 		/*
 		 * get the algorithm out-of-the-box. 
 		 */
-		VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.readAndCreateAlgorithm(problem, "input/algorithmConfig_noVehicleSwitch.xml");
+		VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.readAndCreateAlgorithm(problem, "input/algorithmConfig.xml");
-		algorithm.setNuOfIterations(30000);
+//		algorithm.setNuOfIterations(30000);
 		/*
 		 * and search a solution
 		 */

jsprit-examples/src/main/java/jsprit/examples/ServicePickupsWithMultipleDepotsExample.java

@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (C) 2013  Stefan Schroeder
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either 
+ * version 3.0 of the License, or (at your option) any later version.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public 
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ ******************************************************************************/
+package jsprit.examples;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import jsprit.analysis.toolbox.GraphStreamViewer;
+import jsprit.analysis.toolbox.GraphStreamViewer.Label;
+import jsprit.analysis.toolbox.Plotter;
+import jsprit.analysis.toolbox.SolutionPrinter;
+import jsprit.core.algorithm.VehicleRoutingAlgorithm;
+import jsprit.core.algorithm.io.VehicleRoutingAlgorithms;
+import jsprit.core.problem.VehicleRoutingProblem;
+import jsprit.core.problem.io.VrpXMLWriter;
+import jsprit.core.problem.job.Service;
+import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
+import jsprit.core.problem.vehicle.Vehicle;
+import jsprit.core.problem.vehicle.VehicleImpl;
+import jsprit.core.problem.vehicle.VehicleImpl.Builder;
+import jsprit.core.problem.vehicle.VehicleType;
+import jsprit.core.problem.vehicle.VehicleTypeImpl;
+import jsprit.core.util.Coordinate;
+import jsprit.core.util.Solutions;
+import jsprit.util.Examples;
+
+
+public class ServicePickupsWithMultipleDepotsExample {
+	
+	public static void main(String[] args) {
+		/*
+		 * some preparation - create output folder
+		 */
+		Examples.createOutputFolder();
+		
+		/*
+		 * get a vehicle type-builder and build a type with the typeId "vehicleType" and a capacity of 2
+		 */
+		VehicleTypeImpl.Builder vehicleTypeBuilder = VehicleTypeImpl.Builder.newInstance("vehicleType", 8);
+		vehicleTypeBuilder.setCostPerDistance(1.0);
+		VehicleType vehicleType = vehicleTypeBuilder.build();
+		
+		/*
+		 * define two depots, i.e. two vehicle locations ([10,10],[50,50]) and equip them with an infinite number of vehicles of type 'vehicleType' 
+		 */
+		Builder vehicleBuilder1 = VehicleImpl.Builder.newInstance("vehicles@[10,10]");
+		vehicleBuilder1.setLocationCoord(Coordinate.newInstance(10, 10));
+		vehicleBuilder1.setType(vehicleType);
+		Vehicle vehicle1 = vehicleBuilder1.build();
+		
+		Builder vehicleBuilder2 = VehicleImpl.Builder.newInstance("vehicles@[50,50]");
+		vehicleBuilder2.setLocationCoord(Coordinate.newInstance(50, 50));
+		vehicleBuilder2.setType(vehicleType);
+		Vehicle vehicle2 = vehicleBuilder2.build();
+		
+		
+		/*
+		 * build shipments at the required locations, each with a capacity-demand of 1.
+		 * 4 shipments
+		 * 1: (5,7)->(6,9)
+		 * 2: (5,13)->(6,11)
+		 * 3: (15,7)->(14,9)
+		 * 4: (15,13)->(14,11)
+		 */
+		
+		Service shipment1 = Service.Builder.newInstance("1", 1).setCoord(Coordinate.newInstance(5, 7)).build();
+		Service shipment2 = Service.Builder.newInstance("2", 1).setCoord(Coordinate.newInstance(5, 13)).build();
+		
+		Service shipment3 = Service.Builder.newInstance("3", 1).setCoord(Coordinate.newInstance(15, 7)).build();
+		Service shipment4 = Service.Builder.newInstance("4", 1).setCoord(Coordinate.newInstance(15, 13)).build();
+		
+		Service shipment5 = Service.Builder.newInstance("5", 1).setCoord(Coordinate.newInstance(55, 57)).build();
+		Service shipment6 = Service.Builder.newInstance("6", 1).setCoord(Coordinate.newInstance(55, 63)).build();
+		
+		Service shipment7 = Service.Builder.newInstance("7", 1).setCoord(Coordinate.newInstance(65, 57)).build();
+		Service shipment8 = Service.Builder.newInstance("8", 1).setCoord(Coordinate.newInstance(65, 63)).build();
+		
+		
+		VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance();
+		vrpBuilder.addVehicle(vehicle1).addVehicle(vehicle2);
+		vrpBuilder.addJob(shipment1).addJob(shipment2).addJob(shipment3).addJob(shipment4);
+		vrpBuilder.addJob(shipment5).addJob(shipment6).addJob(shipment7).addJob(shipment8);
+		
+//		vrpBuilder.setFleetSize(FleetSize.FINITE);
+		VehicleRoutingProblem problem = vrpBuilder.build();
+		
+		/*
+		 * get the algorithm out-of-the-box. 
+		 */
+		VehicleRoutingAlgorithm algorithm = VehicleRoutingAlgorithms.readAndCreateAlgorithm(problem, "input/algorithmConfig.xml");
+		algorithm.setNuOfIterations(10);
+		
+		/*
+		 * and search a solution
+		 */
+		Collection<VehicleRoutingProblemSolution> solutions = algorithm.searchSolutions();
+		
+		/*
+		 * get the best 
+		 */
+		VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);
+		
+		/*
+		 * write out problem and solution to xml-file
+		 */
+		new VrpXMLWriter(problem, solutions).write("output/shipment-problem-with-solution.xml");
+		
+		/*
+		 * print nRoutes and totalCosts of bestSolution
+		 */
+		SolutionPrinter.print(bestSolution);
+		
+		/*
+		 * plot problem without solution
+		 */
+		Plotter problemPlotter = new Plotter(problem);
+		problemPlotter.plotShipments(true);
+		problemPlotter.plot("output/enRoutePickupAndDeliveryWithMultipleLocationsExample_problem.png", "en-route pickup and delivery");
+		
+		/*
+		 * plot problem with solution
+		 */
+		Plotter solutionPlotter = new Plotter(problem,Arrays.asList(Solutions.bestOf(solutions).getRoutes().iterator().next()));
+		solutionPlotter.plotShipments(true);
+		solutionPlotter.plot("output/enRoutePickupAndDeliveryWithMultipleLocationsExample_solution.png", "en-route pickup and delivery");
+		
+		new GraphStreamViewer(problem,Solutions.bestOf(solutions)).labelWith(Label.ACTIVITY).setRenderDelay(100).setRenderShipments(true).display();
+		
+	}
+
+}