Merge branch 'master' into 2845-remove-ptcounts

matsim-org · Oct 12, 2023 · 2b70349 · 2b70349
2 parents b85edf1 + 7b265eb
commit 2b70349
Show file tree

Hide file tree

Showing 21 changed files with 105 additions and 654 deletions.
diff --git a/...application/test/input/org/matsim/smallScaleCommercialTrafficGeneration/config_demand.xml b/...application/test/input/org/matsim/smallScaleCommercialTrafficGeneration/config_demand.xml
@@ -533,8 +533,6 @@
 		<param name="travelTimeAggregator" value="optimistic" />
 		<!-- The size of the time bin (in sec) into which the link travel times are aggregated for the router -->
 		<param name="travelTimeBinSize" value="900" />
-		<!-- possible values: TravelTimeCalculatorArray TravelTimeCalculatorHashMap  -->
-		<param name="travelTimeCalculator" value="TravelTimeCalculatorArray" />
 		<!-- How to deal with link entry times at different positions during the time bin. Currently supported: average, linearinterpolation -->
 		<param name="travelTimeGetter" value="average" />
 	</module>

diff --git a/...carsharing/test/input/org/matsim/contrib/carsharing/runExample/RunCarsharingIT/config.xml b/...carsharing/test/input/org/matsim/contrib/carsharing/runExample/RunCarsharingIT/config.xml
@@ -23,8 +23,6 @@
 		<!--param name="travelTimeAggregator" value="optimistic" /-->
 		<!--param name="travelTimeBinSize" value="900" /-->
 
-		<!-- TravelTimeCalculatorArray, TravelTimeCalculatorHashMap -->
-		<!--param name="travelTimeCalculator" value="TravelTimeCalculatorArray" /-->
 	</module>
 
 <!-- ====================================================================== -->
@@ -45,11 +43,11 @@
 
 
 	<module name="FreeFloating" >
-		<param name="areasFreefloating" value="freefloating_areas.xml" />	
-		<param name="useFreeFloating" value="true" />	
+		<param name="areasFreefloating" value="freefloating_areas.xml" />
+		<param name="useFreeFloating" value="true" />
 	</module>
 
-	<module name="OneWayCarsharing" >	    
+	<module name="OneWayCarsharing" >
         <param name="useOneWayCarsharing" value="true" />
         <!--  currently not used -->
         <param name="searchDistanceOneWayCarsharing" value="500.0" />
@@ -254,7 +252,7 @@
 				<param name="mode" value="walk" />
 				<param name="monetaryDistanceRate" value="0.0" />
 		</parameterset>
-        
+
 		<param name="performing" value="6.0" />
 		<param name="earlyDeparture" value="0" />
 		<param name="waiting" value="0" />

diff --git a/contribs/commercialTrafficApplications/scenarios/grid/jointDemand_config.xml b/contribs/commercialTrafficApplications/scenarios/grid/jointDemand_config.xml
@@ -517,8 +517,6 @@
         <param name="travelTimeAggregator" value="optimistic"/>
         <!-- The size of the time bin (in sec) into which the link travel times are aggregated for the router -->
         <param name="travelTimeBinSize" value="900"/>
-        <!-- possible values: TravelTimeCalculatorArray TravelTimeCalculatorHashMap  -->
-        <param name="travelTimeCalculator" value="TravelTimeCalculatorArray"/>
         <!-- How to deal with link entry times at different positions during the time bin. Currently supported: average, linearinterpolation -->
         <param name="travelTimeGetter" value="average"/>
     </module>

diff --git a/contribs/locationchoice/test/input/org/matsim/contrib/locationchoice/config2.xml b/contribs/locationchoice/test/input/org/matsim/contrib/locationchoice/config2.xml
@@ -10,7 +10,6 @@
 
 	<module name="travelTimeCalculator" >
 		<param name="travelTimeBinSize" value="900" />
-		<param name="travelTimeCalculator" value="TravelTimeCalculatorArray" />
 	</module>
 
 	<module name="network">

diff --git a/contribs/locationchoice/test/input/org/matsim/contrib/locationchoice/facilityload/config.xml b/contribs/locationchoice/test/input/org/matsim/contrib/locationchoice/facilityload/config.xml
@@ -7,21 +7,20 @@
 		<param name="firstIteration" value="0" />
 		<param name="lastIteration" value="0" />
 	</module>
-	
+
   <module name="travelTimeCalculator" >
     <param name="travelTimeBinSize" value="900" />
-    <param name="travelTimeCalculator" value="TravelTimeCalculatorArray" />
   </module>
-  
-  
+
+
 	<module name="network">
 		<param name="inputNetworkFile" value="test/scenarios/equil/network.xml" />
 	</module>
 
 	<module name="plans">
 		<param name="inputPlansFile" value="test/input/org/matsim/contrib/locationchoice/plans.xml" />
 	</module>
-	
+
 	<module name="locationchoice">
 		<param name="restraintFcnFactor" value="0.131687242798"/> <!-- factor of the fac.cap.restraint function -->
 		<param name="restraintFcnExp" value="5.0"/> <!-- exponent of the fac.cap.restraint function -->
@@ -31,12 +30,12 @@
 		<param name="maxRecursions" value="10"/> <!-- positive integer, if 0 := universal choice set -->
 		<param name="algorithm" value="random" />
 	</module>
-		
+
 	<module name="facilities" >
 		<param name="inputFacilitiesFile" value="test/scenarios/equil/facilities.xml" />
 		<param name="facilitiesSource" value="fromFile" />
-	</module>	
-	
+	</module>
+
 	<module name="qsim">
 		<param name="startTime" value="00:00:00" />
 		<param name="endTime" value="07:00:00" />
@@ -63,5 +62,5 @@
 		<param name="activityEarliestEndTime_1" value="" />
 		<param name="activityClosingTime_1"     value="18:00:00" />
 	</module>
-	
+
 </config>
diff --git a/...ribs/locationchoice/test/input/org/matsim/contrib/locationchoice/timegeography/config.xml b/...ribs/locationchoice/test/input/org/matsim/contrib/locationchoice/timegeography/config.xml
@@ -10,18 +10,17 @@
 
   <module name="travelTimeCalculator" >
     <param name="travelTimeBinSize" value="900" />
-    <param name="travelTimeCalculator" value="TravelTimeCalculatorArray" />
   </module>
 
-	
+
 	<module name="network">
 		<param name="inputNetworkFile" value="../network.xml" />
 	</module>
 
 	<module name="plans">
 		<param name="inputPlansFile" value="../plans.xml" />
 	</module>
-	
+
 	<module name="locationchoice">
 		<param name="restraintFcnFactor" value="0.131687242798"/> <!-- factor of the fac.cap.restraint function -->
 		<param name="restraintFcnExp" value="5.0"/> <!-- exponent of the fac.cap.restraint function -->
@@ -32,12 +31,12 @@
 		<param name="flexible_types" value="s,l,w" />
 		<param name="algorithm" value="random" />
 	</module>
-		
+
 	<module name="facilities" >
 		<param name="inputFacilitiesFile" value="../facilities.xml" />
 		<param name="facilitiesSource" value="fromFile" />
-	</module>	
-	
+	</module>
+
 	<module name="qsim">
 		<param name="startTime" value="00:00:00" />
 		<param name="endTime" value="07:00:00" />
@@ -94,5 +93,5 @@
 			<param name="monetaryDistanceRate" value="0.0" />
 		</parameterset>
 	</module>
-	
+
 </config>
diff --git a/...or/TransferAtAccessStopRaptorTest/NPETest/config-in-original-coords-minibus-w-transit.xml b/...or/TransferAtAccessStopRaptorTest/NPETest/config-in-original-coords-minibus-w-transit.xml
@@ -506,9 +506,6 @@
 		<!-- The size of the time bin (in sec) into which the link travel times are aggregated for the router -->
 		<param name="travelTimeBinSize" value="900" />
 
-		<!-- possible values: nullTravelTimeCalculatorArray TravelTimeCalculatorHashMap  -->
-		<param name="travelTimeCalculator" value="TravelTimeCalculatorArray" />
-
 		<!-- How to deal with link entry times at different positions during the time bin. Currently supported: average, linearinterpolation -->
 		<param name="travelTimeGetter" value="average" />
 	</module>