get rid of FastAStarLandmarks in config files

contribs/application/test/input/org/matsim/smallScaleCommercialTrafficGeneration/config_demand.xml

@@ -47,7 +47,7 @@
 		<param name="outputDirectory" value="test/output/org/matsim/smallScaleCommercialTrafficGeneration/RunGenerateSmallScaleCommercialTrafficTest/testMainRunAndResults/" />
 		<!-- Possible values: failIfDirectoryExists, overwriteExistingFiles, deleteDirectoryIfExists -->
 		<param name="overwriteFiles" value="overwriteExistingFiles" />
-		<!-- The type of routing (least cost path) algorithm used, may have the values: [Dijkstra, AStarLandmarks, FastDijkstra, FastAStarLandmarks, SpeedyALT] -->
+		<!-- The type of routing (least cost path) algorithm used, may have the values: [Dijkstra, AStarLandmarks, SpeedyALT] -->
 		<param name="routingAlgorithmType" value="SpeedyALT" />
 		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
 		<param name="runId" value="test" />

contribs/commercialTrafficApplications/scenarios/grid/jointDemand_config.xml

@@ -47,7 +47,7 @@
         <param name="outputDirectory" value="output/commercialtraffictestrun"/>
         <!-- Possible values: failIfDirectoryExists, overwriteExistingFiles, deleteDirectoryIfExists -->
         <param name="overwriteFiles" value="deleteDirectoryIfExists"/>
-        <!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, FastDijkstra, AStarLandmarks or FastAStarLandmarks -->
+        <!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, FastDijkstra, SpeedyALT -->
         <param name="routingAlgorithmType" value="AStarLandmarks"/>
         <!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
         <param name="runId" value="jointDemandUsingDRTExample"/>

contribs/minibus/test/input/org/matsim/contrib/minibus/raptor/TransferAtAccessStopRaptorTest/NPETest/config-in-original-coords-minibus-w-transit.xml

@@ -37,7 +37,7 @@
 		<param name="lastIteration" value="100" />
 		<param name="outputDirectory" value="output-minibus-w-transit/test" />
 		<param name="overwriteFiles" value="failIfDirectoryExists" />
-		<param name="routingAlgorithmType" value="FastAStarLandmarks" />
+		<param name="routingAlgorithmType" value="SpeedyALT" />
 		<param name="writeEventsInterval" value="100" />
 		<param name="writePlansInterval" value="100" />
 		<param name="writeSnapshotsInterval" value="0" />

contribs/multimodal/src/test/resources/test/input/org/matsim/contrib/multimodal/MultiModalControlerListenerTest/config_berlin_multimodal.xml

@@ -25,18 +25,18 @@
 	</module>
 
 	<module name="controler">
-		<param name="routingAlgorithmType" value="FastAStarLandmarks" />
+		<param name="routingAlgorithmType" value="SpeedyALT" />
 	</module>
 
 	<module name="qsim">
-		<!-- "start/endTime" of MobSim (00:00:00 == take earliest activity time/ 
+		<!-- "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 -->
 
-		<param name="flowCapacityFactor" value="0.02" /> <!-- we simulate only 1% of the population, and reduce the network capacity 
+		<param name="flowCapacityFactor" value="0.02" /> <!-- we simulate only 1% of the population, and reduce the network capacity
 			to 2% -->
 		<param name="storageCapacityFactor" value="0.05" />
 	</module>

contribs/signals/examples/tutorial/example90TrafficLights/useSignalInput/withLanes/config.xml

@@ -55,7 +55,7 @@
 		<!-- Default=1000;  -->
 		<param name="lastIteration" value="1000" />
 
-		<!-- Defines which mobility simulation will be used. Currently supported: qsim JDEQSim 
+		<!-- Defines which mobility simulation will be used. Currently supported: qsim JDEQSim
 		Depending on the chosen mobsim, you'll have to add additional config modules to configure the corresponding mobsim.
 		For 'qsim', add a module 'qsim' to the config. -->
 		<param name="mobsim" value="qsim" />
@@ -65,7 +65,7 @@
 		<!-- Possible values: failIfDirectoryExists, overwriteExistingFiles, deleteDirectoryIfExists -->
 		<param name="overwriteFiles" value="failIfDirectoryExists" />
 
-		<!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, FastDijkstra, AStarLandmarks or FastAStarLandmarks -->
+		<!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, FastDijkstra, SpeedyALT -->
 		<param name="routingAlgorithmType" value="Dijkstra" />
 
 		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
@@ -234,7 +234,7 @@
 				<!-- method to compute score at typical duration.  Options: | uniform | relative | Use uniform for backwards compatibility (all activities same score; higher proba to drop long acts). -->
 				<param name="typicalDurationScoreComputation" value="uniform" />
 			</parameterset>
-			
+
 			<parameterset type="activityParams" >
 				<param name="activityType" value="w" />
 				<param name="closingTime" value="undefined" />
@@ -650,7 +650,7 @@
 
 		<!-- strategyName of PlanSelector for plans removal.  Possible defaults: WorstPlanSelector SelectRandom SelectExpBetaForRemoval ChangeExpBetaForRemoval PathSizeLogitSelectorForRemoval . The current default, WorstPlanSelector is not a good choice from a discrete choice theoretical perspective. Alternatives, however, have not been systematically tested. kai, feb'12 -->
 		<param name="planSelectorForRemoval" value="WorstPlanSelector" />
-		
+
 		<parameterset type="strategysettings" >
 			<!-- iteration after which strategy will be disabled.  most useful for ``innovative'' strategies (new routes, new times, ...). Normally, better use fractionOfIterationsToDisableInnovation -->
 			<param name="disableAfterIteration" value="-1" />
@@ -663,7 +663,7 @@
 			<!-- weight of a strategy: for each agent, a strategy will be selected with a probability proportional to its weight -->
 			<param name="weight" value="0.9" />
 		</parameterset>
-		
+
 		<parameterset type="strategysettings" >
 			<!-- iteration after which strategy will be disabled.  most useful for ``innovative'' strategies (new routes, new times, ...). Normally, better use fractionOfIterationsToDisableInnovation -->
 			<param name="disableAfterIteration" value="-1" />

contribs/signals/examples/tutorial/example90TrafficLights/useSignalInput/woLanes/config.xml

@@ -55,7 +55,7 @@
 		<!-- Default=1000;  -->
 		<param name="lastIteration" value="1000" />
 
-		<!-- Defines which mobility simulation will be used. Currently supported: qsim JDEQSim 
+		<!-- Defines which mobility simulation will be used. Currently supported: qsim JDEQSim
 		Depending on the chosen mobsim, you'll have to add additional config modules to configure the corresponding mobsim.
 		For 'qsim', add a module 'qsim' to the config. -->
 		<param name="mobsim" value="qsim" />
@@ -65,7 +65,7 @@
 		<!-- Possible values: failIfDirectoryExists, overwriteExistingFiles, deleteDirectoryIfExists -->
 		<param name="overwriteFiles" value="failIfDirectoryExists" />
 
-		<!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, FastDijkstra, AStarLandmarks or FastAStarLandmarks -->
+		<!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, AStarLandmarks or SpeedyALT -->
 		<param name="routingAlgorithmType" value="Dijkstra" />
 
 		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->
@@ -234,7 +234,7 @@
 				<!-- method to compute score at typical duration.  Options: | uniform | relative | Use uniform for backwards compatibility (all activities same score; higher proba to drop long acts). -->
 				<param name="typicalDurationScoreComputation" value="uniform" />
 			</parameterset>
-			
+
 			<parameterset type="activityParams" >
 				<param name="activityType" value="w" />
 				<param name="closingTime" value="undefined" />
@@ -249,7 +249,7 @@
 				<!-- method to compute score at typical duration.  Options: | uniform | relative | Use uniform for backwards compatibility (all activities same score; higher proba to drop long acts). -->
 				<param name="typicalDurationScoreComputation" value="uniform" />
 			</parameterset>
-			
+
 			<parameterset type="activityParams" >
 				<param name="activityType" value="car interaction" />
 				<param name="closingTime" value="undefined" />

contribs/socnetsim/test/input/org/matsim/contrib/socnetsim/config.xml

@@ -36,7 +36,7 @@
 		<param name="mobsim" value="qsim" />
 		<param name="outputDirectory" value="./output/&outputName;" />
 
-		<!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, FastDijkstra, AStarLandmarks or FastAStarLandmarks -->
+		<!-- The type of routing (least cost path) algorithm used, may have the values: Dijkstra, AStarLandmarks or SpeedyALT -->
 		<param name="routingAlgorithmType" value="Dijkstra" />
 
 		<!-- An identifier for the current run which is used as prefix for output files and mentioned in output xml files etc. -->

examples/scenarios/berlin/config_multimodal.xml

@@ -23,20 +23,20 @@
 	</module>
 
 	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+		<param name= "routingAlgorithmType" value="SpeedyALT" />
 	</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 -->
-		
+
 		<param name = "flowCapacityFactor" value="0.02" /> <!-- we simulate only 1% of the population, and reduce the network capacity to 2% -->
 		<param name = "storageCapacityFactor" value="0.05" />
 	</module>
-	
+
 	<module name="multimodal" >
 		<param name="createMultiModalNetwork" value="true" />
 		<param name="cuttoffValueForNonCarModes" value="25.0" />
@@ -45,7 +45,7 @@
 		<param name="simulatedModes" value="bike,walk" />
 		<param name="ensureActivityReachability" value ="true" />
 	</module>
-	
+
 	<module name="planCalcScore">
 		<param name="learningRate" value="1.0" />
 		<param name="BrainExpBeta" value="2.0" />
@@ -100,7 +100,7 @@
 			</parameterset>
 		</parameterset>
 	</module>
-	
+
 	<module name="strategy">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 

examples/scenarios/berlin/config_withinday.xml

@@ -23,16 +23,16 @@
 	</module>
 
 	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+		<param name= "routingAlgorithmType" value="SpeedyALT" />
 	</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 -->
-		
+
 		<param name = "flowCapacityFactor" value="0.02" /> <!-- we simulate only 1% of the population, and reduce the network capacity to 2% -->
 		<param name = "storageCapacityFactor" value="0.05" />
 	</module>
@@ -87,7 +87,7 @@
 			</parameterset>
 		</parameterset>
 	</module>
-	
+
 	<module name="strategy">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 

matsim/test/input/scenarios/berlin/config_multimodal.xml

@@ -23,20 +23,20 @@
 	</module>
 
 	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+		<param name= "routingAlgorithmType" value="SpeedyALT" />
 	</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 -->
-		
+
 		<param name = "flowCapacityFactor" value="0.02" /> <!-- we simulate only 1% of the population, and reduce the network capacity to 2% -->
 		<param name = "storageCapacityFactor" value="0.05" />
 	</module>
-	
+
 	<module name="multimodal" >
 		<param name="createMultiModalNetwork" value="true" />
 		<param name="cuttoffValueForNonCarModes" value="25.0" />
@@ -45,7 +45,7 @@
 		<param name="simulatedModes" value="bike,walk" />
 		<param name="ensureActivityReachability" value ="true" />
 	</module>
-	
+
 	<module name="planCalcScore">
 		<param name="learningRate" value="1.0" />
 		<param name="BrainExpBeta" value="2.0" />
@@ -55,12 +55,12 @@
 		<param name="performing" value="+6" />
 		<param name="traveling" value="-6" />
 		<param name="waiting" value="-0" />
-		
+
 		<param name="activityType_0"            value="home" />
 		<param name="activityPriority_0"        value="1" />
 		<param name="activityTypicalDuration_0" value="12:00:00" />
 		<param name="activityMinimalDuration_0" value="08:00:00" />
-	
+
 		<param name="activityType_1"            value="work" />
 		<param name="activityPriority_1"        value="1" />
 		<param name="activityTypicalDuration_1" value="08:00:00" />
@@ -69,12 +69,12 @@
 		<param name="activityLatestStartTime_1" value="09:00:00" />
 		<param name="activityEarliestEndTime_1" value="" />
 		<param name="activityClosingTime_1"     value="18:00:00" />
-		
+
 		<param name="activityType_2"            value="edu" />
 		<param name="activityPriority_2"        value="1" />
 		<param name="activityTypicalDuration_2" value="08:00:00" />
 	</module>
-	
+
 	<module name="strategy">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
@@ -83,7 +83,7 @@
 
 		<param name="ModuleProbability_2" value="0.1" />
 		<param name="Module_2" value="ReRoute" />
-	
+
 		<param name="ModuleProbability_3" value="0.1" />
 		<param name="Module_3"  value="TimeAllocationMutator" />
 	</module>

matsim/test/input/scenarios/berlin/config_withinday.xml

@@ -23,16 +23,16 @@
 	</module>
 
 	<module name="controler">
-		<param name= "routingAlgorithmType" value="FastAStarLandmarks" />
+		<param name= "routingAlgorithmType" value="SpeedyALT" />
 	</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 -->
-		
+
 		<param name = "flowCapacityFactor" value="0.02" /> <!-- we simulate only 1% of the population, and reduce the network capacity to 2% -->
 		<param name = "storageCapacityFactor" value="0.05" />
 	</module>
@@ -46,12 +46,12 @@
 		<param name="performing" value="+6" />
 		<param name="traveling" value="-6" />
 		<param name="waiting" value="-0" />
-		
+
 		<param name="activityType_0"            value="home" />
 		<param name="activityPriority_0"        value="1" />
 		<param name="activityTypicalDuration_0" value="12:00:00" />
 		<param name="activityMinimalDuration_0" value="08:00:00" />
-	
+
 		<param name="activityType_1"            value="work" />
 		<param name="activityPriority_1"        value="1" />
 		<param name="activityTypicalDuration_1" value="08:00:00" />
@@ -60,12 +60,12 @@
 		<param name="activityLatestStartTime_1" value="09:00:00" />
 		<param name="activityEarliestEndTime_1" value="" />
 		<param name="activityClosingTime_1"     value="18:00:00" />
-		
+
 		<param name="activityType_2"            value="edu" />
 		<param name="activityPriority_2"        value="1" />
 		<param name="activityTypicalDuration_2" value="08:00:00" />
 	</module>
-	
+
 	<module name="strategy">
 		<param name="maxAgentPlanMemorySize" value="5" /> <!-- 0 means unlimited -->
 
@@ -74,7 +74,7 @@
 
 		<param name="ModuleProbability_2" value="0.1" />
 		<param name="Module_2" value="ReRoute" />
-	
+
 		<param name="ModuleProbability_3" value="0.1" />
 		<param name="Module_3" value="TimeAllocationMutator" />
 	</module>