diff --git a/input/v6.4/berlin-v6.4-vehicleTypes.xml b/input/v6.4/berlin-v6.4-vehicleTypes.xml index b059f7d0..6ba91826 100644 --- a/input/v6.4/berlin-v6.4-vehicleTypes.xml +++ b/input/v6.4/berlin-v6.4-vehicleTypes.xml @@ -24,9 +24,9 @@ - - - + + + diff --git a/input/v6.4/berlin-v6.4.config.xml b/input/v6.4/berlin-v6.4.config.xml index 12139510..5ee64f7b 100644 --- a/input/v6.4/berlin-v6.4.config.xml +++ b/input/v6.4/berlin-v6.4.config.xml @@ -80,11 +80,12 @@ --> + + - diff --git a/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java b/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java index 1a45714f..935144a6 100644 --- a/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java +++ b/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java @@ -94,6 +94,8 @@ private void matchWithNetwork(Path network) throws TransformException, IOExcepti manager.addLinkFilter(l -> !l.getId().toString().startsWith("pt_")); manager.addLinkFilter(l -> !NetworkUtils.getHighwayType(l).equals("service")); manager.addLinkFilter(l -> !NetworkUtils.getHighwayType(l).equals("living_street")); + manager.addLinkFilter(l -> !NetworkUtils.getHighwayType(l).equals("path")); + manager.addLinkFilter(l -> !NetworkUtils.getHighwayType(l).equals("cycleway")); net = manager.applyFilters(); } diff --git a/src/main/python/extract_bike_speeds.py b/src/main/python/extract_bike_speeds.py new file mode 100644 index 00000000..928f60cd --- /dev/null +++ b/src/main/python/extract_bike_speeds.py @@ -0,0 +1,31 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import numpy as np +import os +from matsim.scenariogen.data import EconomicStatus, TripMode, preparation, run_create_ref_data + + +from extract_ref_data import trip_filter + +def person_filter(df): + df = df[df.reporting_day <= 4] + df = df[df.location == "Berlin"] + + return df + +if __name__ == "__main__": + d = os.path.expanduser("~/Development/matsim-scenarios/shared-svn/projects/matsim-berlin/data/SrV/") + + result = run_create_ref_data.create( + d + "Berlin+Umland", + person_filter, trip_filter, + run_create_ref_data.InvalidHandling.REMOVE_TRIPS, + ) + + t = result.trips + + t["speed"] = (t.gis_length * 3600) / (t.duration * 60) + t = t[t.main_mode == TripMode.BIKE] + + t.to_csv('bike_speeds.csv', columns=["t_weight", "age", "speed"], index=False) \ No newline at end of file