improve rng for population attribute sampling, prepare new release

matsim-scenarios · Feb 6, 2025 · 29e9742 · 29e9742
1 parent 5f4a368
commit 29e9742
Show file tree

Hide file tree

Showing 11 changed files with 909 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 
 
 JAR := matsim-berlin-*.jar
-V := v6.4
+V := v6.5
 CRS := EPSG:25832
 
 p := input/$V
@@ -372,7 +372,7 @@ $p/berlin-$V.drt-by-rndLocations-10000vehicles-4seats.xml.gz: $p/berlin-$V-netwo
 	 --seats 4
 
 
-prepare-calibration: $p/berlin-cadyts-input-$V-25pct.plans.xml.gz $p/berlin-$V-network-with-pt.xml.gz $p/berlin-$V-counts-vmz.xml.gz
+prepare-calibration: $p/berlin-activities-$V-25pct.plans.xml.gz $p/berlin-$V-network-with-pt.xml.gz $p/berlin-$V-counts-vmz.xml.gz
 	echo "Done"
 
 prepare-initial: $p/berlin-$V-25pct.plans-initial.xml.gz $p/berlin-$V-network-with-pt.xml.gz

diff --git a/input/v6.5/berlin-v6.5-vehicleTypes.xml b/input/v6.5/berlin-v6.5-vehicleTypes.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<vehicleDefinitions xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/vehicleDefinitions_v2.0.xsd">
+
+	<!-- Mode types -->
+
+	<vehicleType id="car">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">petrol (4S)</attribute>
+			</attributes>
+		</engineInformation>
+		<passengerCarEquivalents pce="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="bike">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="2.0"/>
+		<width meter="1.0"/>
+
+		<!-- The speed was set such that the obtained avg. speed per trip matches the one reported in the SrV survey -->
+		<!-- Note that this speed includes all the effects of delays that might occur, such as waiting for traffic lights -->
+		<!-- The reported data is 10.29 km/h, it needs to set higher here (+0.4) because this includes access/egress as well -->
+		<maximumVelocity meterPerSecond="2.98"/>
+
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">NON_HBEFA_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+			</attributes>
+		</engineInformation>
+
+		<passengerCarEquivalents pce="0.2"/>
+		<networkMode networkMode="bike"/>
+	</vehicleType>
+
+	<vehicleType id="ride">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+	</vehicleType>
+
+	<vehicleType id="freight">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="15.0"/>
+		<width meter="1.0"/>
+
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+
+		<passengerCarEquivalents pce="3.5"/>
+		<networkMode networkMode="truck"/>
+	</vehicleType>
+
+	<vehicleType id="truck">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="15.0"/>
+		<width meter="1.0"/>
+
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+
+		<passengerCarEquivalents pce="3.5"/>
+		<networkMode networkMode="truck"/>
+	</vehicleType>
+
+	<!-- Specific types for commercial traffic -->
+
+	<vehicleType id="golf1.4">
+
+		<description>Golf 1.4 Trendline</description>
+		<capacity seats="4" standingRoomInPersons="0" other="0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="38.89"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">petrol (4S)</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="31.07" costsPerMeter="1.5E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="vwCaddy">
+
+		<description>VW Caddy 2.0 Maxi TDI</description>
+		<capacity seats="4" standingRoomInPersons="0" other="0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="38.89"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="27.27" costsPerMeter="1.7E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="mercedes313">
+
+		<description>Mercedes 313 CDI</description>
+		<capacity seats="1" standingRoomInPersons="0" other="0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="38.89"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="36.42" costsPerMeter="2.6E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="light8t">
+
+		<description>Light Vehicle 7.5t</description>
+		<capacity seats="1" standingRoomInPersons="0" other="10.0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="22.22"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="63.49" costsPerMeter="4.0E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="2.0"/>
+		<networkMode networkMode="truck"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="medium18t">
+
+		<description>Medium Vehicle 18t</description>
+		<capacity seats="1" standingRoomInPersons="0" other="16.0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="22.22"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="80.47" costsPerMeter="5.3E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="3.0"/>
+		<networkMode networkMode="truck"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+	<vehicleType id="heavy40t">
+
+		<description>Heavy Vehicle 40t</description>
+		<capacity seats="1" standingRoomInPersons="0" other="33.0"/>
+		<length meter="15"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="22.22"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="126.58" costsPerMeter="6.9E-4" costsPerSecond="0.00559">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.00559</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.00559</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="4.0"/>
+		<networkMode networkMode="truck"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+</vehicleDefinitions>