diff --git a/install_scenario_templates.py b/install_scenario_templates.py index c74b710..19bd801 100755 --- a/install_scenario_templates.py +++ b/install_scenario_templates.py @@ -254,7 +254,7 @@ def build_taz_etc(scenario_pre_dir, net_path): if os.path.isdir(shapes_dir): polyconvert = sumolib.checkBinary('polyconvert') idCol = dict([e.split(":") for e in options.shape_id_column.split(",")]) - for dbf in glob.glob(os.path.join(shapes_dir, "*.dbf")): + for dbf in sorted(glob.glob(os.path.join(shapes_dir, "*.dbf"))): prefix = os.path.basename(dbf)[:-4] tazFile = os.path.join(scenario_template_dir, "districts.taz.xml") if prefix in idCol: diff --git a/tests/tsc/pre_mitte/installTemplateDir_mitte/output.tsc b/tests/tsc/pre_mitte/installTemplateDir_mitte/output.tsc index 89169df..b6b1e3d 100644 --- a/tests/tsc/pre_mitte/installTemplateDir_mitte/output.tsc +++ b/tests/tsc/pre_mitte/installTemplateDir_mitte/output.tsc @@ -4,13 +4,13 @@ copying __init__.py copying ptVtypes.xml copying vtypes.xml starting to import osm ... -/home/micha/sumo/bin/netconvert -c pre_test/mitte_net/template_gen0.netccfg --output-file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_net.net.xml.gz --log /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/template_gen0.log --ptstop-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_stops.add.xml.gz --ptline-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_ptlines.xml.gz +/home/micha/sumo/bin/netconvert -c pre_test/mitte_net/template_gen0.netccfg --output-file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_net.net.xml.gz --log /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/template_gen0.log --ptstop-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_stops.add.xml.gz --ptline-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_ptlines.xml.gz Parsing types from 'pre_test/mitte_net/osm/berlin_net.typ.xml' ... done. Parsing nodes from osm-file 'pre_test/mitte_net/osm/osm_bbox.osm.xml' ... Found and substituted 92 osm nodes. -done (979ms). +done (966ms). Parsing edges from osm-file 'pre_test/mitte_net/osm/osm_bbox.osm.xml' ... -done (838ms). +done (853ms). Removing duplicate edges ... done. Adding new type 'cycleway.track|highway.primary' (first occurence for edge '4045243'). Adding new type 'cycleway.lane|highway.primary' (first occurence for edge '4068078'). @@ -29,7 +29,7 @@ Adding new type 'cycleway.track|highway.residential' (first occurence for edge ' Adding new type 'cycleway.lane|highway.pedestrian' (first occurence for edge '687804455'). Adding new type 'cycleway.lane|cycleway.track|highway.tertiary' (first occurence for edge '850240180'). Parsing relations from osm-file 'pre_test/mitte_net/osm/osm_bbox.osm.xml' ... -done (398ms). +done (396ms). Removed 1171 traffic lights before loading plain-XML Import done: 18196 nodes loaded. @@ -44,7 +44,7 @@ Processing public transport stops ... done (7ms). Removed 5 railway components (71 edges). Revising public transport stops based on pt lines ... -done (15ms). +done (16ms). Align pt stop id signs with corresponding edge id signs ... done (0ms). Removing sharp turn with radius 8.49 at the end of edge '104765080#16'. Removing sharp turn with radius 5.03 at the end of edge '106863633#5'. @@ -67,30 +67,30 @@ Added 15 edges to connect 12 buffer stops in both directions. Added 14 bidi-edges between 4 pairs of railway switches (count by length: 1:2 2:1 10:1) Added 0 bidi-edges for public transport stops and a total of 84 bidi-edges to ensure connectivity of stops (6 stops remain disconnected) DijkstraRouter answered 249 queries and explored 85.32 edges on average. -DijkstraRouter spent 0.00s answering queries (0.00ms on average). +DijkstraRouter spent 0.00s answering queries (0.01ms on average). Joining tram edges ... done (14ms). Joined 415 tram edges into roads. Joining junction clusters ... -done (25ms). +done (24ms). Joined 160 junction cluster(s). -Removing empty nodes and geometry nodes ... done (73ms). +Removing empty nodes and geometry nodes ... done (66ms). 15667 nodes removed. -Moving network to origin ... done (40ms). +Moving network to origin ... done (38ms). Computing turning directions ... -done (2ms). -Assigning nodes to traffic lights ... done (14ms). +done (3ms). +Assigning nodes to traffic lights ... done (13ms). Guessing and setting on-/off-ramps ... done (3ms). Removing sharp turn with radius 4.70 at the end of edge '171851825#7'. Removing sharp turn with radius 8.80 at the end of edge '24864947#0'. Removing sharp turn with radius 3.57 at the start of edge '4685666#11'. -Sorting nodes' edges ... done (3ms). +Sorting nodes' edges ... done (2ms). Computing node shapes ... -done (54ms). +done (60ms). Computing edge shapes ... done (27ms). Computing node types ... -done (2ms). -Computing priorities ... done (2ms). +done (1ms). +Computing priorities ... done (3ms). Computing approached edges ... done (2ms). Guessing and setting roundabouts ... Guessed 3 roundabout(s). @@ -100,11 +100,11 @@ Dividing of lanes on approached lanes ... done (8ms). Processing turnarounds ... done (2ms). Rechecking of lane endings ... done (2ms). -Joining traffic light nodes ... done (1ms). +Joining traffic light nodes ... done (2ms). Computing traffic light control information ... done (2ms). -Computing node logics ... done (29ms). +Computing node logics ... done (30ms). Computing traffic light logics ... -done (15ms). +done (16ms). 133 traffic light(s) computed. Added 7 stops for superposed rail edges. Find accesses for pt rail stops ... done (31ms). @@ -125,18 +125,18 @@ Summary: Applied offset : -389385.39,-5817703.98 Converted boundary : 0.00,0.00,8608.99,5009.41 ----------------------------------------------------- -Writing network ... done (311ms). +Writing network ... done (309ms). Success. -/home/micha/sumo/bin/netconvert -c pre_test/mitte_net/template_gen1.netccfg --output-file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/1_net.net.xml.gz --log /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/template_gen1.log --ptstop-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/1_stops.add.xml.gz --ptline-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/1_ptlines.xml.gz --sumo-net-file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_net.net.xml.gz --ptstop-files /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_stops.add.xml.gz --ptline-files /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_ptlines.xml.gz -Parsing sumo-net from '/home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_net.net.xml.gz' ... done (211ms). +/home/micha/sumo/bin/netconvert -c pre_test/mitte_net/template_gen1.netccfg --output-file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/1_net.net.xml.gz --log /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/template_gen1.log --ptstop-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/1_stops.add.xml.gz --ptline-output /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/1_ptlines.xml.gz --sumo-net-file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_net.net.xml.gz --ptstop-files /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_stops.add.xml.gz --ptline-files /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_ptlines.xml.gz +Parsing sumo-net from '/home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_net.net.xml.gz' ... done (216ms). Parsing nodes from 'pre_test/mitte_net/netpatch/patch.nod.xml' ... done. Parsing edges from 'pre_test/mitte_net/netpatch/patch.edg.xml' ... done. Parsing edges from 'pre_test/mitte_net/netpatch/patch_tram.edg.xml' ... done. Parsing connections from 'pre_test/mitte_net/netpatch/patch.con.xml' ... done. Parsing connections from 'pre_test/mitte_net/netpatch/patch_tram.con.xml' ... done. Parsing traffic lights from 'pre_test/mitte_net/netpatch/patch.tll.xml' ... done. -Parsing public transport stops from '/home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_stops.add.xml.gz' ... done. -Parsing public transport lines from '/home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_ptlines.xml.gz' ... done. +Parsing public transport stops from '/home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_stops.add.xml.gz' ... done. +Parsing public transport lines from '/home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/tmp_output/0_ptlines.xml.gz' ... done. Import done: 1970 nodes loaded. 52 types loaded. @@ -150,12 +150,12 @@ Removing empty nodes ... done (3ms). Computing turning directions ... done (2ms). Assigning nodes to traffic lights ... done (0ms). -Sorting nodes' edges ... done (2ms). +Sorting nodes' edges ... done (3ms). Computing node shapes ... -done (53ms). +done (51ms). Computing edge shapes ... done (25ms). Computing node types ... done (0ms). -Computing priorities ... done (2ms). +Computing priorities ... done (3ms). Computing approached edges ... done (0ms). Guessing and setting roundabouts ... done (1ms). Computing approaching lanes ... done (0ms). @@ -163,8 +163,8 @@ Dividing of lanes on approached lanes ... done (4ms). Processing turnarounds ... done (0ms). Rechecking of lane endings ... done (1ms). -Computing traffic light control information ... done (1ms). -Computing node logics ... done (29ms). +Computing traffic light control information ... done (0ms). +Computing node logics ... done (28ms). Computing traffic light logics ... done (0ms). 133 traffic light(s) computed. Find accesses for pt rail stops ... done (31ms). @@ -186,33 +186,33 @@ Summary: Writing network ... done (311ms). Success. importing taxi stops from pre_test/mitte_net/osm/osm_bbox.osm.xml -calling generateBidiDistricts.main /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/net.net.xml.gz, /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/bidi.taz.xml +calling generateBidiDistricts.main /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/net.net.xml.gz, /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/bidi.taz.xml calling gtfs2pt -function import_gtfs called at Sat, 10 Dec 2022 22:11:44 +0000 -function import_gtfs finished after 10.901850 seconds -function filter_gtfs called at Sat, 10 Dec 2022 22:11:55 +0000 -function filter_gtfs finished after 4.500830 seconds -function import_osm called at Sat, 10 Dec 2022 22:12:00 +0000 +function import_gtfs called at Sun, 11 Dec 2022 14:57:32 +0000 +function import_gtfs finished after 10.679286 seconds +function filter_gtfs called at Sun, 11 Dec 2022 14:57:42 +0000 +function filter_gtfs finished after 4.690995 seconds +function import_osm called at Sun, 11 Dec 2022 14:57:47 +0000 Reading up to time step: 0.00 Reading up to time step: 200.00 Success. -189 of 203 routes have been imported, see '/home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/repair_errors.txt' for more information. -function import_osm finished after 0.246234 seconds -function map_gtfs_osm called at Sat, 10 Dec 2022 22:12:00 +0000 -function map_gtfs_osm finished after 18.820104 seconds +189 of 203 routes have been imported, see '/home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/repair_errors.txt' for more information. +function import_osm finished after 0.279567 seconds +function map_gtfs_osm called at Sun, 11 Dec 2022 14:57:47 +0000 +function map_gtfs_osm finished after 20.206898 seconds Success. Success. Success. Loading net ... done. -Loading additional file '/home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/bidi.taz.xml' ... done. +Loading additional file '/home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/bidi.taz.xml' ... done. Skipped until: 0.00 -Not all given gtfs elements have been mapped, see /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/missing.xml for more information -generating taz file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/districts.taz.xml +Not all given gtfs elements have been mapped, see /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/log/missing.xml for more information +generating taz file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/districts.taz.xml importing shapes from /home/micha/programming/tsc/data/berlin_net/shapes/Berlin Verkehrsbezirke (1193 VBz) GK4_zone.dbf ... -calculating contained edges for /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/Berlin Verkehrsbezirke (1193 VBz) GK4_zone.poly.xml ... -generating taz file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/RBS_OD_ORT_1412.taz.xml -importing shapes from /home/micha/programming/tsc/data/berlin_net/shapes/RBS_OD_ORT_1412.dbf ... -calculating contained edges for /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/RBS_OD_ORT_1412.poly.xml ... -generating taz file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/Berlin_1223.taz.xml +calculating contained edges for /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/Berlin Verkehrsbezirke (1193 VBz) GK4_zone.poly.xml ... +generating taz file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/Berlin_1223.taz.xml importing shapes from /home/micha/programming/tsc/data/berlin_net/shapes/Berlin_1223.dbf ... -calculating contained edges for /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/Berlin_1223.poly.xml ... +calculating contained edges for /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/Berlin_1223.poly.xml ... +generating taz file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/RBS_OD_ORT_1412.taz.xml +importing shapes from /home/micha/programming/tsc/data/berlin_net/shapes/RBS_OD_ORT_1412.dbf ... +calculating contained edges for /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/RBS_OD_ORT_1412.poly.xml ... generating landmark file pre_test/mitte_net/landmarks -generating landmark file /home/micha/.texttest/tmp/tsc.sqlite3.python3.10Dec221118.587117/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/landmarks.csv.gz +generating landmark file /home/micha/.texttest/tmp/tsc.sqlite3.python3.11Dec145705.8690/tsc.sqlite3.python3/pre_mitte/installTemplateDir_mitte/data/scenario_templates/mitte_net/landmarks.csv.gz