diff --git a/input/v6.4/berlin-v6.4-vehicleTypes.xml b/input/v6.4/berlin-v6.4-vehicleTypes.xml index 58d497c3..b059f7d0 100644 --- a/input/v6.4/berlin-v6.4-vehicleTypes.xml +++ b/input/v6.4/berlin-v6.4-vehicleTypes.xml @@ -22,8 +22,11 @@ - - + + + + + diff --git a/src/main/python/extract_ref_data.py b/src/main/python/extract_ref_data.py index c4adc04a..a32720c5 100644 --- a/src/main/python/extract_ref_data.py +++ b/src/main/python/extract_ref_data.py @@ -43,4 +43,16 @@ def trip_filter(df): print(result.share) - print(result.groups) \ No newline at end of file + print(result.groups) + + t = result.trips + + # Weighted mean + wm = lambda x: np.average(x, weights=t.loc[x.index, "t_weight"]) + + t["speed"] = (t.gis_length * 3600) / (t.duration * 60) + + aggr = t.groupby("main_mode").agg(kmh=("speed", wm)) + + print("Avg speeds. per mode") + print(aggr) \ No newline at end of file