Merge pull request #57 from matsim-org/modernize_kn

make config.xml more modern

Author: kainagel

scenarios/equil/config.xml

@@ -15,52 +15,35 @@
 		<param name="inputPlansFile" value="plans100.xml" />
 	</module>
 
-	<module name="controler">
+	<module name="controller">
 		<param name="outputDirectory" value="./output" />
-		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="10" />
 	</module>
 
-	<module name="qsim">
-		<!-- "start/endTime" of MobSim (00:00:00 == take earliest activity time/ run as long as active vehicles exist) -->
-		<param name="startTime" value="00:00:00" />
-		<param name="endTime" value="00:00:00" />
-	
-		<param name = "snapshotperiod"	value = "00:00:00"/> <!-- 00:00:00 means NO snapshot writing -->
-	</module>
-
-	<module name="planCalcScore">
-		<param name="learningRate" value="1.0" />
-		<param name="BrainExpBeta" value="2.0" />
-
+	<module name="scoring">
 		<param name="lateArrival" value="-18" />
-		<param name="earlyDeparture" value="-0" />
 		<param name="performing" value="+6" />
-		<param name="waiting" value="-0" />
 		<parameterset type="activityParams" >
-			<param name="activityType"            value="h" /> <!-- home -->
-			<param name="priority"        value="1" />
+			<param name="activityType"            value="h" />
 			<param name="typicalDuration" value="12:00:00" />
 		</parameterset>
 		<parameterset type="activityParams" >
-			<param name="activityType"            value="w" /> <!-- work -->
-			<param name="priority"        value="1" />
+			<param name="activityType"            value="w" />
 			<param name="typicalDuration" value="08:00:00" />
 			<param name="openingTime"     value="07:00:00" />
-			<param name="latestStartTime" value="09:00:00" />
-			<param name="earliestEndTime" value="" />
 			<param name="closingTime"     value="18:00:00" />
 		</parameterset>
 	</module>
 
-	<module name="strategy">
-		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
-
-		<param name="ModuleProbability_1" value="0.9" />
-		<param name="Module_1" value="BestScore" />
-
-		<param name="ModuleProbability_2" value="0.1" />
-		<param name="Module_2" value="ReRoute" />
+	<module name="replanning">
+		<parameterset type="strategysettings" >
+			<param name="strategyName" value="BestScore" />
+			<param name="weight" value="0.9" />
+		</parameterset>
+		<parameterset type="strategysettings" >
+			<param name="strategyName" value="ReRoute" />
+			<param name="weight" value="0.1" />
+		</parameterset>
 	</module>
 
 </config>

src/test/java/org/matsim/project/RunMatsimTest.java

@@ -54,8 +54,8 @@ public final void test() {
 			final URL baseUrl = ExamplesUtils.getTestScenarioURL( "equil" );
 			final String fullUrl = IOUtils.extendUrl( baseUrl, "config.xml" ).toString();
 			String [] args = {fullUrl,
-				  "--config:controler.outputDirectory", utils.getOutputDirectory(),
-				  "--config:controler.lastIteration", "1"
+				  "--config:controller.outputDirectory", utils.getOutputDirectory(),
+				  "--config:controller.lastIteration", "1"
 			} ;
 			RunMatsim.main( args ) ;
 			{