Skip to content

Commit

Permalink
patching expected results refs #21, #13875
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Dec 20, 2024
1 parent 8eaf427 commit 0421c6a
Show file tree
Hide file tree
Showing 54 changed files with 917 additions and 817 deletions.
14 changes: 8 additions & 6 deletions tests/complex/state/actuated/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (17ms).
Loading additional-files from 'input_additional.add.xml' ... done (21ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 200.00.
Reason: The final simulation step has been reached.
Loading net-file from 'net.net.xml' ... done (4ms).
Loading additional-files from 'input_additional2.add.xml' ... done (15ms).
Loading state from 'state.xml' ... done (32ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional2.add.xml' ... done (11ms).
Loading state from 'state.xml' ... done (13ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 104.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 104.00.
Simulation ended at time: 200.00.
Reason: The final simulation step has been reached.
9 changes: 5 additions & 4 deletions tests/complex/state/load_flow_state_only/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 2 queries and explored 3.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (52ms).
Loading state from 'state.xml' ... done (13ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 10.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 10.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 1 queries and explored 3.00 edges on average.
Expand Down
12 changes: 7 additions & 5 deletions tests/complex/state/named_route_stops/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 378.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading state from 'state.xml' ... done (33ms).
Loading state from 'state.xml' ... done (16ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 20.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 20.00.
Simulation ended at time: 378.00.
Reason: All vehicles have left the simulation.
11 changes: 6 additions & 5 deletions tests/complex/state/persons/ride_carTriggered2/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
Loading net-file from 'input_net.net.xml' ... done (12ms).
Loading net-file from 'input_net.net.xml' ... done (2ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 330.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 4 queries and explored 36.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'input_net.net.xml' ... done (4ms).
Loading net-file from 'input_net.net.xml' ... done (3ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading state from 'state.xml' ... done (56ms).
Loading state from 'state.xml' ... done (32ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 10.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 10.00.
Simulation ended at time: 1200.00.
Reason: The final simulation step has been reached.
DijkstraRouter answered 1 queries and explored 36.00 edges on average.
Expand Down
11 changes: 6 additions & 5 deletions tests/complex/state/rail/rail_furtherLane/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 16.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 1 queries and explored 2.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading state from 'state.xml' ... done (32ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (13ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 6.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 6.00.
Simulation ended at time: 16.00.
Reason: All vehicles have left the simulation.
9 changes: 5 additions & 4 deletions tests/complex/state/rail/save_on_rail_signal/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 202.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (1ms).
Loading state from 'state.xml' ... done (32ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (12ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 116.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 116.00.
Simulation ended at time: 202.00.
Reason: All vehicles have left the simulation.
9 changes: 5 additions & 4 deletions tests/complex/state/rail/save_rail_signal/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 174.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (1ms).
Loading state from 'state.xml' ... done (24ms).
Loading state from 'state.xml' ... done (59ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 30.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 30.00.
Simulation ended at time: 174.00.
Reason: All vehicles have left the simulation.
9 changes: 5 additions & 4 deletions tests/complex/state/rail/save_rail_signal2/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+1093-f807130dc4a started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 54.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (11ms).
Loading state from 'state.xml' ... done (10ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (9ms).
Loading done.
Simulation version v1_21_0+1093-f807130dc4a started with time: 20.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 20.00.
Simulation ended at time: 54.00.
Reason: All vehicles have left the simulation.
< <entry id="train" time="9.00" reason="junction"/>
Expand Down
9 changes: 5 additions & 4 deletions tests/complex/state/rail/save_rail_signal_approach_steplength/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (9ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 34.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (1ms).
Loading state from 'state.xml' ...
done (20ms).
done (12ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 6.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 6.00.
Simulation ended at time: 34.00.
Reason: All vehicles have left the simulation.
Statistics (avg of 1):
Expand Down
19 changes: 10 additions & 9 deletions tests/complex/state/rail/save_rail_signal_constraint/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (14ms).
Loading additional-files from 'input_additional2.add.xml' ... done (15ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (20ms).
Loading additional-files from 'input_additional2.add.xml' ... done (10ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+0659-43b65d492c5 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 269.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 5 queries and explored 2.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (16ms).
Loading additional-files from 'input_additional2.add.xml' ... done (17ms).
Loading state from 'state.xml' ... done (21ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (10ms).
Loading additional-files from 'input_additional2.add.xml' ... done (12ms).
Loading state from 'state.xml' ... done (32ms).
Loading done.
Simulation version v1_21_0+0659-43b65d492c5 started with time: 60.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 60.00.
Simulation ended at time: 269.00.
Reason: All vehicles have left the simulation.
19 changes: 10 additions & 9 deletions tests/complex/state/rail/save_rail_signal_constraint2/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (18ms).
Loading additional-files from 'input_additional2.add.xml' ... done (16ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (8ms).
Loading additional-files from 'input_additional2.add.xml' ... done (9ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+0659-43b65d492c5 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 269.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 5 queries and explored 2.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (16ms).
Loading additional-files from 'input_additional2.add.xml' ... done (16ms).
Loading state from 'state.xml' ... done (21ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (33ms).
Loading additional-files from 'input_additional2.add.xml' ... done (33ms).
Loading state from 'state.xml' ... done (10ms).
Loading done.
Simulation version v1_21_0+0659-43b65d492c5 started with time: 180.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 180.00.
Simulation ended at time: 269.00.
Reason: All vehicles have left the simulation.
13 changes: 7 additions & 6 deletions tests/complex/state/rail/save_rail_signal_constraint_include/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (17ms).
Loading additional-files from 'input_additional2.add.xml' ... done (16ms).
Loading additional-files from 'input_additional.add.xml' ... done (9ms).
Loading additional-files from 'input_additional2.add.xml' ... done (9ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+0659-43b65d492c5 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 269.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 5 queries and explored 2.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (16ms).
Loading state from 'state.xml' ... done (20ms).
Loading additional-files from 'input_additional.add.xml' ... done (8ms).
Loading state from 'state.xml' ... done (10ms).
Loading done.
Simulation version v1_21_0+0659-43b65d492c5 started with time: 60.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 60.00.
Simulation ended at time: 269.00.
Reason: All vehicles have left the simulation.
11 changes: 6 additions & 5 deletions tests/complex/state/replace_vtype/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 64.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (2ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading state from 'state.xml' ... done (30ms).
Loading state from 'state.xml' ... done (21ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 15.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 15.00.
Simulation ended at time: 34.00.
Reason: All vehicles have left the simulation.
12 changes: 7 additions & 5 deletions tests/complex/state/save_accel/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 2 queries and explored 3.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading state from 'state.xml' ... done (42ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (41ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 10.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 10.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 1 queries and explored 3.00 edges on average.
Expand Down
24 changes: 13 additions & 11 deletions tests/complex/state/save_collision_stopped/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (24ms).
Loading additional-files from 'input_additional.add.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+1188-de3782bea46 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 500.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 0.38s
Real time factor: 1308.9
UPS: 126861.256545
Duration: 0.37s
Real time factor: 1336.9
UPS: 129574.866310
Vehicles:
Inserted: 159 (Loaded: 1000)
Running: 147
Waiting: 841
Teleports: 7 (Collisions: 5, Yield: 2)
Loading net-file from 'net.net.xml' ... done (1ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading state from 'state.xml' ... done (16ms).
Loading state from 'state.xml' ... done (30ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_21_0+1188-de3782bea46 started with time: 50.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 50.00.
Simulation ended at time: 500.00.
Reason: The final simulation step has been reached.
Performance:
Duration: 0.12s
Real time factor: 3879.31
UPS: 411939.655172
Duration: 0.17s
Real time factor: 2601.16
UPS: 276213.872832
Vehicles:
Inserted: 159 (Loaded: 1000)
Running: 147
Expand Down
7 changes: 4 additions & 3 deletions tests/complex/state/save_depart_edge/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 25.00.
Reason: All vehicles have left the simulation.
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (61ms).
Loading state from 'state.xml' ... done (27ms).
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 15.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 15.00.
Simulation ended at time: 25.00.
Reason: All vehicles have left the simulation.
10 changes: 6 additions & 4 deletions tests/complex/state/save_flow/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 2 queries and explored 3.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading state from 'state.xml' ... done (30ms).
Loading net-file from 'net.net.xml' ... done (16ms).
Loading state from 'state.xml' ... done (27ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 10.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 10.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 1 queries and explored 3.00 edges on average.
Expand Down
12 changes: 7 additions & 5 deletions tests/complex/state/save_flow50/output.complex
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
Loading net-file from 'net.net.xml' ... done (1ms).
Loading net-file from 'net.net.xml' ... done (0ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 0.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
DijkstraRouter answered 2 queries and explored 3.00 edges on average.
DijkstraRouter spent 0.00s answering queries (0.00ms on average).
Loading net-file from 'net.net.xml' ... done (1ms).
Loading state from 'state.xml' ... done (25ms).
Loading net-file from 'net.net.xml' ... done (6ms).
Loading state from 'state.xml' ... done (47ms).
Loading route-files incrementally from 'input_routes.rou.xml'
Loading done.
Simulation version v1_20_0+0782-2de3bc16e35 started with time: 50.00.
Simulation version v1_21_0+1570-8eaf427e473 started with time: 50.00.
Simulation ended at time: 143.00.
Reason: All vehicles have left the simulation.
Loading

0 comments on commit 0421c6a

Please sign in to comment.