From 5eaa2887350a02148e45b10323f4dee2b0959235 Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Thu, 20 Jun 2013 17:25:53 +0200
Subject: [PATCH] further refinements

---
 .../algorithms/VehicleFleetManagerImpl.java   |  2 ++
 jsprit-examples/input/algorithmConfig.xml     | 19 +++++++++++++++++--
 ...ltipleDepotExampleWithPenaltyVehicles.java | 10 +++++-----
 .../java/examples/MultipleDepotExample.java   |  4 ++--
 ...ltipleDepotExampleWithPenaltyVehicles.java | 12 ++++++------
 5 files changed, 32 insertions(+), 15 deletions(-)

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 @@
 					</module>
 					
 				</modules>
-				<probability>0.5</probability>
+				<probability>0.3</probability>
 			</searchStrategy>
 			
 			<searchStrategy name="radialRuinAndRecreate">
@@ -61,7 +61,22 @@
 					</module>
 					
 				</modules>
-				<probability>0.5</probability>
+				<probability>0.3</probability>
+			</searchStrategy>
+			
+			<searchStrategy name="radialRuinAndRecreate">
+				<selector name="selectBest"/>
+				<acceptor name="schrimpfAcceptance"/>  
+				<modules>
+					<module name="ruin_and_recreate">
+						<ruin name="radialRuin" id="1">
+							<share>0.1</share>
+						</ruin>
+						<insertion name="bestInsertion"/>					
+					</module>
+					
+				</modules>
+				<probability>0.4</probability>
 			</searchStrategy>
 			
 		</searchStrategies>		
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<nuOfVehicles;i++){
-				VehicleType vehicleType = VehicleType.Builder.newInstance(depotCounter + "_" + (i+1) + "_type", capacity).setCostPerDistance(1.0).build();
+				VehicleType vehicleType = VehicleType.Builder.newInstance(depotCounter + "_type", capacity).setCostPerDistance(1.0).build();
 				String vehicleId = depotCounter + "_" + (i+1) + "_vehicle";
 				VehicleImpl.VehicleBuilder vehicleBuilder = VehicleImpl.VehicleBuilder.newInstance(vehicleId);
 				vehicleBuilder.setLocationCoord(depotCoord);
@@ -65,16 +65,16 @@ public class ConcurrentMultipleDepotExampleWithPenaltyVehicles {
 				Vehicle vehicle = vehicleBuilder.build();
 				vrpBuilder.addVehicle(vehicle);
 			}
-			for(int i=0;i<nuOfPenaltyVehicles;i++){
-				VehicleType penaltyType = VehicleType.Builder.newInstance(depotCounter + "_" + (i+1) + "_penaltyType", capacity).setFixedCost(50).setCostPerDistance(3.0).build();
-				String vehicleId = depotCounter + "_" + (i+1) + "_penaltyVehicle";
+//			for(int i=0;i<nuOfPenaltyVehicles;i++){
+				VehicleType penaltyType = VehicleType.Builder.newInstance(depotCounter + "_type#penalty", capacity).setFixedCost(50).setCostPerDistance(3.0).build();
+				String vehicleId = depotCounter + "_vehicle#penalty";
 				VehicleImpl.VehicleBuilder vehicleBuilder = VehicleImpl.VehicleBuilder.newInstance(vehicleId);
 				vehicleBuilder.setLocationCoord(depotCoord);
 				vehicleBuilder.setType(penaltyType);
 				vehicleBuilder.setLatestArrival(maxDuration);
 				Vehicle penaltyVehicle = vehicleBuilder.build();
 				vrpBuilder.addVehicle(penaltyVehicle);
-			}
+//			}
 			depotCounter++;
 		}
 		
diff --git a/jsprit-examples/src/main/java/examples/MultipleDepotExample.java b/jsprit-examples/src/main/java/examples/MultipleDepotExample.java
index fd8c3700..b3dd73ba 100644
--- a/jsprit-examples/src/main/java/examples/MultipleDepotExample.java
+++ b/jsprit-examples/src/main/java/examples/MultipleDepotExample.java
@@ -53,7 +53,7 @@ public class MultipleDepotExample {
 		int depotCounter = 1;
 		for(Coordinate depotCoord : Arrays.asList(firstDepotCoord,second,third,fourth)){
 			for(int i=0;i<nuOfVehicles;i++){
-				VehicleType vehicleType = VehicleType.Builder.newInstance(depotCounter + "_" + (i+1) + "_type", capacity).setCostPerDistance(1.0).build();
+				VehicleType vehicleType = VehicleType.Builder.newInstance(depotCounter + "_type", capacity).setCostPerDistance(1.0).build();
 				Vehicle vehicle = VehicleImpl.VehicleBuilder.newInstance(depotCounter + "_" + (i+1) + "_vehicle").setLocationCoord(depotCoord).setType(vehicleType).build();
 				vrpBuilder.addVehicle(vehicle);
 			}
@@ -81,7 +81,7 @@ public class MultipleDepotExample {
 		VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig.xml");
 		vra.setNuOfIterations(10000);
 		vra.getAlgorithmListeners().addListener(new StopWatch(),Priority.HIGH);
-		vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/progress.png"));
+//		vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/progress.png"));
 		Collection<VehicleRoutingProblemSolution> 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<nuOfVehicles;i++){
-				VehicleType vehicleType = VehicleType.Builder.newInstance(depotCounter + "_" + (i+1) + "_type", capacity).setCostPerDistance(1.0).build();
+				VehicleType vehicleType = VehicleType.Builder.newInstance(depotCounter + "_type", capacity).setCostPerDistance(1.0).build();
 				String vehicleId = depotCounter + "_" + (i+1) + "_vehicle";
 				VehicleImpl.VehicleBuilder vehicleBuilder = VehicleImpl.VehicleBuilder.newInstance(vehicleId);
 				vehicleBuilder.setLocationCoord(depotCoord);
@@ -63,16 +63,16 @@ public class MultipleDepotExampleWithPenaltyVehicles {
 				Vehicle vehicle = vehicleBuilder.build();
 				vrpBuilder.addVehicle(vehicle);
 			}
-			for(int i=0;i<nuOfPenaltyVehicles;i++){
-				VehicleType penaltyType = VehicleType.Builder.newInstance(depotCounter + "_" + (i+1) + "_type#penalty", capacity).setFixedCost(50).setCostPerDistance(3.0).build();
-				String vehicleId = depotCounter + "_" + (i+1) + "_vehicle#penalty";
+//			for(int i=0;i<nuOfPenaltyVehicles;i++){
+				VehicleType penaltyType = VehicleType.Builder.newInstance(depotCounter + "_type#penalty", capacity).setFixedCost(50).setCostPerDistance(3.0).build();
+				String vehicleId = depotCounter + "_vehicle#penalty";
 				VehicleImpl.VehicleBuilder vehicleBuilder = VehicleImpl.VehicleBuilder.newInstance(vehicleId);
 				vehicleBuilder.setLocationCoord(depotCoord);
 				vehicleBuilder.setType(penaltyType);
 				vehicleBuilder.setLatestArrival(maxDuration);
 				Vehicle penaltyVehicle = vehicleBuilder.build();
 				vrpBuilder.addVehicle(penaltyVehicle);
-			}
+//			}
 			depotCounter++;
 		}
 		
@@ -91,7 +91,7 @@ public class MultipleDepotExampleWithPenaltyVehicles {
 		/*
 		 * plot to see how the problem looks like
 		 */
-		SolutionPlotter.plotVrpAsPNG(vrp, "output/problem08.png", "p08");
+//		SolutionPlotter.plotVrpAsPNG(vrp, "output/problem08.png", "p08");
 
 		/*
 		 * solve the problem