From 05a245b3e5a5cfa895a05ff15f0dc27edbe89a1f Mon Sep 17 00:00:00 2001 From: Jakob Erdmann Date: Wed, 18 Dec 2024 11:09:00 +0100 Subject: [PATCH] patching expected results refs #21, #13142 --- .../circle_krauss_bikes_sublane/output.sumo | 12 ++++++------ .../krauss_bikes_sublane/output.sumo | 14 +++++++------- .../fundamental/krauss_bikes_t1_s1/output.sumo | 12 ++++++------ .../personTrip/bike_public_walk/output.sumo | 10 +++++----- .../extended/bikes/tls_merge_right/output.sumo | 14 +++++++------- .../bikes/tls_merge_right_crossing/output.sumo | 18 +++++++++--------- .../tls_merge_right_noInternal/output.sumo | 14 +++++++------- .../bikes/tls_merge_straight/output.sumo | 12 ++++++------ .../tls_merge_straight_noInternal/output.sumo | 12 ++++++------ .../bikes/prioLarge_onlyBike/output.sumo | 12 ++++++------ .../priority2_oncoming/output.sumo | 10 +++++----- .../priority2_sameStraight/output.sumo | 18 +++++++++--------- .../priority_oncoming/output.sumo | 16 ++++++++-------- .../priority_sameStraight/output.sumo | 12 ++++++------ .../output.sumo | 18 +++++++++--------- .../params_caccVehicleMode/output.sumo | 2 +- .../bikes_with_undeparted/output.sumo | 11 ++++++----- .../bikes_with_undeparted/statistic.sumo | 12 ++++++------ .../sublane_model/bugs/ticket13101/output.sumo | 12 ++++++------ .../bicycle_box/lane_choice/output.sumo | 12 ++++++------ .../junction/bicycle_box/with_cars/output.sumo | 12 ++++++------ .../bugs/ticket10927/output.sumo | 15 ++++++++------- .../bugs/ticket11481/output.sumo | 15 ++++++++------- .../bugs/ticket13111/output.sumo | 13 +++++++------ .../neighbor_allowed/output.sumo | 10 +++++----- .../neighbor_forbidden/output.sumo | 12 ++++++------ .../width_transition/neighbor_none/output.sumo | 10 +++++----- .../neighbor_none2/output.sumo | 12 ++++++------ .../actuated/multiNext/bike_skip/output.sumo | 14 +++++++------- 29 files changed, 185 insertions(+), 181 deletions(-) diff --git a/tests/sumo/cf_model/fundamental/circle_krauss_bikes_sublane/output.sumo b/tests/sumo/cf_model/fundamental/circle_krauss_bikes_sublane/output.sumo index 909c5c9a86e8..78a50e1e1f6b 100644 --- a/tests/sumo/cf_model/fundamental/circle_krauss_bikes_sublane/output.sumo +++ b/tests/sumo/cf_model/fundamental/circle_krauss_bikes_sublane/output.sumo @@ -1,13 +1,13 @@ Loading net-file from 'net4.net.xml' ... done (0ms). -Loading additional-files from 'input_additional4.add.xml' ... done (0ms). +Loading additional-files from 'input_additional4.add.xml' ... done (1ms). Loading done. -Simulation version v1_20_0+0441-b48668e145b started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 3600.00. Reason: The final simulation step has been reached. Performance: - Duration: 1.49s - Real time factor: 2414.49 - UPS: 144827.632461 + Duration: 3.23s + Real time factor: 1115.24 + UPS: 66895.291202 Vehicles: Inserted: 60 (Loaded: 1000) Running: 60 @@ -18,5 +18,5 @@ Bike Statistics (avg of 60): Duration: 3598.97 WaitingTime: 175.08 TimeLoss: 2369.94 - DepartDelay: 0.00 + DepartDelay: 1.00 DepartDelayWaiting: 0.00 diff --git a/tests/sumo/cf_model/fundamental/krauss_bikes_sublane/output.sumo b/tests/sumo/cf_model/fundamental/krauss_bikes_sublane/output.sumo index 4503d82ba681..2d6ec9e726f3 100644 --- a/tests/sumo/cf_model/fundamental/krauss_bikes_sublane/output.sumo +++ b/tests/sumo/cf_model/fundamental/krauss_bikes_sublane/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net2.net.xml' ... done (1ms). -Loading additional-files from 'input_additional.add.xml' ... done (1ms). +Loading net-file from 'net2.net.xml' ... done (2ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0455-1c3b13a100c started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 600.00. Reason: The final simulation step has been reached. Performance: - Duration: 1.22s - Real time factor: 493.827 - UPS: 202579.423868 + Duration: 2.96s + Real time factor: 202.497 + UPS: 83069.186635 Vehicles: Inserted: 861 (Loaded: 999) Running: 627 @@ -18,4 +18,4 @@ Bike Statistics (avg of 234): Duration: 435.38 WaitingTime: 0.12 TimeLoss: 83.98 - DepartDelay: 0.00 + DepartDelay: 1.40 diff --git a/tests/sumo/cf_model/fundamental/krauss_bikes_t1_s1/output.sumo b/tests/sumo/cf_model/fundamental/krauss_bikes_t1_s1/output.sumo index 1e60e043ecca..45dc3ea4789d 100644 --- a/tests/sumo/cf_model/fundamental/krauss_bikes_t1_s1/output.sumo +++ b/tests/sumo/cf_model/fundamental/krauss_bikes_t1_s1/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net2.net.xml' ... done (1ms). +Loading net-file from 'net2.net.xml' ... done (3ms). Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0441-b48668e145b started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 3600.00. Reason: The final simulation step has been reached. Performance: - Duration: 0.72s - Real time factor: 4979.25 - UPS: 992266.943292 + Duration: 1.88s + Real time factor: 1911.84 + UPS: 380992.565056 Vehicles: Inserted: 1545 (Loaded: 3600) Running: 217 @@ -18,4 +18,4 @@ Bike Statistics (avg of 1328): Duration: 503.11 WaitingTime: 21.33 TimeLoss: 143.84 - DepartDelay: 0.00 + DepartDelay: 3.99 diff --git a/tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo b/tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo index 985a60cb467e..b6b09152f168 100644 --- a/tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo +++ b/tests/sumo/devices/rerouting/personTrip/bike_public_walk/output.sumo @@ -1,14 +1,14 @@ Loading net-file from 'net.net.xml' ... done (1ms). Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 1029.00. Reason: All vehicles have left the simulation. Performance: Duration: 0.01s - Real time factor: 128625 - UPS: 82625.000000 - UPS-Persons: 103000.000000 + Real time factor: 171500 + UPS: 110166.666667 + UPS-Persons: 137333.333333 Vehicles: Inserted: 5 Running: 0 @@ -22,13 +22,13 @@ Statistics (avg of 4): Duration: 128.00 WaitingTime: 0.00 TimeLoss: 23.75 + DepartDelay: 0.00 Bike Statistics (avg of 1): RouteLength: 751.85 Speed: 5.05 Duration: 149.00 WaitingTime: 1.00 TimeLoss: 13.67 -Statistics (avg of 5): DepartDelay: 0.00 Pedestrian Statistics (avg of 1 walks): RouteLength: 503.06 diff --git a/tests/sumo/extended/bikes/tls_merge_right/output.sumo b/tests/sumo/extended/bikes/tls_merge_right/output.sumo index a2fd233f2bad..ba57adc6db84 100644 --- a/tests/sumo/extended/bikes/tls_merge_right/output.sumo +++ b/tests/sumo/extended/bikes/tls_merge_right/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (3ms). +Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_12_0+0426-579bba2 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 410.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.03s - Real time factor: 14642.9 - UPS: 172428.571429 + Duration: 0.01s + Real time factor: 34166.7 + UPS: 402333.333333 Vehicles: Inserted: 73 Running: 0 @@ -17,11 +17,11 @@ Statistics (avg of 35): Duration: 77.77 WaitingTime: 37.37 TimeLoss: 63.57 + DepartDelay: 0.20 Bike Statistics (avg of 38): RouteLength: 183.56 Speed: 3.64 Duration: 55.42 WaitingTime: 14.37 TimeLoss: 21.91 -Statistics (avg of 73): - DepartDelay: 0.40 + DepartDelay: 0.18 diff --git a/tests/sumo/extended/bikes/tls_merge_right_crossing/output.sumo b/tests/sumo/extended/bikes/tls_merge_right_crossing/output.sumo index bce25801afe1..4ee9312bfd08 100644 --- a/tests/sumo/extended/bikes/tls_merge_right_crossing/output.sumo +++ b/tests/sumo/extended/bikes/tls_merge_right_crossing/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (3ms). +Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_12_0+0426-579bba2 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 440.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.02s - Real time factor: 20000 - UPS: 251272.727273 + Duration: 0.01s + Real time factor: 48888.9 + UPS: 614222.222222 Vehicles: Inserted: 73 Running: 0 @@ -15,13 +15,13 @@ Statistics (avg of 35): RouteLength: 189.53 Speed: 2.09 Duration: 98.63 - WaitingTime: 49.29 - TimeLoss: 83.85 + WaitingTime: 49.28 + TimeLoss: 83.84 + DepartDelay: 0.20 Bike Statistics (avg of 38): RouteLength: 190.43 Speed: 3.75 Duration: 54.63 WaitingTime: 12.24 TimeLoss: 19.85 -Statistics (avg of 73): - DepartDelay: 0.43 + DepartDelay: 0.21 diff --git a/tests/sumo/extended/bikes/tls_merge_right_noInternal/output.sumo b/tests/sumo/extended/bikes/tls_merge_right_noInternal/output.sumo index aa67492f344f..c55665e9c474 100644 --- a/tests/sumo/extended/bikes/tls_merge_right_noInternal/output.sumo +++ b/tests/sumo/extended/bikes/tls_merge_right_noInternal/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (2ms). +Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_14_1+0775-edc6051 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 461.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.03s - Real time factor: 17730.8 - UPS: 190538.461538 + Duration: 0.01s + Real time factor: 41909.1 + UPS: 450363.636364 Vehicles: Inserted: 73 Running: 0 @@ -17,11 +17,11 @@ Statistics (avg of 35): Duration: 79.91 WaitingTime: 41.86 TimeLoss: 65.45 + DepartDelay: 0.20 Bike Statistics (avg of 38): RouteLength: 198.30 Speed: 3.78 Duration: 56.76 WaitingTime: 13.05 TimeLoss: 20.62 -Statistics (avg of 73): - DepartDelay: 0.43 + DepartDelay: 0.21 diff --git a/tests/sumo/extended/bikes/tls_merge_straight/output.sumo b/tests/sumo/extended/bikes/tls_merge_straight/output.sumo index 93ab83c736c1..e1827c2526c3 100644 --- a/tests/sumo/extended/bikes/tls_merge_straight/output.sumo +++ b/tests/sumo/extended/bikes/tls_merge_straight/output.sumo @@ -1,12 +1,12 @@ Loading net-file from 'net.net.xml' ... done (3ms). Loading done. -Simulation version v1_15_0+0749-de9f6f8 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 402.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.03s - Real time factor: 15461.5 - UPS: 163269.230769 + Duration: 0.01s + Real time factor: 33500 + UPS: 353750.000000 Vehicles: Inserted: 73 Running: 0 @@ -17,11 +17,11 @@ Statistics (avg of 35): Duration: 34.48 WaitingTime: 11.66 TimeLoss: 19.99 + DepartDelay: 0.20 Bike Statistics (avg of 38): RouteLength: 198.43 Speed: 2.73 Duration: 79.95 WaitingTime: 30.95 TimeLoss: 43.77 -Statistics (avg of 73): - DepartDelay: 0.48 + DepartDelay: 0.26 diff --git a/tests/sumo/extended/bikes/tls_merge_straight_noInternal/output.sumo b/tests/sumo/extended/bikes/tls_merge_straight_noInternal/output.sumo index 48c50a1805dd..ec68c15716ac 100644 --- a/tests/sumo/extended/bikes/tls_merge_straight_noInternal/output.sumo +++ b/tests/sumo/extended/bikes/tls_merge_straight_noInternal/output.sumo @@ -1,12 +1,12 @@ Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_15_0+0749-de9f6f8 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 401.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.02s - Real time factor: 21105.3 - UPS: 217000.000000 + Duration: 0.01s + Real time factor: 33416.7 + UPS: 343583.333333 Vehicles: Inserted: 73 Running: 0 @@ -17,11 +17,11 @@ Statistics (avg of 35): Duration: 33.77 WaitingTime: 11.23 TimeLoss: 19.20 + DepartDelay: 0.20 Bike Statistics (avg of 38): RouteLength: 198.30 Speed: 2.82 Duration: 77.39 WaitingTime: 28.89 TimeLoss: 41.27 -Statistics (avg of 73): - DepartDelay: 0.43 + DepartDelay: 0.21 diff --git a/tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo b/tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo index 9fd9b225473e..f3f917b37635 100644 --- a/tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo +++ b/tests/sumo/junction_model/bikes/prioLarge_onlyBike/output.sumo @@ -1,12 +1,12 @@ Loading net-file from 'net3.net.xml' ... done (1ms). Loading done. -Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 655.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.01s - Real time factor: 50384.6 - UPS: 395846.153846 + Duration: 0.02s + Real time factor: 43666.7 + UPS: 343066.666667 Vehicles: Inserted: 112 Running: 0 @@ -17,6 +17,6 @@ Bike Statistics (avg of 50): Duration: 55.50 WaitingTime: 13.04 TimeLoss: 19.31 - DepartDelay: 0.00 + DepartDelay: 0.53 DijkstraRouter answered 112 queries and explored 3.00 edges on average. -DijkstraRouter spent 0.00s answering queries (0.01ms on average). +DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo b/tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo index 1fd61794c04a..d9577e941763 100644 --- a/tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo +++ b/tests/sumo/junction_model/indirect_left_turn/priority2_oncoming/output.sumo @@ -1,13 +1,13 @@ Loading net-file from 'net3.net.xml' ... done (1ms). Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 1048.00. Reason: All vehicles have left the simulation. Performance: Duration: 0.11s - Real time factor: 9274.34 - UPS: 166230.088496 + Real time factor: 9192.98 + UPS: 164771.929825 Vehicles: Inserted: 343 Running: 0 @@ -18,13 +18,13 @@ Statistics (avg of 181): Duration: 56.53 WaitingTime: 35.90 TimeLoss: 40.46 + DepartDelay: 0.01 Bike Statistics (avg of 162): RouteLength: 215.28 Speed: 4.78 Duration: 52.78 WaitingTime: 12.37 TimeLoss: 13.68 -Statistics (avg of 343): - DepartDelay: 0.02 + DepartDelay: 0.01 DijkstraRouter answered 343 queries and explored 3.78 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo b/tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo index 61df54aa92a9..a16bbe32d6f3 100644 --- a/tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo +++ b/tests/sumo/junction_model/indirect_left_turn/priority2_sameStraight/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net3.net.xml' ... done (2ms). -Loading additional-files from 'input_additional.add.xml' ... done (11ms). +Loading net-file from 'net3.net.xml' ... done (1ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_21_0+1186-e3e93bd8c94 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 1697.00. Reason: All vehicles have left the simulation. Performance: - Duration: 1.49s - Real time factor: 1136.64 - UPS: 46801.071668 + Duration: 0.69s + Real time factor: 2448.77 + UPS: 100828.282828 Vehicles: Inserted: 834 Running: 0 @@ -19,13 +19,13 @@ Statistics (avg of 413): Duration: 69.62 WaitingTime: 38.95 TimeLoss: 53.91 + DepartDelay: 410.74 Bike Statistics (avg of 421): RouteLength: 265.58 Speed: 5.00 Duration: 97.67 WaitingTime: 46.95 TimeLoss: 49.44 -Statistics (avg of 834): - DepartDelay: 566.24 + DepartDelay: 152.54 DijkstraRouter answered 4446 queries and explored 4.61 edges on average. -DijkstraRouter spent 0.01s answering queries (0.00ms on average). +DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/junction_model/indirect_left_turn/priority_oncoming/output.sumo b/tests/sumo/junction_model/indirect_left_turn/priority_oncoming/output.sumo index 69dc3cc5ed7c..8ff813a88107 100644 --- a/tests/sumo/junction_model/indirect_left_turn/priority_oncoming/output.sumo +++ b/tests/sumo/junction_model/indirect_left_turn/priority_oncoming/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net2.net.xml' ... done (2ms). -Loading additional-files from 'input_additional.add.xml' ... done (1ms). +Loading net-file from 'net2.net.xml' ... done (1ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 1034.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.12s - Real time factor: 8762.71 - UPS: 102059.322034 + Duration: 0.07s + Real time factor: 15907.7 + UPS: 185276.923077 Vehicles: Inserted: 343 Running: 0 @@ -18,13 +18,13 @@ Statistics (avg of 181): Duration: 32.24 WaitingTime: 12.92 TimeLoss: 17.82 + DepartDelay: 0.01 Bike Statistics (avg of 162): RouteLength: 204.39 Speed: 5.34 Duration: 38.31 WaitingTime: 0.09 TimeLoss: 0.94 -Statistics (avg of 343): - DepartDelay: 0.01 + DepartDelay: 0.00 DijkstraRouter answered 343 queries and explored 4.00 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight/output.sumo b/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight/output.sumo index 97676b9e8e41..14bc2b6efcdd 100644 --- a/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight/output.sumo +++ b/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight/output.sumo @@ -1,13 +1,13 @@ Loading net-file from 'net2.net.xml' ... done (2ms). Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 1604.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.70s - Real time factor: 2291.43 - UPS: 110581.428571 + Duration: 0.72s + Real time factor: 2237.1 + UPS: 107959.553696 Vehicles: Inserted: 834 Running: 0 @@ -19,13 +19,13 @@ Statistics (avg of 413): Duration: 81.52 WaitingTime: 39.21 TimeLoss: 62.87 + DepartDelay: 289.29 Bike Statistics (avg of 421): RouteLength: 266.37 Speed: 4.59 Duration: 103.89 WaitingTime: 50.74 TimeLoss: 55.29 -Statistics (avg of 834): - DepartDelay: 593.61 + DepartDelay: 298.53 DijkstraRouter answered 4585 queries and explored 3.52 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight_defaultShape/output.sumo b/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight_defaultShape/output.sumo index 2d047541f457..c7a7b56a53ba 100644 --- a/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight_defaultShape/output.sumo +++ b/tests/sumo/junction_model/indirect_left_turn/priority_sameStraight_defaultShape/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net2.net.xml' ... done (2ms). -Loading additional-files from 'input_additional.add.xml' ... done (1ms). +Loading net-file from 'net2.net.xml' ... done (1ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0875-c7310f6279d started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 1772.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.62s - Real time factor: 2881.3 - UPS: 148991.869919 + Duration: 0.73s + Real time factor: 2444.14 + UPS: 126386.206897 Vehicles: Inserted: 834 Running: 0 @@ -17,15 +17,15 @@ Statistics (avg of 413): RouteLength: 232.89 Speed: 5.91 Duration: 65.69 - WaitingTime: 30.83 + WaitingTime: 30.82 TimeLoss: 48.45 + DepartDelay: 287.13 Bike Statistics (avg of 421): RouteLength: 237.00 Speed: 3.75 Duration: 153.21 WaitingTime: 103.05 TimeLoss: 109.95 -Statistics (avg of 834): - DepartDelay: 581.34 + DepartDelay: 288.62 DijkstraRouter answered 4498 queries and explored 4.04 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/output/fcd-output/params_caccVehicleMode/output.sumo b/tests/sumo/output/fcd-output/params_caccVehicleMode/output.sumo index dedd9c5889d9..e8d9260ee0e5 100644 --- a/tests/sumo/output/fcd-output/params_caccVehicleMode/output.sumo +++ b/tests/sumo/output/fcd-output/params_caccVehicleMode/output.sumo @@ -2,7 +2,7 @@ Loading net-file from 'net.net.xml' ... done (2ms). Loading additional-files from 'input_additional.add.xml' ... done (1ms). Loading additional-files from 'input_additional2.add.xml' ... done (0ms). Loading done. -Simulation version v1_21_0+0731-b53b2227a47 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 60.00. Reason: The final simulation step has been reached. Performance: diff --git a/tests/sumo/output/statistic/bikes_with_undeparted/output.sumo b/tests/sumo/output/statistic/bikes_with_undeparted/output.sumo index 83fcb2c16fa0..4d8b06318dd4 100644 --- a/tests/sumo/output/statistic/bikes_with_undeparted/output.sumo +++ b/tests/sumo/output/statistic/bikes_with_undeparted/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net2.net.xml' ... done (3ms). +Loading net-file from 'net2.net.xml' ... done (1ms). Loading done. -Simulation version v1_10_0+0487-96e8a86 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 45.00. Reason: The final simulation step has been reached. Performance: Duration: 0.01s - Real time factor: 4500 - UPS: 136800.000000 + Real time factor: 6428.57 + UPS: 195428.571429 Vehicles: Inserted: 64 (Loaded: 91) Running: 58 @@ -17,12 +17,13 @@ Statistics (avg of 33): Duration: 19.21 WaitingTime: 7.61 TimeLoss: 13.46 + DepartDelay: 7.33 Bike Statistics (avg of 31): RouteLength: 76.86 Speed: 3.11 Duration: 23.68 WaitingTime: 6.42 TimeLoss: 8.88 + DepartDelay: 5.26 Statistics (avg of 64): - DepartDelay: 12.27 DepartDelayWaiting: 7.38 diff --git a/tests/sumo/output/statistic/bikes_with_undeparted/statistic.sumo b/tests/sumo/output/statistic/bikes_with_undeparted/statistic.sumo index a69498eb271d..8774884652ed 100644 --- a/tests/sumo/output/statistic/bikes_with_undeparted/statistic.sumo +++ b/tests/sumo/output/statistic/bikes_with_undeparted/statistic.sumo @@ -1,6 +1,6 @@ - - + - - + + diff --git a/tests/sumo/sublane_model/bugs/ticket13101/output.sumo b/tests/sumo/sublane_model/bugs/ticket13101/output.sumo index e01c5dbad325..8c895235f602 100644 --- a/tests/sumo/sublane_model/bugs/ticket13101/output.sumo +++ b/tests/sumo/sublane_model/bugs/ticket13101/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (3ms). +Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_17_0+0029-3726f21 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 578.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.30s - Real time factor: 1926.67 - UPS: 52140.000000 + Duration: 0.14s + Real time factor: 4041.96 + UPS: 109384.615385 Vehicles: Inserted: 235 Running: 0 @@ -17,4 +17,4 @@ Bike Statistics (avg of 235): Duration: 66.56 WaitingTime: 18.36 TimeLoss: 30.47 - DepartDelay: 0.00 + DepartDelay: 9.81 diff --git a/tests/sumo/sublane_model/junction/bicycle_box/lane_choice/output.sumo b/tests/sumo/sublane_model/junction/bicycle_box/lane_choice/output.sumo index 2f1da99d651e..8f19b1c7f1d9 100644 --- a/tests/sumo/sublane_model/junction/bicycle_box/lane_choice/output.sumo +++ b/tests/sumo/sublane_model/junction/bicycle_box/lane_choice/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (2ms). +Loading net-file from 'net.net.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 141.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.03s - Real time factor: 5640 - UPS: 58800.000000 + Duration: 0.01s + Real time factor: 10071.4 + UPS: 105000.000000 Vehicles: Inserted: 28 Running: 0 @@ -17,6 +17,6 @@ Bike Statistics (avg of 28): Duration: 52.50 WaitingTime: 8.43 TimeLoss: 16.77 - DepartDelay: 0.00 + DepartDelay: 0.93 DijkstraRouter answered 28 queries and explored 4.36 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/sublane_model/junction/bicycle_box/with_cars/output.sumo b/tests/sumo/sublane_model/junction/bicycle_box/with_cars/output.sumo index b8906e822d85..6b72ab2e15d9 100644 --- a/tests/sumo/sublane_model/junction/bicycle_box/with_cars/output.sumo +++ b/tests/sumo/sublane_model/junction/bicycle_box/with_cars/output.sumo @@ -1,12 +1,12 @@ Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 194.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.06s - Real time factor: 3344.83 - UPS: 57431.034483 + Duration: 0.03s + Real time factor: 6466.67 + UPS: 111033.333333 Vehicles: Inserted: 56 Running: 0 @@ -17,13 +17,13 @@ Statistics (avg of 28): Duration: 61.78 WaitingTime: 22.39 TimeLoss: 44.03 + DepartDelay: 27.32 Bike Statistics (avg of 28): RouteLength: 195.85 Speed: 3.51 Duration: 57.18 WaitingTime: 10.64 TimeLoss: 21.56 -Statistics (avg of 56): - DepartDelay: 28.29 + DepartDelay: 0.97 DijkstraRouter answered 59 queries and explored 4.03 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket10927/output.sumo b/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket10927/output.sumo index cb03eb7c8d81..40b39f6ab089 100644 --- a/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket10927/output.sumo +++ b/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket10927/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net.net.xml' ... done (31ms). -Loading additional-files from 'input_additional.add.xml' ... done (1ms). +Loading net-file from 'net.net.xml' ... done (6ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0840-6edfc792969 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 100.00. Reason: The final simulation step has been reached. Performance: - Duration: 0.42s - Real time factor: 238.095 - UPS: 25864.285714 + Duration: 0.25s + Real time factor: 403.226 + UPS: 43802.419355 Vehicles: Inserted: 47 (Loaded: 799) Running: 36 @@ -19,14 +19,15 @@ Statistics (avg of 1): Duration: 100.00 WaitingTime: 0.00 TimeLoss: 21.04 + DepartDelay: 0.00 Bike Statistics (avg of 46): RouteLength: 183.73 Speed: 3.95 Duration: 45.06 WaitingTime: 1.99 TimeLoss: 11.48 + DepartDelay: 47.04 Statistics (avg of 47): - DepartDelay: 2164.06 DepartDelayWaiting: 45.78 DijkstraRouter answered 817 queries and explored 6.99 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket11481/output.sumo b/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket11481/output.sumo index 44a3ae6e7e2c..cbb12d488a35 100644 --- a/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket11481/output.sumo +++ b/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket11481/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net.net.xml' ... done (6ms). -Loading additional-files from 'input_additional.add.xml' ... done (0ms). +Loading net-file from 'net.net.xml' ... done (7ms). +Loading additional-files from 'input_additional.add.xml' ... done (1ms). Loading done. -Simulation version v1_20_0+0840-6edfc792969 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 100.00. Reason: The final simulation step has been reached. Performance: - Duration: 0.37s - Real time factor: 271.003 - UPS: 29444.444444 + Duration: 0.23s + Real time factor: 438.596 + UPS: 47653.508772 Vehicles: Inserted: 48 (Loaded: 799) Running: 36 @@ -18,14 +18,15 @@ Statistics (avg of 1): Duration: 100.00 WaitingTime: 0.00 TimeLoss: 21.59 + DepartDelay: 0.00 Bike Statistics (avg of 47): RouteLength: 184.74 Speed: 4.00 Duration: 44.11 WaitingTime: 1.90 TimeLoss: 10.19 + DepartDelay: 47.91 Statistics (avg of 48): - DepartDelay: 2252.05 DepartDelayWaiting: 45.72 DijkstraRouter answered 817 queries and explored 6.99 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket13111/output.sumo b/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket13111/output.sumo index b694a0ff008b..1611b2ec1455 100644 --- a/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket13111/output.sumo +++ b/tests/sumo/sublane_model/opposite_direction_driving/bugs/ticket13111/output.sumo @@ -1,13 +1,13 @@ -Loading net-file from 'net.net.xml' ... done (27ms). +Loading net-file from 'net.net.xml' ... done (7ms). Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0840-6edfc792969 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 100.00. Reason: The final simulation step has been reached. Performance: - Duration: 0.48s - Real time factor: 210.084 - UPS: 23239.495798 + Duration: 0.22s + Real time factor: 465.116 + UPS: 51451.162791 Vehicles: Inserted: 48 (Loaded: 799) Running: 40 @@ -18,14 +18,15 @@ Statistics (avg of 1): Duration: 100.00 WaitingTime: 0.00 TimeLoss: 19.69 + DepartDelay: 0.00 Bike Statistics (avg of 47): RouteLength: 173.27 Speed: 3.77 Duration: 44.94 WaitingTime: 2.28 TimeLoss: 12.93 + DepartDelay: 47.94 Statistics (avg of 48): - DepartDelay: 2253.25 DepartDelayWaiting: 45.72 DijkstraRouter answered 818 queries and explored 6.99 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/sublane_model/width_transition/neighbor_allowed/output.sumo b/tests/sumo/sublane_model/width_transition/neighbor_allowed/output.sumo index 880033ea496c..3bb23bad791b 100644 --- a/tests/sumo/sublane_model/width_transition/neighbor_allowed/output.sumo +++ b/tests/sumo/sublane_model/width_transition/neighbor_allowed/output.sumo @@ -1,12 +1,12 @@ Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_21_0+1306-3ccc848829e started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 611.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.18s - Real time factor: 3491.43 - UPS: 87217.142857 + Duration: 0.17s + Real time factor: 3615.38 + UPS: 90313.609467 Vehicles: Inserted: 235 Running: 0 @@ -18,4 +18,4 @@ Bike Statistics (avg of 235): Duration: 64.95 WaitingTime: 12.30 TimeLoss: 28.84 - DepartDelay: 0.00 + DepartDelay: 13.58 diff --git a/tests/sumo/sublane_model/width_transition/neighbor_forbidden/output.sumo b/tests/sumo/sublane_model/width_transition/neighbor_forbidden/output.sumo index e712f6edba97..74239087143f 100644 --- a/tests/sumo/sublane_model/width_transition/neighbor_forbidden/output.sumo +++ b/tests/sumo/sublane_model/width_transition/neighbor_forbidden/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (2ms). +Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_17_0+0029-3726f21 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 559.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.28s - Real time factor: 1968.31 - UPS: 49992.957746 + Duration: 0.14s + Real time factor: 3909.09 + UPS: 99286.713287 Vehicles: Inserted: 235 Running: 0 @@ -17,4 +17,4 @@ Bike Statistics (avg of 235): Duration: 60.42 WaitingTime: 13.88 TimeLoss: 24.31 - DepartDelay: 0.00 + DepartDelay: 12.84 diff --git a/tests/sumo/sublane_model/width_transition/neighbor_none/output.sumo b/tests/sumo/sublane_model/width_transition/neighbor_none/output.sumo index e824f09f717c..e31f7268c944 100644 --- a/tests/sumo/sublane_model/width_transition/neighbor_none/output.sumo +++ b/tests/sumo/sublane_model/width_transition/neighbor_none/output.sumo @@ -1,12 +1,12 @@ Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_17_0+0029-3726f21 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 611.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.30s - Real time factor: 2050.34 - UPS: 56432.885906 + Duration: 0.18s + Real time factor: 3413.41 + UPS: 93949.720670 Vehicles: Inserted: 235 Running: 0 @@ -17,4 +17,4 @@ Bike Statistics (avg of 235): Duration: 71.56 WaitingTime: 19.44 TimeLoss: 35.33 - DepartDelay: 0.00 + DepartDelay: 14.72 diff --git a/tests/sumo/sublane_model/width_transition/neighbor_none2/output.sumo b/tests/sumo/sublane_model/width_transition/neighbor_none2/output.sumo index 397fdc54142e..dbf00fe3d35f 100644 --- a/tests/sumo/sublane_model/width_transition/neighbor_none2/output.sumo +++ b/tests/sumo/sublane_model/width_transition/neighbor_none2/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (3ms). +Loading net-file from 'net.net.xml' ... done (0ms). Loading done. -Simulation version v1_17_0+0029-3726f21 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 612.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.34s - Real time factor: 1816.02 - UPS: 51035.608309 + Duration: 0.13s + Real time factor: 4818.9 + UPS: 135425.196850 Vehicles: Inserted: 240 Running: 0 @@ -17,4 +17,4 @@ Bike Statistics (avg of 240): Duration: 71.66 WaitingTime: 18.45 TimeLoss: 35.29 - DepartDelay: 0.00 + DepartDelay: 17.71 diff --git a/tests/sumo/tls/actuated/multiNext/bike_skip/output.sumo b/tests/sumo/tls/actuated/multiNext/bike_skip/output.sumo index ff69f5d553da..281d68efd40a 100644 --- a/tests/sumo/tls/actuated/multiNext/bike_skip/output.sumo +++ b/tests/sumo/tls/actuated/multiNext/bike_skip/output.sumo @@ -1,13 +1,13 @@ Loading net-file from 'net.net.xml' ... done (1ms). -Loading additional-files from 'input_additional2.add.xml' ... done (1ms). +Loading additional-files from 'input_additional2.add.xml' ... done (0ms). Loading done. -Simulation version v1_20_0+0782-2de3bc16e35 started with time: 0.00. +Simulation version v1_21_0+1422-a608c970aa0 started with time: 0.00. Simulation ended at time: 3655.00. Reason: All vehicles have left the simulation. Performance: - Duration: 0.06s - Real time factor: 66454.5 - UPS: 142618.181818 + Duration: 0.04s + Real time factor: 89146.3 + UPS: 191317.073171 Vehicles: Inserted: 238 Running: 0 @@ -18,13 +18,13 @@ Statistics (avg of 172): Duration: 26.10 WaitingTime: 3.03 TimeLoss: 11.31 + DepartDelay: 0.80 Bike Statistics (avg of 66): RouteLength: 198.30 Speed: 4.02 Duration: 50.82 WaitingTime: 6.89 TimeLoss: 14.66 -Statistics (avg of 238): - DepartDelay: 1.00 + DepartDelay: 0.53 DijkstraRouter answered 238 queries and explored 3.00 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average).