Merge branch 'main' into tud

.github/workflows/build.yaml

@@ -103,4 +103,4 @@ jobs:
           path: staging
 
     env:
-      MAVEN_OPTS: -Xmx10G
+      MAVEN_OPTS: -Xmx512m

.github/workflows/publish.yaml

@@ -10,11 +10,13 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           java-version: 17
+          architecture: x64
+          distribution: adopt
 
       - name: Publish package
         run: mvn --batch-mode deploy
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     env:
-      MAVEN_OPTS: -Xmx10G
+      MAVEN_OPTS: -Xmx512m

.gitignore

@@ -1,5 +1,11 @@
 # Add own ignores on top, don't edit the template
 
+input/*stops.xml
+input/*stops.csv
+*.Rhistory
+*.RProj
+
+
 
 
 # Common files to ignore when working with matsim

CITATION.cff

@@ -0,0 +1,24 @@
+cff-version: 1.2.0
+title: MATSim Open Leipzig Scenario
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Christian
+    family-names: Rakow
+    email: [email protected]
+    affiliation: Technische Universität Berlin
+    orcid: 'https://orcid.org/0000-0003-3760-2243'
+  - given-names: Gregor
+    family-names: Rybczak
+    affiliation: Technische Universität Berlin
+  - given-names: Simon
+    family-names: Meinhardt
+    affiliation: Technische Universität Berlin
+
+url: "https://github.com/matsim-scenarios/matsim-leipzig"
+date-released: 2023-12-11
+year: 2023
+version: 1.3
+license: GPL-2.0

Makefile

@@ -9,7 +9,7 @@ osmosis := osmosis/bin/osmosis
 
 NETWORK := germany-220327.osm.pbf
 germany := ../shared-svn/projects/matsim-germany
-shared := ../shared-svn/projects/NaMAV
+shared ?= ../shared-svn/projects/NaMAV
 
 .PHONY: prepare
 
@@ -70,13 +70,13 @@ input/sumo.net.xml: input/network.osm
 
 
 input/$V/leipzig-$V-network.xml.gz: input/sumo.net.xml
-	$(sc) prepare network-from-sumo $< --output $@
+	$(sc) prepare network-from-sumo $< --output $@ --free-speed-factor 0.75
 	$(sc) prepare fix-network $@ --output $@
 	$(sc) prepare clean-network $@ --output $@ --modes bike
 
 input/$V/leipzig-$V-network-with-pt.xml.gz: input/$V/leipzig-$V-network.xml.gz input/gtfs-lvb.zip
 	$(sc) prepare transit-from-gtfs --network $< $(filter-out $<,$^)\
-	 --name leipzig-$V --date "2019-06-05" --target-crs $(CRS)\
+	 --name leipzig-$V --date "2023-04-19" --target-crs $(CRS)\
 	 --output input/$V
 
 	$(sc) prepare prepare-transit-schedule\
@@ -90,35 +90,36 @@ input/plans-longHaulFreight.xml.gz: input/$V/leipzig-$V-network.xml.gz
 	 --input-crs $(CRS)\
 	 --target-crs $(CRS)\
 	 --shp ../shared-svn/projects/NaMAV/data/shapefiles/freight-area/freight-area.shp\
+	 --cut-on-boundary\
 	 --output $@
 
-input/plans-commercialTraffic.xml.gz:
+input/plans-completeSmallScaleCommercialTraffic.xml.gz:
 	$(sc) prepare generate-small-scale-commercial-traffic\
 	  input/commercialTraffic\
 	 --sample 0.25\
 	 --jspritIterations 1\
 	 --creationOption createNewCarrierFile\
 	 --landuseConfiguration useOSMBuildingsAndLanduse\
-	 --trafficType commercialTraffic\
+	 --smallScaleCommercialTrafficType completeSmallScaleCommercialTraffic\
 	 --zoneShapeFileName $(shared)/data/input-commercialTraffic/leipzig_zones_25832.shp\
 	 --buildingsShapeFileName $(shared)/data/input-commercialTraffic/leipzig_buildings_25832.shp\
 	 --landuseShapeFileName $(shared)/data/input-commercialTraffic/leipzig_landuse_25832.shp\
 	 --shapeCRS "EPSG:25832"\
 	 --resistanceFactor "0.005"\
 	 --nameOutputPopulation $(notdir $@)\
-	 --PathOutput output/commercialTraffic
+	 --pathOutput output/commercialTraffic
 
 	mv output/commercialTraffic/$(notdir $@) $@
 
-input/$V/leipzig-$V-25pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz input/plans-commercialTraffic.xml.gz
+input/$V/leipzig-$V-25pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.gz input/plans-completeSmallScaleCommercialTraffic.xml.gz
 	$(sc) prepare trajectory-to-plans\
 	 --name prepare --sample-size 0.25\
 	 --max-typical-duration 0\
 	 --output input/\
 	 --population $(shared)/matsim-input-files/senozon/20210520_leipzig/population.xml.gz\
 	 --attributes $(shared)/matsim-input-files/senozon/20210520_leipzig/personAttributes.xml.gz
 
-	$(sc) prepare population input/prepare-25pct.plans.xml.gz\
+	$(sc) prepare population input/prepare-25pct.plans.xml.gz --phase pre\
  	 --shp $(shared)/matsim-input-files/senozon/20210520_leipzig/dilutionArea.shp --shp-crs $(CRS)\
 	 --output input/prepare-25pct.plans.xml.gz
 
@@ -143,11 +144,16 @@ input/$V/leipzig-$V-25pct.plans-initial.xml.gz: input/plans-longHaulFreight.xml.
 
 	$(sc) prepare split-activity-types-duration\
 		--input input/prepare-25pct.plans-with-trips.xml.gz\
+		--exclude commercial_start,commercial_end,freight_start,freight_end\
 		--output $@
 
-	$(sc) prepare fix-subtour-modes --input $@ --coord-dist 100 --output $@
+	$(sc) prepare merge-populations $@ $^ --output $@
 
-	$(sc) prepare merge-populations $@ $< --output $@
+	$(sc) prepare population $@ --phase post\
+ 	 --shp $(shared)/matsim-input-files/senozon/20210520_leipzig/dilutionArea.shp --shp-crs $(CRS)\
+	 --output $@
+
+	$(sc) prepare fix-subtour-modes --input $@ --coord-dist 100 --output $@
 
 	$(sc) prepare extract-home-coordinates $@ --csv input/$V/leipzig-$V-homes.csv
 
@@ -166,8 +172,8 @@ check: input/$V/leipzig-$V-25pct.plans-initial.xml.gz
 	$(sc) analysis check-population $<\
  	 --input-crs $(CRS)\
  	 --attribute carAvail\
- 	 --shp ../shared-svn/projects/NaMAV/data/leipzig-utm32n/leipzig-utm32n.shp\
+ 	 --shp ../shared-svn/projects/NaMAV/data/shapefiles/leipzig-utm32n/leipzig-utm32n.shp\
 
 # Aggregated target
 prepare: input/$V/leipzig-$V-25pct.plans-initial.xml.gz input/$V/leipzig-$V-network-with-pt.xml.gz
-	echo "Done"
+	echo "Done"

README.md

@@ -1,6 +1,6 @@
 # The MATSim Open Leipzig Scenario
 
-![Build Status](https://github.com/matsim-scenarios/matsim-leipzig/workflows/build/badge.svg?branch=main)
+[![Build Status](https://github.com/matsim-scenarios/matsim-leipzig/actions/workflows/build.yaml/badge.svg)](https://github.com/matsim-scenarios/matsim-leipzig/actions/workflows/build.yaml)
 ![license](https://img.shields.io/github/license/matsim-scenarios/matsim-leipzig.svg)
 ![JDK](https://img.shields.io/badge/JDK-17+-green.svg)
 

input/v1.2/drtServiceArea/leipzig_flexa_service_area_2021.cpg

@@ -0,0 +1 @@
+UTF-8

input/v1.2/drtServiceArea/leipzig_flexa_service_area_2021.prj

@@ -0,0 +1 @@
+PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]