diff --git a/CHANGELOG.md b/CHANGELOG.md index fbba036de38170c0269780062fa7056e177e27c0..c53072578d18d5d4cdd741a40557044d65902381 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ **Version v2 (master)** +- Upgrade to new pt2matsim version to allow selecting of HAFAS date - Store STATPOP and MZ ids as agents attributes - Fix Java /tmp bug in shared environments (IVT servers) - Make possible to run pipeline in VM, add instructions diff --git a/config_gitlab.yml b/config_gitlab.yml index 9b28ff05304ed23cf32e2b5bbb0733e66dca95d0..0cfe728845e036098735a9c1b3b9784cc512d939 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 diff --git a/matsim/java/pt2matsim.py b/matsim/java/pt2matsim.py index eabfe3ef6e7e4b347e811668000ca7c7d1179e47..ab7056dbc7f9456f46cc160c03a344813a93fe72 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 ea8831cc18677bb0564dda9ed21cadd75cad84dd..8c1cb565c8a9abc4e385b6460b26ce0c3dbc3d16 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))