From 751c6fc56b563b51a0efbc39276bf782dcf09d7a Mon Sep 17 00:00:00 2001 From: tchervec Date: Thu, 21 Nov 2019 01:26:17 +0100 Subject: [PATCH 1/3] upgrade to pt2matsim v19.10 and add config element to specify hafas date to build transit schedule --- matsim/java/pt2matsim.py | 4 ++-- matsim/network/convert_hafas.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/matsim/java/pt2matsim.py b/matsim/java/pt2matsim.py index eabfe3e..ab7056d 100644 --- a/matsim/java/pt2matsim.py +++ b/matsim/java/pt2matsim.py @@ -16,14 +16,14 @@ def execute(context): ], cwd = context.cache_path) sp.check_call([ - "git", "checkout", "v19.5" + "git", "checkout", "v19.10" ], cwd = "%s/pt2matsim" % context.cache_path) sp.check_call([ "mvn", "-Djava.io.tmpdir=%s/java_tmp" % context.cache_path, "package" ], cwd = "%s/pt2matsim" % context.cache_path) - jar = "%s/pt2matsim/target/pt2matsim-19.5-shaded.jar" % context.cache_path + jar = "%s/pt2matsim/target/pt2matsim-19.10-shaded.jar" % context.cache_path java(jar, "org.matsim.pt2matsim.run.CreateDefaultOsmConfig", ["test_config.xml"], cwd = context.cache_path) assert(os.path.exists("%s/test_config.xml" % context.cache_path)) diff --git a/matsim/network/convert_hafas.py b/matsim/network/convert_hafas.py index ea8831c..8c1cb56 100644 --- a/matsim/network/convert_hafas.py +++ b/matsim/network/convert_hafas.py @@ -15,7 +15,8 @@ def execute(context): java(jar, "org.matsim.pt2matsim.run.Hafas2TransitSchedule", [ "%s/hafas" % context.config["raw_data_path"], "EPSG:2056", "%s/transit_schedule.xml.gz" % context.cache_path, - "%s/transit_vehicles.xml.gz" % context.cache_path + "%s/transit_vehicles.xml.gz" % context.cache_path, + context.config["hafas_date"] ], cwd = context.cache_path) assert(os.path.exists("%s/transit_schedule.xml.gz" % context.cache_path)) -- GitLab From e70c9e6e58243a649ed6490463daa49a87a38f55 Mon Sep 17 00:00:00 2001 From: tchervec Date: Thu, 21 Nov 2019 01:34:52 +0100 Subject: [PATCH 2/3] fix hafas date in gitlab config to be within valid range --- config_gitlab.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config_gitlab.yml b/config_gitlab.yml index 9b28ff0..0cfe728 100644 --- a/config_gitlab.yml +++ b/config_gitlab.yml @@ -9,6 +9,7 @@ input_downsampling: 0.01 enable_scaling: true scaling_year: 2045 use_freight: true +hafas_date: 01.10.2018 stages: - matsim.run - matsim.mz.population -- GitLab From 68a5e90239300659e6b2b0a90bb11eb82e776abf Mon Sep 17 00:00:00 2001 From: tchervec Date: Thu, 21 Nov 2019 01:36:38 +0100 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0785e0..ad8fb77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ **Version v2 (master)** +- Upgraded to new pt2matsim version to allow selecting of HAFAS date - Fix Java /tmp bug in shared environments (IVT servers) - Make possible to run pipeline in VM, add instructions - Added ÖV Güteklasse for home locations -- GitLab