clean up and refactor half-baked development commits and squash them into a new version.
Changes: * support for multiple GTFS feeds as input in filtering, read default global and local configuration files * be a bit more memory conservative * make caching optional * dont delete orphan edge if it would transform a degree 3 node with a possible full turn into a degree 2 node eligible for contraction * dedicated filters for funicular and gondola * make max snap level option more intuitive * allow filter rules for level 0 * additional fallback for station snapping * dont try to route for MOT unequal to trip in -T mode, force-snap to orphaned OSM station if not snap was possible * write bounds to filtered osm * remove unused surrounding heuristic * use bus lanes info * be a bit more tolerant for bus oneway streets * create missing directories * error if no cfg is present, clean up evaluation Makefile
This commit is contained in:
Patrick Brosi
parent
2cc2d2dc23
commit
63f0b61ea1
60 changed files with 4532 additions and 1576 deletions
150
eval/Makefile
150
eval/Makefile
|
|
@ -7,111 +7,127 @@ lighteval: vitoria.lighteval stuttgart.lighteval paris.lighteval switzerland.lig
|
|||
eval: vitoria.eval stuttgart.eval paris.eval switzerland.eval
|
||||
|
||||
clean:
|
||||
rm -f *.eval
|
||||
rm -rf gtfs
|
||||
rf -rf osm
|
||||
rm -rf evalout
|
||||
@rm -f *.eval
|
||||
@rm -rf gtfs
|
||||
@rm -rf osm
|
||||
@rm -rf evalout
|
||||
|
||||
osmconvert:
|
||||
wget -O - http://m.m.i24.cc/osmconvert.c | cc -x c - -lz -O3 -o osmconvert
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Fetching osmconvert..."
|
||||
@curl http://m.m.i24.cc/osmconvert.c | cc -x c - -lz -O3 -o osmconvert
|
||||
|
||||
%.lighteval: osm/%.osm gtfs/%/stops.txt gtfs/%/stop_times.txt gtfs/%/trips.txt gtfs/%/routes.txt eval.cfg
|
||||
mkdir -p gtfs/$*/shaped
|
||||
rm -f gtfs/$*/shaped/*
|
||||
../build/pfaedle -x $< -i gtfs/$* -c eval.cfg -o gtfs/$*/shaped -D -m all 2>&1 | tee $@
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Running light (without stats) evaluation for '"$*"'..."
|
||||
@mkdir -p gtfs/$*/shaped
|
||||
@rm -f gtfs/$*/shaped/*
|
||||
@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg -o gtfs/$*/shaped -D -m all 2>&1 | tee $@
|
||||
|
||||
%.eval: osm/%.osm gtfs/%/stops.txt gtfs/%/stop_times.txt gtfs/%/trips.txt gtfs/%/routes.txt eval.cfg eval-wo-osm-line-rels.cfg
|
||||
mkdir -p gtfs/$*/shaped
|
||||
rm -f gtfs/$*/shaped/*
|
||||
mkdir -p evalout/
|
||||
mkdir -p evalout/$*/
|
||||
mkdir -p evalout/$*/hmm+osm
|
||||
../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --eval-path evalout/$*/hmm+osm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
find evalout/$*/hmm+osm/ -name "*.json" -print0 | xargs -0 rm
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Running evaluation for '"$*"'..."
|
||||
@mkdir -p gtfs/$*/shaped
|
||||
@rm -f gtfs/$*/shaped/*
|
||||
@mkdir -p evalout/
|
||||
@mkdir -p evalout/$*/
|
||||
@mkdir -p evalout/$*/hmm+osm
|
||||
@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --eval-path evalout/$*/hmm+osm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
@find evalout/$*/hmm+osm/ -name "*.json" -print0 | xargs -0 rm
|
||||
|
||||
mkdir -p evalout/$*/greedy
|
||||
../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --method greedy --eval-path evalout/$*/greedy -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
find evalout/$*/greedy/ -name "*.json" -print0 | xargs -0 rm
|
||||
@mkdir -p evalout/$*/greedy
|
||||
@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --method greedy --eval-path evalout/$*/greedy -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
@find evalout/$*/greedy/ -name "*.json" -print0 | xargs -0 rm
|
||||
|
||||
mkdir -p evalout/$*/greedy2
|
||||
../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --method greedy2 --eval-path evalout/$*/greedy2 -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
find evalout/$*/greedy2/ -name "*.json" -print0 | xargs -0 rm
|
||||
@mkdir -p evalout/$*/greedy2
|
||||
@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --method greedy2 --eval-path evalout/$*/greedy2 -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
@find evalout/$*/greedy2/ -name "*.json" -print0 | xargs -0 rm
|
||||
|
||||
mkdir -p evalout/$*/hmm
|
||||
../build/pfaedle -x $< -i gtfs/$* -c eval-wo-osm-line-rels.cfg --eval-path evalout/$*/hmm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
find evalout/$*/hmm/ -name "*.json" -print0 | xargs -0 rm
|
||||
@mkdir -p evalout/$*/hmm
|
||||
@../build/pfaedle -x $< -i gtfs/$* -c eval-wo-osm-line-rels.cfg --eval-path evalout/$*/hmm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
|
||||
@find evalout/$*/hmm/ -name "*.json" -print0 | xargs -0 rm
|
||||
|
||||
osm/spain-latest.osm.pbf:
|
||||
mkdir -p osm
|
||||
wget http://download.geofabrik.de/europe/spain-latest.osm.pbf -O $@
|
||||
@mkdir -p osm
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for Spain..."
|
||||
@curl --progress-bar http://download.geofabrik.de/europe/spain-latest.osm.pbf > $@
|
||||
|
||||
osm/spain-latest.osm: osm/spain-latest.osm.pbf osmconvert
|
||||
@# pre-filter to vitoria gasteiz
|
||||
osmconvert -b=-2.8661,42.7480,-2.4788,43.0237 $< > $@
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Pre-filtering OSM data to Vitoria-Gasteiz..."
|
||||
@osmconvert -b=-2.8661,42.7480,-2.4788,43.0237 $< > $@
|
||||
|
||||
osm/baden-wuerttemberg-latest.osm.pbf:
|
||||
mkdir -p osm
|
||||
wget http://download.geofabrik.de/europe/germany/baden-wuerttemberg-latest.osm.pbf -O $@
|
||||
@mkdir -p osm
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for Baden-Württemberg..."
|
||||
@curl --progress-bar http://download.geofabrik.de/europe/germany/baden-wuerttemberg-latest.osm.pbf > $@
|
||||
|
||||
osm/baden-wuerttemberg-latest.osm: osm/baden-wuerttemberg-latest.osm.pbf osmconvert
|
||||
osmconvert $< > $@
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Extracting OSM data..."
|
||||
@osmconvert $< > $@
|
||||
|
||||
osm/france-latest.osm.pbf:
|
||||
mkdir -p osm
|
||||
wget http://download.geofabrik.de/europe/france-latest.osm.pbf -O $@
|
||||
@mkdir -p osm
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for France..."
|
||||
@curl --progress-bar http://download.geofabrik.de/europe/france-latest.osm.pbf > $@
|
||||
|
||||
osm/paris-latest.osm: osm/france-latest.osm.pbf osmconvert
|
||||
@# pre-filter to greater ile de france
|
||||
osmconvert -b=0.374,47.651,4.241,50.261 $< > $@
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Pre-filtering OSM data to Île-de-France..."
|
||||
@osmconvert -b=0.374,47.651,4.241,50.261 $< > $@
|
||||
|
||||
osm/europe-latest.osm.pbf:
|
||||
mkdir -p osm
|
||||
wget http://download.geofabrik.de/europe-latest.osm.pbf -O $@
|
||||
@mkdir -p osm
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for Europe..."
|
||||
@curl --progress-bar http://download.geofabrik.de/europe-latest.osm.pbf > $@
|
||||
|
||||
osm/switzerland-latest.osm: osm/europe-latest.osm.pbf osmconvert
|
||||
@# pre-filter to greater switzerland
|
||||
osmconvert -b=3.757,44.245,15.579,52.670 $< > $@
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Pre-filtering OSM data to Switzerland..."
|
||||
@osmconvert -b=3.757,44.245,15.579,52.670 $< > $@
|
||||
|
||||
gtfs/vitoria/%.txt:
|
||||
mkdir -p gtfs
|
||||
mkdir -p gtfs/vitoria
|
||||
wget https://transitfeeds.com/p/tuvisa-euskotran/239/latest/download -O gtfs/vitoria/gtfs.zip
|
||||
cd gtfs/vitoria && unzip -o gtfs.zip
|
||||
rm gtfs/vitoria/gtfs.zip
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Vitoria-Gasteiz..."
|
||||
@mkdir -p gtfs
|
||||
@mkdir -p gtfs/vitoria
|
||||
@curl --progress-bar https://transitfeeds.com/p/tuvisa-euskotran/239/latest/download > gtfs/vitoria/gtfs.zip
|
||||
@cd gtfs/vitoria && unzip -qq -o gtfs.zip
|
||||
@rm gtfs/vitoria/gtfs.zip
|
||||
|
||||
gtfs/stuttgart/%.txt:
|
||||
mkdir -p gtfs
|
||||
mkdir -p gtfs/stuttgart
|
||||
echo "******************************************************************"
|
||||
echo "* A password is required to access the VVS dataset. Send a mail *"
|
||||
echo "* to brosi@cs.informatik.uni-freiburg.de to receive the password. "
|
||||
echo "******************************************************************"
|
||||
wget http://www.vvs.de/download/opendata/VVS_GTFS.zip --ask-password --user vvsopendata01 -O gtfs/stuttgart/gtfs.zip
|
||||
cd gtfs/stuttgart && unzip -o gtfs.zip
|
||||
rm gtfs/stuttgart/gtfs.zip
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Stuttgart..."
|
||||
@mkdir -p gtfs
|
||||
@mkdir -p gtfs/stuttgart
|
||||
@echo "******************************************************************"
|
||||
@echo "* A password is required to access the VVS dataset. Send a mail *"
|
||||
@echo "* to brosi@cs.informatik.uni-freiburg.de to receive the password. "
|
||||
@echo "******************************************************************"
|
||||
@curl --progress-bar http://www.vvs.de/download/opendata/VVS_GTFS.zip -su vvsopendata01 > gtfs/stuttgart/gtfs.zip
|
||||
@cd gtfs/stuttgart && unzip -qq -o gtfs.zip
|
||||
@rm gtfs/stuttgart/gtfs.zip
|
||||
|
||||
gtfs/paris/%.txt:
|
||||
mkdir -p gtfs
|
||||
mkdir -p gtfs/paris
|
||||
wget https://transitfeeds.com/p/stif/822/latest/download -O gtfs/paris/gtfs.zip
|
||||
cd gtfs/paris && unzip -o gtfs.zip
|
||||
rm gtfs/paris/gtfs.zip
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Paris..."
|
||||
@mkdir -p gtfs
|
||||
@mkdir -p gtfs/paris
|
||||
@curl --progress-bar https://transitfeeds.com/p/stif/822/latest/download > gtfs/paris/gtfs.zip
|
||||
@cd gtfs/paris && unzip -qq -o gtfs.zip
|
||||
@rm gtfs/paris/gtfs.zip
|
||||
|
||||
gtfs/switzerland/%.txt:
|
||||
mkdir -p gtfs
|
||||
mkdir -p gtfs/switzerland
|
||||
wget http://gtfs.geops.ch/dl/gtfs_complete.zip -O gtfs/switzerland/gtfs.zip
|
||||
cd gtfs/switzerland && unzip -o gtfs.zip
|
||||
rm gtfs/switzerland/gtfs.zip
|
||||
@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Switzerland..."
|
||||
@mkdir -p gtfs
|
||||
@mkdir -p gtfs/switzerland
|
||||
@curl --progress-bar http://gtfs.geops.ch/dl/gtfs_complete.zip > gtfs/switzerland/gtfs.zip
|
||||
@cd gtfs/switzerland && unzip -qq -o gtfs.zip
|
||||
@rm gtfs/switzerland/gtfs.zip
|
||||
|
||||
osm/vitoria.osm: osm/spain-latest.osm gtfs/vitoria/stops.txt eval.cfg
|
||||
../build/pfaedle -x $< -i gtfs/vitoria/ -c eval.cfg -m all -X $@
|
||||
|
||||
osm/stuttgart.osm: osm/baden-wuerttemberg-latest.osm gtfs/stuttgart/stops.txt eval.cfg
|
||||
../build/pfaedle -x $< -i gtfs/stuttgart/ -c eval.cfg -m all -X $@
|
||||
osm/vitoria.osm: osm/spain-latest.osm gtfs/vitoria/stops.txt gtfs/vitoria/trips.txt gtfs/vitoria/routes.txt gtfs/vitoria/stop_times.txt eval.cfg
|
||||
@../build/pfaedle -x $< -i gtfs/vitoria/ -c eval.cfg -m all -X $@
|
||||
|
||||
osm/paris.osm: osm/paris-latest.osm gtfs/paris/stops.txt eval.cfg
|
||||
../build/pfaedle -x $< -i gtfs/paris/ -c eval.cfg -m all -X $@
|
||||
osm/stuttgart.osm: osm/baden-wuerttemberg-latest.osm gtfs/stuttgart/stops.txt gtfs/stuttgart/trips.txt gtfs/stuttgart/routes.txt gtfs/stuttgart/stop_times.txt eval.cfg
|
||||
@../build/pfaedle -x $< -i gtfs/stuttgart/ -c eval.cfg -m all -X $@
|
||||
|
||||
osm/paris.osm: osm/paris-latest.osm gtfs/paris/stops.txt gtfs/paris/trips.txt gtfs/paris/routes.txt gtfs/paris/stop_times.txt eval.cfg
|
||||
@../build/pfaedle -x $< -i gtfs/paris/ -c eval.cfg -m all -X $@
|
||||
|
||||
osm/switzerland.osm: osm/switzerland-latest.osm gtfs/switzerland/stops.txt eval.cfg
|
||||
../build/pfaedle -x $< -i gtfs/switzerland/ -c eval.cfg -m all -X $@
|
||||
@../build/pfaedle -x $< -i gtfs/switzerland/ -c eval.cfg -m all -X $@
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue