From 458b3cfc8784f5a7daafc3bb66042e8f21ef3707 Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Fri, 21 Jun 2013 11:35:57 +0200
Subject: [PATCH] modify example according to changes in VehicleTypeImpl

---
 jsprit-examples/input/algorithmConfig.xml     | 29 ++++++++++---------
 .../java/examples/MultipleDepotExample.java   |  2 --
 ...ltipleDepotExampleWithPenaltyVehicles.java |  2 --
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/jsprit-examples/input/algorithmConfig.xml b/jsprit-examples/input/algorithmConfig.xml
index 19d8d042..dd27c419 100755
--- a/jsprit-examples/input/algorithmConfig.xml
+++ b/jsprit-examples/input/algorithmConfig.xml
@@ -22,7 +22,7 @@
 <algorithm xmlns="http://www.w3schools.com"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3schools.com algorithm_schema.xsd">
 	
-	<iterations>2000</iterations>
+	<iterations>10000</iterations>
 
 	<construction>
 		<insertion name="bestInsertion"/>
@@ -31,31 +31,32 @@
 	<strategy>
 		<memory>1</memory>
 		<searchStrategies>
-			<searchStrategy name="randomRuinAndRecreate">
+			<searchStrategy name="radialRuinAndRecreate">
 				<selector name="selectBest"/>
-	  			<acceptor name="schrimpfAcceptance">  
- 					<alpha>0.0</alpha>  
-  					<warmup>100</warmup> 
+				<acceptor name="schrimpfAcceptance">
+					<alpha>0.1</alpha>  
+  					<warmup>100</warmup>  
   				</acceptor>
 				<modules>
 					<module name="ruin_and_recreate">
 						<ruin name="randomRuin">
-							<share>0.15</share>
+							<share>0.3</share>
 						</ruin>
-						<insertion name="bestInsertion"/>						
+						<insertion name="bestInsertion"/>					
 					</module>
 					
 				</modules>
-				<probability>0.0</probability>
+				<probability>0.2</probability>
 			</searchStrategy>
 			
 			<searchStrategy name="radialRuinAndRecreate">
 				<selector name="selectBest"/>
-				<acceptor name="schrimpfAcceptance"/>  
+				<acceptor name="schrimpfAcceptance"/>
+					
 				<modules>
 					<module name="ruin_and_recreate">
-						<ruin name="radialRuin">
-							<share>0.1</share>
+						<ruin id="1" name="radialRuin">
+							<share>0.15</share>
 						</ruin>
 						<insertion name="bestInsertion"/>					
 					</module>
@@ -69,14 +70,14 @@
 				<acceptor name="schrimpfAcceptance"/>  
 				<modules>
 					<module name="ruin_and_recreate">
-						<ruin name="radialRuin" id="1">
-							<share>0.025</share>
+						<ruin id="2" name="radialRuin">
+							<share>0.05</share>
 						</ruin>
 						<insertion name="bestInsertion"/>					
 					</module>
 					
 				</modules>
-				<probability>0.8</probability>
+				<probability>0.6</probability>
 			</searchStrategy>
 			
 		</searchStrategies>		
diff --git a/jsprit-examples/src/main/java/examples/MultipleDepotExample.java b/jsprit-examples/src/main/java/examples/MultipleDepotExample.java
index de1db00f..c05183bb 100644
--- a/jsprit-examples/src/main/java/examples/MultipleDepotExample.java
+++ b/jsprit-examples/src/main/java/examples/MultipleDepotExample.java
@@ -80,8 +80,6 @@ public class MultipleDepotExample {
 		 * solve the problem
 		 */
 		VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig.xml");
-		vra.setNuOfIterations(10000);
-		vra.setPrematureBreak(100);
 		vra.getAlgorithmListeners().addListener(new StopWatch(),Priority.HIGH);
 		vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/progress.png"));
 		Collection<VehicleRoutingProblemSolution> solutions = vra.searchSolutions();
diff --git a/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java b/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java
index acd61039..dc43639e 100644
--- a/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java
+++ b/jsprit-examples/src/main/java/examples/MultipleDepotExampleWithPenaltyVehicles.java
@@ -106,8 +106,6 @@ public class MultipleDepotExampleWithPenaltyVehicles {
 		 * solve the problem
 		 */
 		VehicleRoutingAlgorithm vra = VehicleRoutingAlgorithms.readAndCreateAlgorithm(vrp, "input/algorithmConfig.xml");
-		vra.setNuOfIterations(10000);
-		vra.setPrematureBreak(1000);
 		vra.getAlgorithmListeners().addListener(new StopWatch(),Priority.HIGH);
 		vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener("output/progress.png"));
 		Collection<VehicleRoutingProblemSolution> solutions = vra.searchSolutions();