Skip to content

Commit

Permalink
patching expected results refs #21, #14796
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 30, 2024
1 parent 67d99b4 commit 1b69bd9
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 50 deletions.
19 changes: 10 additions & 9 deletions tests/sumo/extended/collisions/intermodal/stoptime_remove/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Warning: Vehicle 'NE.3' collision with person 'pedSN.2', lane=':C_7_0', time=43.00, stage=move.
Warning: Vehicle 'NE.3' performs emergency stop at the end of lane ':C_7_0' because there is no connection to the next edge (decel=-6.67, offset=0.89), time=44.00.
Warning: Person 'pedNS.3' is jammed on edge ':C_w0', time=67.00.
Warning: Teleporting vehicle 'NE.3' after earlier collision, lane=':C_7_0', time=75.00.
Warning: Vehicle 'NE.3' ends teleporting on edge 'CE', time=75.00.
Warning: Vehicle 'WE.2' collision with person 'pedNS.5', lane=':C_5_0', time=80.00, stage=move.
Warning: Teleporting vehicle 'WE.2' after earlier collision, lane=':C_5_0', time=112.00.
Warning: Vehicle 'WE.2' ends teleporting on edge 'CE', time=112.00.
Warning: Vehicle 'WE.3' collision with person 'pedNS.7', lane=':C_5_0', time=114.00, stage=move.
Warning: Teleporting vehicle 'WE.3' after earlier collision, lane=':C_5_0', time=145.00.
Warning: Vehicle 'WE.3' ends teleporting on edge 'CE', time=145.00.
Warning: Vehicle 'WE.4' collision with person 'pedNS.8', lane=':C_5_0', time=148.00, stage=move.
Warning: Teleporting vehicle 'WE.4' after earlier collision, lane=':C_5_0', time=179.00.
Warning: Vehicle 'WE.4' ends teleporting on edge 'CE', time=179.00.
Warning: Vehicle 'NE.4' collision with person 'pedSN.6', lane=':C_7_0', time=92.00, stage=move.
Warning: Teleporting vehicle 'NE.4' after earlier collision, lane=':C_7_0', time=124.00.
Warning: Vehicle 'NE.4' ends teleporting on edge 'CE', time=124.00.
Warning: Vehicle 'NE.5' collision with person 'pedSN.8', lane=':C_7_0', time=126.00, stage=move.
Warning: Teleporting vehicle 'NE.5' after earlier collision, lane=':C_7_0', time=157.00.
Warning: Vehicle 'NE.5' ends teleporting on edge 'CE', time=157.00.
Warning: Vehicle 'WE.7' collision with person 'pedSN.12', lane=':C_5_0', time=164.00, stage=move.
Warning: Teleporting vehicle 'WE.7' after earlier collision, lane=':C_5_0', time=196.00.
Warning: Vehicle 'WE.7' ends teleporting on edge 'CE', time=196.00.
27 changes: 14 additions & 13 deletions tests/sumo/extended/collisions/intermodal/stoptime_remove/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading done.
Simulation version v1_19_0+1994-3b6ea8084f0 started with time: 0.00.
Simulation ended at time: 244.00
Simulation version v1_19_0+1996-80b3f46514b started with time: 0.00.
Simulation ended at time: 232.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.01s
Real time factor: 22181.8
UPS: 202636.363636
UPS-Persons: 156000.000000
Real time factor: 23200
UPS: 170700.000000
UPS-Persons: 162300.000000
Vehicles:
Inserted: 20
Running: 0
Expand All @@ -17,21 +17,22 @@ Vehicles:
Persons:
Inserted: 34
Running: 0
Jammed: 1
Statistics (avg of 20):
RouteLength: 194.78
Speed: 2.95
Duration: 111.45
WaitingTime: 73.60
TimeLoss: 90.90
Speed: 3.46
Duration: 85.35
WaitingTime: 50.05
TimeLoss: 64.69
DepartDelay: 0.00
Pedestrian Statistics (avg of 34 walks):
RouteLength: 53.20
Duration: 50.47
TimeLoss: 12.17
Duration: 47.73
TimeLoss: 9.43

DijkstraRouter answered 34 queries and explored 7.47 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 34 queries and explored 16.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.03ms on average).
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 20 queries and explored 3.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
19 changes: 10 additions & 9 deletions tests/sumo/extended/collisions/intermodal/stoptime_warn/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Warning: Vehicle 'NE.3' collision with person 'pedSN.2', lane=':C_7_0', time=43.00, stage=move.
Warning: Vehicle 'NE.3' performs emergency stop at the end of lane ':C_7_0' because there is no connection to the next edge (decel=-6.67, offset=0.89), time=44.00.
Warning: Person 'pedNS.3' is jammed on edge ':C_w0', time=67.00.
Warning: Teleporting vehicle 'NE.3' after earlier collision, lane=':C_7_0', time=75.00.
Warning: Vehicle 'NE.3' ends teleporting on edge 'CE', time=75.00.
Warning: Vehicle 'WE.2' collision with person 'pedNS.5', lane=':C_5_0', time=80.00, stage=move.
Warning: Teleporting vehicle 'WE.2' after earlier collision, lane=':C_5_0', time=112.00.
Warning: Vehicle 'WE.2' ends teleporting on edge 'CE', time=112.00.
Warning: Vehicle 'WE.3' collision with person 'pedNS.7', lane=':C_5_0', time=114.00, stage=move.
Warning: Teleporting vehicle 'WE.3' after earlier collision, lane=':C_5_0', time=145.00.
Warning: Vehicle 'WE.3' ends teleporting on edge 'CE', time=145.00.
Warning: Vehicle 'WE.4' collision with person 'pedNS.8', lane=':C_5_0', time=148.00, stage=move.
Warning: Teleporting vehicle 'WE.4' after earlier collision, lane=':C_5_0', time=179.00.
Warning: Vehicle 'WE.4' ends teleporting on edge 'CE', time=179.00.
Warning: Vehicle 'NE.4' collision with person 'pedSN.6', lane=':C_7_0', time=92.00, stage=move.
Warning: Teleporting vehicle 'NE.4' after earlier collision, lane=':C_7_0', time=124.00.
Warning: Vehicle 'NE.4' ends teleporting on edge 'CE', time=124.00.
Warning: Vehicle 'NE.5' collision with person 'pedSN.8', lane=':C_7_0', time=126.00, stage=move.
Warning: Teleporting vehicle 'NE.5' after earlier collision, lane=':C_7_0', time=157.00.
Warning: Vehicle 'NE.5' ends teleporting on edge 'CE', time=157.00.
Warning: Vehicle 'WE.7' collision with person 'pedSN.12', lane=':C_5_0', time=164.00, stage=move.
Warning: Teleporting vehicle 'WE.7' after earlier collision, lane=':C_5_0', time=196.00.
Warning: Vehicle 'WE.7' ends teleporting on edge 'CE', time=196.00.
25 changes: 13 additions & 12 deletions tests/sumo/extended/collisions/intermodal/stoptime_warn/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading done.
Simulation version v1_19_0+1994-3b6ea8084f0 started with time: 0.00.
Simulation ended at time: 244.00
Simulation version v1_19_0+1996-80b3f46514b started with time: 0.00.
Simulation ended at time: 232.00
Reason: All vehicles have left the simulation.
Performance:
Duration: 0.01s
Real time factor: 18769.2
UPS: 171461.538462
UPS-Persons: 132000.000000
Real time factor: 19333.3
UPS: 142250.000000
UPS-Persons: 135250.000000
Vehicles:
Inserted: 20
Running: 0
Expand All @@ -17,17 +17,18 @@ Vehicles:
Persons:
Inserted: 34
Running: 0
Jammed: 1
Statistics (avg of 20):
RouteLength: 194.78
Speed: 2.95
Duration: 111.45
WaitingTime: 73.60
TimeLoss: 90.90
Speed: 3.46
Duration: 85.35
WaitingTime: 50.05
TimeLoss: 64.69
DepartDelay: 0.00
Pedestrian Statistics (avg of 34 walks):
RouteLength: 53.20
Duration: 50.47
TimeLoss: 12.17
Duration: 47.73
TimeLoss: 9.43

DijkstraRouter answered 34 queries and explored 7.47 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Expand Down
1 change: 1 addition & 0 deletions ...destrian_model/striping/block_vehicles_sharedspace/walkingarea_shared_sublane/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Warning: Vehicle 'SE.2' performs emergency braking on lane ':C_8_0' with decel=9.00, wished=4.50, severity=1.00, time=411.00.
Warning: Vehicle 'NS.5' performs emergency braking on lane ':C_1_0' with decel=9.00, wished=4.50, severity=1.00, time=428.00.
Warning: Person 'pWE.20' is jammed on edge ':C_w0', time=625.00.
Warning: Vehicle 'NS.10' collision with person 'pEW.32', lane=':C_1_0', time=662.00, stage=laneChange.
15 changes: 8 additions & 7 deletions ...destrian_model/striping/block_vehicles_sharedspace/walkingarea_shared_sublane/output.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Loading net-file from 'net2.net.xml' ... done (1ms).
Loading done.
Simulation version v1_19_0+1994-3b6ea8084f0 started with time: 0.00.
Simulation version v1_19_0+1996-80b3f46514b started with time: 0.00.
Simulation ended at time: 1000.00
Reason: The final simulation step has been reached.
Performance:
Duration: 0.40s
Real time factor: 2525.25
UPS: 6489.898990
UPS-Persons: 154537.878788
Duration: 0.24s
Real time factor: 4201.68
UPS: 10798.319328
UPS-Persons: 257121.848739
Vehicles:
Inserted: 79
Running: 2
Expand All @@ -17,6 +17,7 @@ Vehicles:
Persons:
Inserted: 2051
Running: 69
Jammed: 1
Statistics (avg of 77):
RouteLength: 188.12
Speed: 6.68
Expand All @@ -26,12 +27,12 @@ Statistics (avg of 77):
DepartDelay: 0.09
Pedestrian Statistics (avg of 512 walks):
RouteLength: 154.07
Duration: 111.80
Duration: 111.79
TimeLoss: 0.86

DijkstraRouter answered 547 queries and explored 9.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 581 queries and explored 25.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter answered 79 queries and explored 3.99 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
DijkstraRouter spent 0.00s answering queries (0.01ms on average).

0 comments on commit 1b69bd9

Please sign in to comment.