Skip to content

Commit

Permalink
patching expected results refs #21, #2202
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Jan 14, 2019
1 parent 0654cfc commit dad39f5
Show file tree
Hide file tree
Showing 3 changed files with 214 additions and 214 deletions.
4 changes: 2 additions & 2 deletions tests/tools/import/OSM/webWizard/errors.tools
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,9 @@ Warning: busStop '1668497956' on lane '153537614#2_0' is too short for vehicle '
Warning: busStop '3869306762' on lane '111251382#2_1' is too short for vehicle 'pt_bus_147:0.0'.
Warning: busStop '2071423352' on lane '295250361_0' is too short for vehicle 'pt_subway_U6:0.0'.
Warning: Person 'ped26' aborted waiting for M5:1 at busStop '30731481'.
Warning: Person 'ped72' aborted waiting for M1:1 at busStop '963600646'.
Warning: Person 'ped5' aborted waiting for M5:3 at busStop '30731508'.
Warning: Person 'ped37' aborted waiting for M5:2 at busStop '1633759766'.
Warning: Person 'ped69' aborted waiting for M4:1 at busStop '1633759766'.
Warning: Person 'ped126' aborted waiting for 147:3 at busStop '3869306764'.
Warning: Person 'ped135' aborted waiting for N42:1 at busStop '270727260'.
Warning: Person 'ped14' aborted waiting for N65:1 at busStop '1686199552'.
Warning: Person 'ped178' aborted waiting for 248:0 at busStop '3867910417'.
94 changes: 47 additions & 47 deletions tests/tools/import/OSM/webWizard/output.tools
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +
Removing self-loops... done (0ms).
Processing public transport stops... done (1ms).
Revising public transport stops based on pt lines...
done (11ms).
done (10ms).
Align pt stop id signs with corresponding edge id signs... done (0ms).
Found 5 reversible edge sequences between broken rail nodes
Reversed 5 sequences (count by length: 1:3 9:2)
Expand All @@ -44,28 +44,28 @@ Added 1 bidi-edges between 1 pairs of railway switches (count by length: 1:1)
DijkstraRouter answered 49 queries and explored 49.80 edges on average.
DijkstraRouter spent 0ms answering queries (0.00ms on average).
Joining junction clusters...
done (14ms).
done (13ms).
Joined 110 junction cluster(s).
Removing empty nodes and geometry nodes... done (10ms).
549 nodes removed.
Moving network to origin... done (11ms).
Computing turning directions...
done (3ms).
done (2ms).
Assigning nodes to traffic lights... done (0ms).
Guessing and setting on-/off-ramps... done (4ms).
Sorting nodes' edges... done (3ms).
Computing node shapes... done (58ms).
Sorting nodes' edges... done (4ms).
Computing node shapes... done (56ms).
Computing edge shapes... done (33ms).
Computing node types... done (0ms).
Computing node types... done (1ms).
Guessed 962 pedestrian crossings.
Computing priorities... done (2ms).
Computing approached edges... done (2ms).
Guessing and setting roundabouts...
Guessed 2 roundabout(s).
done (2ms).
Computing approaching lanes... done (11ms).
Dividing of lanes on approached lanes... done (5ms).
Processing turnarounds... done (0ms).
Dividing of lanes on approached lanes... done (4ms).
Processing turnarounds... done (1ms).
Rechecking of lane endings...
done (1ms).
Joining traffic light nodes... done (2ms).
Expand All @@ -76,7 +76,7 @@ Computing traffic light logics...
done (6ms).
59 traffic light(s) computed.
Building inner edges...
done (49ms).
done (47ms).
Added 1 stops for superposed rail edges.
Find accesses for pt rail stops... done (41ms).
DijkstraRouter answered 8 queries and explored 13.00 edges on average.
Expand All @@ -94,14 +94,14 @@ Summary:
Applied offset : -389562.46,-5817979.56
Converted boundary : 0.00,0.00,4934.15,4470.73
-----------------------------------------------------
Writing network... done (556ms).
Writing network... done (551ms).
Success.
Written configuration to 'osm.polycfg'
Loading configuration... done.
Parsing network projection from 'osm.net.xml'... done (3ms).
Parsing nodes from osm-file 'osm_bbox.osm.xml'... done (657ms).
Parsing relations from osm-file 'osm_bbox.osm.xml'... done (510ms).
Parsing edges from osm-file 'osm_bbox.osm.xml'... done (544ms).
Parsing network projection from 'osm.net.xml'... done (2ms).
Parsing nodes from osm-file 'osm_bbox.osm.xml'... done (652ms).
Parsing relations from osm-file 'osm_bbox.osm.xml'... done (505ms).
Parsing edges from osm-file 'osm_bbox.osm.xml'... done (543ms).
Success.
Success.
Success.
Expand All @@ -112,17 +112,17 @@ Success.
Success.
Written configuration to 'osm.sumocfg'
Loading configuration... done.
Loading net-file from '/scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml'... done (810ms).
Loading additional-files from '/scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.poly.xml'... done (216ms).
Loading additional-files from '/scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm_stops.add.xml'... done (10ms).
Loading net-file from '/scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml'... done (793ms).
Loading additional-files from '/scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.poly.xml'... done (223ms).
Loading additional-files from '/scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm_stops.add.xml'... done (10ms).
Loading done.
Simulation version v1_0_1+0645-93703db started with time: 0.00
Simulation ended at time: 2635.00
Simulation ended at time: 2653.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 3399ms
Real time factor: 775.228
UPS: 43199.470432
Duration: 3394ms
Real time factor: 781.674
UPS: 43671.479081
Vehicles:
Inserted: 429
Running: 0
Expand All @@ -131,29 +131,29 @@ Persons:
Inserted: 199
Running: 0
Statistics (avg):
RouteLength: 1692.79
Duration: 342.27
WaitingTime: 66.82
TimeLoss: 123.68
RouteLength: 1703.93
Duration: 345.50
WaitingTime: 69.63
TimeLoss: 126.32
DepartDelay: 0.37
Pedestrian Statistics (avg of 419 walks):
RouteLength: 285.71
Duration: 240.20
TimeLoss: 39.59
Ride Statistics (avg of 187 rides):
WaitingTime: 118.67
RouteLength: 856.62
Duration: 111.44
Bus: 61
Train: 118
Pedestrian Statistics (avg of 420 walks):
RouteLength: 286.45
Duration: 241.79
TimeLoss: 40.26
Ride Statistics (avg of 188 rides):
WaitingTime: 114.83
RouteLength: 848.64
Duration: 110.69
Bus: 63
Train: 117
Bike: 0
Aborted: 8

DijkstraRouter answered 7823 queries and explored 12.20 edges on average.
DijkstraRouter spent 20ms answering queries (0.00ms on average).
DijkstraRouter answered 282 queries and explored 652.00 edges on average.
DijkstraRouter spent 138ms answering queries (0.49ms on average).
Building scenario in '/scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test'
DijkstraRouter answered 8135 queries and explored 12.54 edges on average.
DijkstraRouter spent 28ms answering queries (0.00ms on average).
DijkstraRouter answered 282 queries and explored 648.83 edges on average.
DijkstraRouter spent 146ms answering queries (0.52ms on average).
Building scenario in '/scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test'
generating trips...
Imported 81 lines with 319 stops and skipped 5 lines
tram: 20
Expand All @@ -166,10 +166,10 @@ running SUMO to determine actual departure times...
done.
creating routes...
done.
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.passenger.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o routes.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.passenger.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.passenger.trips.xml.tmp --write-trips
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.ship.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o routes.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.ship.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.ship.trips.xml.tmp --write-trips
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.bicycle.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o routes.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.bicycle.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.bicycle.trips.xml.tmp --write-trips
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.pedestrian.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings --additional-files /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm_stops.add.xml,/scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm_pt.rou.xml -o /scr2/texttest_tmp/tools.10Jan140103.27543/tools/import/OSM/webWizard/test/osm.pedestrian.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.passenger.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o routes.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.passenger.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.passenger.trips.xml.tmp --write-trips
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.ship.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o routes.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.ship.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.ship.trips.xml.tmp --write-trips
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.bicycle.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o routes.rou.xml
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.bicycle.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings -o /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.bicycle.trips.xml.tmp --write-trips
calling /scr1/sumo/bin/duarouter -n /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.net.xml -r /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.pedestrian.trips.xml --ignore-errors --begin 0 --end 900.0 --no-step-log --no-warnings --additional-files /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm_stops.add.xml,/scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm_pt.rou.xml -o /scr2/texttest_tmp/tools.14Jan141942.30578/tools/import/OSM/webWizard/test/osm.pedestrian.rou.xml
Loading

0 comments on commit dad39f5

Please sign in to comment.