From 87291eb556c96ec4fa4bd65d30c65cdaece1b16a Mon Sep 17 00:00:00 2001 From: rakow Date: Wed, 13 Dec 2023 17:21:04 +0100 Subject: [PATCH] add 6.1 config and vehicle types --- Makefile | 8 +- input/v6.1/berlin-v6.1-vehicleTypes.xml | 197 +++++++++++++++++ input/v6.1/berlin-v6.1.config.xml | 201 ++++++++++++++++++ .../investigationAreaData.csv | 4 +- pom.xml | 4 +- .../prepare/RunOpenBerlinCalibration.java | 2 +- 6 files changed, 406 insertions(+), 10 deletions(-) create mode 100644 input/v6.1/berlin-v6.1-vehicleTypes.xml create mode 100644 input/v6.1/berlin-v6.1.config.xml rename input/{commercialTraffic => v6.1}/investigationAreaData.csv (99%) diff --git a/Makefile b/Makefile index a65f4e75..f42e555f 100644 --- a/Makefile +++ b/Makefile @@ -199,15 +199,14 @@ $p/berlin-longHaulFreight-$V-25pct.plans.xml.gz: $p/berlin-$V-network.xml.gz --cut-on-boundary\ --output $@ -# TODO: commercial traffic needs to be updated, and network mode correctly mapped - -$p/berlin-small-scale-commercialTraffic-$V-25pct.plans.xml.gz: +$p/berlin-small-scale-commercialTraffic-$V-25pct.plans.xml.gz: $p/berlin-$V-network.xml.gz $(sc) prepare generate-small-scale-commercial-traffic\ - input/commercialTraffic/config_demand.xml\ + input/$V/berlin-$V.config.xml\ --sample 0.25\ --jspritIterations 1\ --creationOption createNewCarrierFile\ --landuseConfiguration useOSMBuildingsAndLanduse\ + --network $(notdir $<)\ --smallScaleCommercialTrafficType completeSmallScaleCommercialTraffic\ --zoneShapeFileName $(berlin)/input/shp/berlinBrandenburg_Zones_VKZ_4326.shp\ --buildingsShapeFileName $(berlin)/input/shp/buildings_BerlinBrandenburg_4326.shp\ @@ -221,7 +220,6 @@ $p/berlin-small-scale-commercialTraffic-$V-25pct.plans.xml.gz: mv output/commercialPersonTraffic/$(notdir $@) $@ - $p/berlin-cadyts-input-$V-25pct.plans.xml.gz: $p/berlin-initial-$V-25pct.plans.xml.gz $p/berlin-small-scale-commercialTraffic-$V-25pct.plans.xml.gz $(sc) prepare merge-populations $^\ --output $@ diff --git a/input/v6.1/berlin-v6.1-vehicleTypes.xml b/input/v6.1/berlin-v6.1-vehicleTypes.xml new file mode 100644 index 00000000..9a241cae --- /dev/null +++ b/input/v6.1/berlin-v6.1-vehicleTypes.xml @@ -0,0 +1,197 @@ + + + + + + + + + 1 + serial + 1 + + + + + + + + + 1 + serial + 1 + + + + + + + + + 1 + serial + 1 + + + + + + + + + + + + Golf 1.4 Trendline + + + + + + + PASSENGER_CAR + average + average + petrol (4S) + + + + + 0.0049 + 0.0049 + + + + + + + + + + VW Caddy 2.0 Maxi TDI + + + + + + + PASSENGER_CAR + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + + Mercedes 313 CDI + + + + + + + LIGHT_COMMERCIAL_VEHICLE + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + + Light Vehicle 7.5t + + + + + + + LIGHT_COMMERCIAL_VEHICLE + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + + Medium Vehicle 18t + + + + + + + HEAVY_GOODS_VEHICLE + average + average + diesel + + + + + 0.0049 + 0.0049 + + + + + + + + + Heavy Vehicle 40t + + + + + + + HEAVY_GOODS_VEHICLE + average + average + diesel + + + + + 0.00559 + 0.00559 + + + + + + + diff --git a/input/v6.1/berlin-v6.1.config.xml b/input/v6.1/berlin-v6.1.config.xml new file mode 100644 index 00000000..a7fbb600 --- /dev/null +++ b/input/v6.1/berlin-v6.1.config.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/input/commercialTraffic/investigationAreaData.csv b/input/v6.1/investigationAreaData.csv similarity index 99% rename from input/commercialTraffic/investigationAreaData.csv rename to input/v6.1/investigationAreaData.csv index ae5d0040..06a7917c 100644 --- a/input/commercialTraffic/investigationAreaData.csv +++ b/input/v6.1/investigationAreaData.csv @@ -1,3 +1,3 @@ -Area Inhabitants Employee Employee Primary Sector Employee Construction Employee Secondary Sector Rest Employee Retail Employee Traffic/Parcels Employee Tertiary Sector Rest -Berlin 3645000 2067600 900 90200 131100 215200 85300 1544900 +Area Inhabitants Employee Employee Primary Sector Employee Construction Employee Secondary Sector Rest Employee Retail Employee Traffic/Parcels Employee Tertiary Sector Rest +Berlin 3645000 2067600 900 90200 131100 215200 85300 1544900 Brandenburg 2531492 1120100 27400 96500 149900 136300 80900 629100 \ No newline at end of file diff --git a/pom.xml b/pom.xml index dd9c0ea8..b520686c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,10 +6,10 @@ matsim-all - 16.0-PR2990 + - + 16.0-SNAPSHOT 4.0.0 diff --git a/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java b/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java index 67ba103b..99595ab4 100644 --- a/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java +++ b/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java @@ -113,7 +113,7 @@ public class RunOpenBerlinCalibration extends MATSimApplication { private Integer planIndex; public RunOpenBerlinCalibration() { - super("input/v6.0/berlin-v6.0.config.xml"); + super("input/v6.1/berlin-v6.1.config.xml"); } /**