diff --git a/tests/sumo/basic/tls/NEMA/basic/output.sumo b/tests/sumo/basic/tls/NEMA/basic/output.sumo index aed56f8c28a5..a1e6aa471c06 100644 --- a/tests/sumo/basic/tls/NEMA/basic/output.sumo +++ b/tests/sumo/basic/tls/NEMA/basic/output.sumo @@ -1,23 +1,23 @@ -Loading net-file from 'net.net.xml' ... done (2ms). +Loading net-file from 'net.net.xml' ... done (4ms). Loading additional-files from 'input_additional.add.xml' ... done (1ms). Loading additional-files from 'input_additional2.add.xml' ... done (1ms). Loading done. -Simulation version v1_12_0+0452-f1c085e started with time: 0.00 -Simulation ended at time: 3760.00 +Simulation version v1_13_0+0011-a81882c started with time: 0.00 +Simulation ended at time: 3762.00 Reason: All vehicles have left the simulation. Performance: - Duration: 1.64s - Real time factor: 2291.29 - UPS: 130448.507008 + Duration: 1.62s + Real time factor: 2323.66 + UPS: 128145.151328 Vehicles: Inserted: 2774 Running: 0 Waiting: 0 Statistics (avg): - RouteLength: 376.94 - Speed: 6.92 - Duration: 77.17 - WaitingTime: 36.89 - TimeLoss: 57.59 + RouteLength: 376.93 + Speed: 7.00 + Duration: 74.79 + WaitingTime: 35.03 + TimeLoss: 55.22 DepartDelay: 0.78 diff --git a/tests/sumo/basic/tls/NEMA/basic/tls_program.sumo b/tests/sumo/basic/tls/NEMA/basic/tls_program.sumo index c78cec69e603..aa8754054606 100644 --- a/tests/sumo/basic/tls/NEMA/basic/tls_program.sumo +++ b/tests/sumo/basic/tls/NEMA/basic/tls_program.sumo @@ -1,6 +1,6 @@ - - - + + diff --git a/tests/sumo/devices/rerouting/tlsPenalty/default/output.sumo b/tests/sumo/devices/rerouting/tlsPenalty/default/output.sumo index 4e2772203ba0..7118ac5660e6 100644 --- a/tests/sumo/devices/rerouting/tlsPenalty/default/output.sumo +++ b/tests/sumo/devices/rerouting/tlsPenalty/default/output.sumo @@ -1,23 +1,23 @@ Loading net-file from 'net.net.xml' ... done (2ms). -Loading additional-files from 'input_additional.add.xml' ... done (1ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading done. -Simulation version v1_12_0+1690-4ac7113 started with time: 0.00 -Simulation ended at time: 3260.00 +Simulation version v1_13_0+0011-a81882c started with time: 0.00 +Simulation ended at time: 3259.00 Reason: All vehicles have left the simulation. Performance: - Duration: 0.23s - Real time factor: 14173.9 - UPS: 246156.521739 + Duration: 0.39s + Real time factor: 8356.41 + UPS: 142989.743590 Vehicles: Inserted: 1000 Running: 0 Waiting: 0 Statistics (avg): - RouteLength: 397.82 - Speed: 7.83 - Duration: 56.62 - WaitingTime: 19.77 - TimeLoss: 27.48 + RouteLength: 396.69 + Speed: 7.89 + Duration: 55.77 + WaitingTime: 19.17 + TimeLoss: 26.73 DepartDelay: 0.40 DijkstraRouter answered 1000 queries and explored 6.94 edges on average. diff --git a/tests/sumo/extended/collisions/check_junctions/stoptime_warn/errors.sumo b/tests/sumo/extended/collisions/check_junctions/stoptime_warn/errors.sumo index f24db5775061..00cf5f7f1798 100644 --- a/tests/sumo/extended/collisions/check_junctions/stoptime_warn/errors.sumo +++ b/tests/sumo/extended/collisions/check_junctions/stoptime_warn/errors.sumo @@ -9,37 +9,40 @@ Warning: Vehicle 'flow_1.14'; junction collision with vehicle 'flow_0.35', lane= Warning: Vehicle 'flow_1.15'; junction collision with vehicle 'flow_0.50', lane=':C_15_0', gap=-1.00, time=146.50 stage=move. Warning: Vehicle 'flow_1.15'; junction collision with vehicle 'flow_0.60', lane=':C_18_0', gap=-1.00, time=170.00 stage=move. Warning: Vehicle 'flow_1.15'; junction collision with vehicle 'flow_0.61', lane=':C_18_0', gap=-1.00, time=173.00 stage=move. -Warning: Vehicle 'flow_1.23'; junction collision with vehicle 'flow_0.75', lane=':C_18_0', gap=-1.00, time=209.50 stage=move. -Warning: Vehicle 'flow_1.24'; junction collision with vehicle 'flow_0.76', lane=':C_18_0', gap=-1.00, time=212.50 stage=move. -Warning: Vehicle 'flow_0.78' performs emergency stop at the end of lane 'EC_1' because of a red traffic light (decel=-9.36, offset=2.34), time=214.50. -Warning: Vehicle 'flow_1.24'; junction collision with vehicle 'flow_0.77', lane=':C_18_0', gap=-1.00, time=217.00 stage=move. -Warning: Vehicle 'flow_1.30'; junction collision with vehicle 'flow_0.102', lane=':C_18_0', gap=-1.00, time=283.00 stage=move. -Warning: Vehicle 'flow_1.31'; junction collision with vehicle 'flow_0.103', lane=':C_18_0', gap=-1.00, time=285.50 stage=move. -Warning: Vehicle 'flow_0.103' performs emergency stop at the end of lane ':C_5_1' because there is no connection to the next edge (decel=-8.76, offset=2.03), time=286.00. -Warning: Vehicle 'flow_1.31'; junction collision with vehicle 'flow_0.104', lane=':C_18_0', gap=-1.00, time=292.00 stage=move. -Warning: Vehicle 'flow_1.32'; junction collision with vehicle 'flow_0.127', lane=':C_18_0', gap=-1.00, time=348.50 stage=move. -Warning: Vehicle 'flow_1.32'; junction collision with vehicle 'flow_0.128', lane=':C_18_0', gap=-1.00, time=351.50 stage=move. -Warning: Vehicle 'flow_1.35'; junction collision with vehicle 'flow_0.139', lane=':C_18_0', gap=-1.00, time=379.50 stage=move. -Warning: Vehicle 'flow_1.36'; junction collision with vehicle 'flow_0.140', lane=':C_18_0', gap=-1.00, time=383.00 stage=move. -Warning: Vehicle 'flow_1.44'; junction collision with vehicle 'flow_0.173', lane=':C_18_0', gap=-1.00, time=468.50 stage=move. -Warning: Vehicle 'flow_1.45'; junction collision with vehicle 'flow_0.176', lane=':C_18_0', gap=-1.00, time=476.50 stage=move. -Warning: Vehicle 'flow_0.177'; junction collision with vehicle 'flow_1.45', lane=':C_5_0', gap=-1.00, time=481.00 stage=laneChange. -Warning: Vehicle 'flow_1.45'; junction collision with vehicle 'flow_0.178', lane=':C_18_0', gap=-1.00, time=485.00 stage=move. -Warning: Vehicle 'flow_1.46'; junction collision with vehicle 'flow_0.195', lane=':C_18_0', gap=-1.00, time=529.50 stage=move. -Warning: Vehicle 'flow_1.46'; junction collision with vehicle 'flow_0.196', lane=':C_18_0', gap=-1.00, time=532.50 stage=move. -Warning: Vehicle 'flow_1.49'; junction collision with vehicle 'flow_0.207', lane=':C_18_0', gap=-1.00, time=561.00 stage=move. -Warning: Vehicle 'flow_1.50'; junction collision with vehicle 'flow_0.208', lane=':C_18_0', gap=-1.00, time=564.00 stage=move. -Warning: Vehicle 'flow_1.52'; junction collision with vehicle 'flow_0.230', lane=':C_18_0', gap=-1.00, time=621.50 stage=move. -Warning: Vehicle 'flow_1.53'; junction collision with vehicle 'flow_0.238', lane=':C_18_0', gap=-1.00, time=645.00 stage=move. -Warning: Vehicle 'flow_1.53'; junction collision with vehicle 'flow_0.239', lane=':C_18_0', gap=-1.00, time=647.50 stage=move. -Warning: Vehicle 'flow_1.54'; junction collision with vehicle 'flow_0.239', lane=':C_15_0', gap=-1.00, time=657.50 stage=move. -Warning: Vehicle 'flow_1.55'; junction collision with vehicle 'flow_0.239', lane=':C_18_0', gap=-1.00, time=715.50 stage=move. -Warning: Vehicle 'flow_1.56'; junction collision with vehicle 'flow_0.273', lane=':C_18_0', gap=-1.00, time=738.00 stage=move. -Warning: Vehicle 'flow_1.57'; junction collision with vehicle 'flow_0.274', lane=':C_18_0', gap=-1.00, time=741.00 stage=move. -Warning: Vehicle 'flow_0.274' performs emergency stop at the end of lane ':C_5_1' because there is no connection to the next edge (decel=-13.24, offset=3.62), time=741.50. -Warning: Vehicle 'flow_0.275'; junction collision with vehicle 'flow_0.274', lane=':C_5_1', gap=-1.06, time=743.50 stage=move. -Warning: Vehicle 'flow_0.280' performs emergency stop at the end of lane 'EC_0' because of a red traffic light (decel=-6.69, offset=0.06), time=754.00. -Warning: Vehicle 'flow_1.63'; junction collision with vehicle 'flow_0.305', lane=':C_18_0', gap=-1.00, time=823.00 stage=move. -Warning: Vehicle 'flow_1.64'; junction collision with vehicle 'flow_0.306', lane=':C_18_0', gap=-1.00, time=826.00 stage=move. -Warning: Vehicle 'flow_1.71'; junction collision with vehicle 'flow_0.339', lane=':C_18_0', gap=-1.00, time=913.00 stage=move. -Warning: Vehicle 'flow_1.71'; junction collision with vehicle 'flow_0.340', lane=':C_18_0', gap=-1.00, time=916.00 stage=move. +Warning: Vehicle 'flow_1.18'; junction collision with vehicle 'flow_0.71', lane=':C_18_0', gap=-1.00, time=199.50 stage=move. +Warning: Vehicle 'flow_1.18'; junction collision with vehicle 'flow_0.72', lane=':C_18_0', gap=-1.00, time=202.00 stage=move. +Warning: Vehicle 'flow_0.73'; junction collision with vehicle 'flow_1.18', lane=':C_5_0', gap=-1.00, time=205.00 stage=move. +Warning: Vehicle 'flow_0.73' performs emergency stop at the end of lane ':C_5_0' because there is no connection to the next edge (decel=-7.14, offset=0.43), time=205.50. +Warning: Vehicle 'flow_1.19'; junction collision with vehicle 'flow_0.94', lane=':C_18_0', gap=-1.00, time=260.00 stage=move. +Warning: Vehicle 'flow_1.19'; junction collision with vehicle 'flow_0.95', lane=':C_18_0', gap=-1.00, time=263.00 stage=move. +Warning: Vehicle 'flow_1.24'; junction collision with vehicle 'flow_0.107', lane=':C_18_0', gap=-1.00, time=295.00 stage=move. +Warning: Vehicle 'flow_0.136'; junction collision with vehicle 'flow_1.31', lane=':C_5_0', gap=-1.00, time=372.50 stage=move. +Warning: Vehicle 'flow_0.136' performs emergency stop at the end of lane ':C_5_0' because there is no connection to the next edge (decel=-15.43, offset=4.80), time=373.00. +Warning: Vehicle 'flow_1.31'; junction collision with vehicle 'flow_0.137', lane=':C_18_0', gap=-1.00, time=375.00 stage=move. +Warning: Vehicle 'flow_1.31'; junction collision with vehicle 'flow_0.138', lane=':C_18_0', gap=-1.00, time=379.50 stage=move. +Warning: Vehicle 'flow_0.145' performs emergency stop at the end of lane 'EC_0' because of a red traffic light (decel=-12.02, offset=3.47), time=393.00. +Warning: Vehicle 'flow_1.32'; junction collision with vehicle 'flow_0.162', lane=':C_18_0', gap=-1.00, time=439.50 stage=move. +Warning: Vehicle 'flow_1.34'; junction collision with vehicle 'flow_0.171', lane=':C_18_0', gap=-1.00, time=465.50 stage=move. +Warning: Vehicle 'flow_1.35'; junction collision with vehicle 'flow_0.172', lane=':C_15_0', gap=-1.00, time=468.00 stage=move. +Warning: Vehicle 'flow_1.34'; junction collision with vehicle 'flow_0.173', lane=':C_18_0', gap=-1.00, time=471.00 stage=move. +Warning: Vehicle 'flow_1.36'; junction collision with vehicle 'flow_0.195', lane=':C_18_0', gap=-1.00, time=529.00 stage=move. +Warning: Vehicle 'flow_1.36'; junction collision with vehicle 'flow_0.196', lane=':C_18_0', gap=-1.00, time=532.00 stage=move. +Warning: Vehicle 'flow_1.40'; junction collision with vehicle 'flow_0.208', lane=':C_18_0', gap=-1.00, time=562.00 stage=move. +Warning: Vehicle 'flow_1.41'; junction collision with vehicle 'flow_0.209', lane=':C_18_0', gap=-1.00, time=565.50 stage=move. +Warning: Vehicle 'flow_0.209' performs emergency stop at the end of lane ':C_5_1' because there is no connection to the next edge (decel=-12.85, offset=3.70), time=566.00. +Warning: Vehicle 'flow_0.210'; junction collision with vehicle 'flow_0.209', lane=':C_5_1', gap=-0.46, time=568.50 stage=move. +Warning: Vehicle 'flow_0.211'; junction collision with vehicle 'flow_1.41', lane=':C_5_0', gap=-1.00, time=572.50 stage=move. +Warning: Vehicle 'flow_1.48'; junction collision with vehicle 'flow_0.239', lane=':C_18_0', gap=-1.00, time=643.50 stage=move. +Warning: Vehicle 'flow_1.49'; junction collision with vehicle 'flow_0.240', lane=':C_18_0', gap=-1.00, time=646.50 stage=move. +Warning: Vehicle 'flow_0.240' performs emergency stop at the end of lane ':C_5_1' because there is no connection to the next edge (decel=-14.55, offset=4.55), time=647.00. +Warning: Vehicle 'flow_1.50'; junction collision with vehicle 'flow_0.264', lane=':C_18_0', gap=-1.00, time=710.00 stage=move. +Warning: Vehicle 'flow_1.50'; junction collision with vehicle 'flow_0.265', lane=':C_18_0', gap=-1.00, time=713.50 stage=move. +Warning: Vehicle 'flow_1.58'; junction collision with vehicle 'flow_0.279', lane=':C_18_0', gap=-1.00, time=749.50 stage=move. +Warning: Vehicle 'flow_1.60' performs emergency stop at the end of lane 'WC_1' because of a red traffic light (decel=-7.73, offset=0.59), time=753.00. +Warning: Vehicle 'flow_1.65'; junction collision with vehicle 'flow_0.306', lane=':C_18_0', gap=-1.00, time=823.00 stage=move. +Warning: Vehicle 'flow_1.66'; junction collision with vehicle 'flow_0.307', lane=':C_15_0', gap=-1.00, time=826.00 stage=move. +Warning: Vehicle 'flow_0.315' performs emergency stop at the end of lane 'EC_0' because of a red traffic light (decel=-9.76, offset=1.12), time=843.50. +Warning: Vehicle 'flow_1.68'; junction collision with vehicle 'flow_0.332', lane=':C_18_0', gap=-1.00, time=889.00 stage=move. +Warning: Vehicle 'flow_1.68'; junction collision with vehicle 'flow_0.333', lane=':C_18_0', gap=-1.00, time=892.00 stage=move. +Warning: Vehicle 'flow_1.71'; junction collision with vehicle 'flow_0.344', lane=':C_18_0', gap=-1.00, time=920.00 stage=move. +Warning: Vehicle 'flow_1.72'; junction collision with vehicle 'flow_0.345', lane=':C_18_0', gap=-1.00, time=923.00 stage=move. diff --git a/tests/sumo/extended/collisions/check_junctions/stoptime_warn/output.sumo b/tests/sumo/extended/collisions/check_junctions/stoptime_warn/output.sumo index a4b1f3ecf5ec..9eb2459d7172 100644 --- a/tests/sumo/extended/collisions/check_junctions/stoptime_warn/output.sumo +++ b/tests/sumo/extended/collisions/check_junctions/stoptime_warn/output.sumo @@ -1,23 +1,23 @@ -Loading net-file from 'net2.net.xml' ... done (4ms). +Loading net-file from 'net2.net.xml' ... done (2ms). Loading done. -Simulation version v1_12_0+1914-2b49265 started with time: 0.00 +Simulation version v1_13_0+0011-a81882c started with time: 0.00 Simulation ended at time: 1000.00 Reason: The final simulation step has been reached. Performance: - Duration: 0.59s - Real time factor: 1703.58 - UPS: 62136.286201 + Duration: 0.45s + Real time factor: 2232.14 + UPS: 80470.982143 Vehicles: - Inserted: 464 (Loaded: 1000) - Running: 19 - Waiting: 536 + Inserted: 466 (Loaded: 1000) + Running: 20 + Waiting: 534 Teleports: 0 (Collisions: 37) -Emergency Stops: 6 +Emergency Stops: 9 Statistics (avg): - RouteLength: 180.27 - Speed: 7.22 - Duration: 40.06 - WaitingTime: 11.55 - TimeLoss: 25.37 - DepartDelay: 148.16 + RouteLength: 180.67 + Speed: 7.36 + Duration: 39.07 + WaitingTime: 10.49 + TimeLoss: 24.35 + DepartDelay: 152.22 diff --git a/tests/sumo/junction_model/indirect_left_turn/internal_junction_controlled_moped/aggregated.sumo b/tests/sumo/junction_model/indirect_left_turn/internal_junction_controlled_moped/aggregated.sumo index 9519f1158afe..0544d24f2a70 100644 --- a/tests/sumo/junction_model/indirect_left_turn/internal_junction_controlled_moped/aggregated.sumo +++ b/tests/sumo/junction_model/indirect_left_turn/internal_junction_controlled_moped/aggregated.sumo @@ -1,6 +1,6 @@ -