Skip to content

Commit

Permalink
bump version to 6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rakow committed Sep 4, 2024
1 parent 0f10ab6 commit f9bdfbe
Show file tree
Hide file tree
Showing 17 changed files with 611 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


JAR := matsim-berlin-*.jar
V := v6.3
V := v6.4
CRS := EPSG:25832

p := input/$V
Expand Down
Binary file added input/v6.4/area/area.dbf
Binary file not shown.
13 changes: 13 additions & 0 deletions input/v6.4/area/area.poly
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
area
1
13.219000451630821 52.804645826658245
13.563415935578835 52.7636439833311
13.762958239770938 52.64337190957148
13.816260636096226 52.400094305830414
13.644052894122218 52.18278453619655
13.0713938156531 52.178684351863836
12.744745797146848 52.345425181394226
12.983923216555192 52.79644545799282
13.219000451630821 52.804645826658245
END
END
1 change: 1 addition & 0 deletions input/v6.4/area/area.prj
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
Binary file added input/v6.4/area/area.shp
Binary file not shown.
Binary file added input/v6.4/area/area.shx
Binary file not shown.
209 changes: 209 additions & 0 deletions input/v6.4/berlin-v6.4-vehicleTypes.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<?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"/>
<passengerCarEquivalents pce="1.0"/>
</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"/>
</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"/>
<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"/>
<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>
Loading

0 comments on commit f9bdfbe

Please sign in to comment.