From c55738c327f61a49fca30f509c34db61f156a0f4 Mon Sep 17 00:00:00 2001 From: namdre Date: Wed, 21 Feb 2024 09:16:48 +0100 Subject: [PATCH] restored missing sumo tests refs #21, #14376 --- tests/sumo/bugs/2xxx/testsuite.sumo | 3 + tests/sumo/bugs/2xxx/ticket2177/fcd.sumo | 160 ++++++++-------- .../app_opp_early_end/all_cps/bt.sumo | 29 ++- .../app_opp_early_end/all_cps/tripinfos.sumo | 19 +- .../app_opp_early_end/one_cp/bt.sumo | 25 ++- .../app_opp_early_end/one_cp/tripinfos.sumo | 19 +- .../devices/bt/functionality/testsuite.sumo | 1 + .../app_opp_early_end/all_cps/bt.sumo | 29 ++- .../app_opp_early_end/all_cps/tripinfos.sumo | 19 +- .../app_opp_early_end/one_cp/bt.sumo | 25 ++- .../app_opp_early_end/one_cp/tripinfos.sumo | 19 +- .../devices/bt/pedestrians/testsuite.sumo | 1 + .../personTrip/carNoRoute/errors.sumo | 3 - .../personTrip/carNoRoute/exitcode.sumo | 1 - .../personTrip/carNoRoute/vehroutes.sumo | 38 +++- .../rerouting/personTrip/testsuite.sumo | 1 + tests/sumo/devices/ssm/testsuite.sumo | 1 + tests/sumo/errors/testsuite.sumo | 1 + .../errors.sumo | 2 +- .../closing_disallows_dest/errors.sumo | 4 +- .../closing_disallows_dest/vehroutes.sumo | 15 +- .../frustration_100/stopinfos.sumo | 108 +++++------ .../parkingSearch/knowledge_1/output.sumo | 10 +- .../parkingSearch/knowledge_1/stopinfos.sumo | 31 ++-- .../parkingSearch/knowledge_1/vehroutes.sumo | 108 ++++++----- .../parking/parkingSearch/testsuite.sumo | 2 + tests/sumo/extended/rerouter/testsuite.sumo | 2 + tests/sumo/gui/visualization/testsuite.sumo | 1 + tests/sumo/lc_model/bugs/testsuite.sumo | 1 + .../examples/straight1/straight1.edg.xml | 19 -- .../examples/straight1/straight1.net.xml | 173 ------------------ .../examples/straight1/straight1.netccfg | 21 --- .../examples/straight1/straight1.nod.xml | 19 -- .../examples/straight1/straight1.rou.xml | 5 - .../straight1_induct_loops_1.add.xml | 16 -- .../straight1_induct_loops_1.sumocfg | 18 -- .../straight1_induct_loops_10.add.xml | 16 -- .../straight1_induct_loops_10.sumocfg | 18 -- .../straight1_induct_loops_60.add.xml | 16 -- .../straight1_induct_loops_60.sumocfg | 18 -- .../straight1_induct_loops_600.add.xml | 16 -- .../straight1_induct_loops_600.sumocfg | 18 -- .../straight1/straight1_no_output.sumocfg | 17 -- tests/sumo/output/fcd-output/testsuite.sumo | 2 + tests/sumo/output/vehroutes/testsuite.sumo | 1 + .../output.sumo | 26 +-- .../sublane_model/junction/testsuite.sumo | 1 + .../noTraffic/earliestEnd2/output.sumo | 8 +- .../earliestEnd2/tls_state_switch.sumo | 73 ++------ .../coordination/noTraffic/testsuite.sumo | 1 + 50 files changed, 463 insertions(+), 717 deletions(-) delete mode 100644 tests/sumo/devices/rerouting/personTrip/carNoRoute/exitcode.sumo delete mode 100644 tests/sumo/output/examples/straight1/straight1.edg.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1.net.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1.netccfg delete mode 100644 tests/sumo/output/examples/straight1/straight1.nod.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1.rou.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_1.add.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_1.sumocfg delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_10.add.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_10.sumocfg delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_60.add.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_60.sumocfg delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_600.add.xml delete mode 100644 tests/sumo/output/examples/straight1/straight1_induct_loops_600.sumocfg delete mode 100644 tests/sumo/output/examples/straight1/straight1_no_output.sumocfg diff --git a/tests/sumo/bugs/2xxx/testsuite.sumo b/tests/sumo/bugs/2xxx/testsuite.sumo index c967fe906a37..5860d24a3f27 100644 --- a/tests/sumo/bugs/2xxx/testsuite.sumo +++ b/tests/sumo/bugs/2xxx/testsuite.sumo @@ -38,3 +38,6 @@ ticket2834 ticket2995 ticket2996 ticket2996b +ticket2170 +ticket2177 +ticket2194 diff --git a/tests/sumo/bugs/2xxx/ticket2177/fcd.sumo b/tests/sumo/bugs/2xxx/ticket2177/fcd.sumo index 32ee489c661a..bc13bb3d04b8 100644 --- a/tests/sumo/bugs/2xxx/ticket2177/fcd.sumo +++ b/tests/sumo/bugs/2xxx/ticket2177/fcd.sumo @@ -1,11 +1,16 @@ - - + diff --git a/tests/sumo/devices/bt/functionality/app_opp_early_end/one_cp/bt.sumo b/tests/sumo/devices/bt/functionality/app_opp_early_end/one_cp/bt.sumo index 04755830dd5e..a0309b490b1f 100644 --- a/tests/sumo/devices/bt/functionality/app_opp_early_end/one_cp/bt.sumo +++ b/tests/sumo/devices/bt/functionality/app_opp_early_end/one_cp/bt.sumo @@ -1,11 +1,16 @@ - - + diff --git a/tests/sumo/devices/bt/functionality/testsuite.sumo b/tests/sumo/devices/bt/functionality/testsuite.sumo index fe4efa422c81..f2b1f04b9738 100644 --- a/tests/sumo/devices/bt/functionality/testsuite.sumo +++ b/tests/sumo/devices/bt/functionality/testsuite.sumo @@ -7,3 +7,4 @@ comm_test_left_receiver comm_test_right_receiver # as approaching_opposite, but the simulationends before the vehicles leave the net +app_opp_early_end diff --git a/tests/sumo/devices/bt/pedestrians/app_opp_early_end/all_cps/bt.sumo b/tests/sumo/devices/bt/pedestrians/app_opp_early_end/all_cps/bt.sumo index 05147b3332d5..2fe2750e70f4 100644 --- a/tests/sumo/devices/bt/pedestrians/app_opp_early_end/all_cps/bt.sumo +++ b/tests/sumo/devices/bt/pedestrians/app_opp_early_end/all_cps/bt.sumo @@ -1,11 +1,16 @@ - - + diff --git a/tests/sumo/devices/bt/pedestrians/app_opp_early_end/one_cp/bt.sumo b/tests/sumo/devices/bt/pedestrians/app_opp_early_end/one_cp/bt.sumo index 04755830dd5e..a0309b490b1f 100644 --- a/tests/sumo/devices/bt/pedestrians/app_opp_early_end/one_cp/bt.sumo +++ b/tests/sumo/devices/bt/pedestrians/app_opp_early_end/one_cp/bt.sumo @@ -1,11 +1,16 @@ - - + diff --git a/tests/sumo/devices/bt/pedestrians/testsuite.sumo b/tests/sumo/devices/bt/pedestrians/testsuite.sumo index 4da2ceb0cc62..343d2bea6bcc 100644 --- a/tests/sumo/devices/bt/pedestrians/testsuite.sumo +++ b/tests/sumo/devices/bt/pedestrians/testsuite.sumo @@ -9,3 +9,4 @@ comm_test_right_receiver multimodal # as approaching_opposite, but the simulationends before the vehicles leave the net +app_opp_early_end diff --git a/tests/sumo/devices/rerouting/personTrip/carNoRoute/errors.sumo b/tests/sumo/devices/rerouting/personTrip/carNoRoute/errors.sumo index 49654b8be3ac..e69de29bb2d1 100644 --- a/tests/sumo/devices/rerouting/personTrip/carNoRoute/errors.sumo +++ b/tests/sumo/devices/rerouting/personTrip/carNoRoute/errors.sumo @@ -1,3 +0,0 @@ -Error: No connection between edge 'end' and edge 'beg' found. -Error: No route for trip in person 'p1'. -Quitting (on error). diff --git a/tests/sumo/devices/rerouting/personTrip/carNoRoute/exitcode.sumo b/tests/sumo/devices/rerouting/personTrip/carNoRoute/exitcode.sumo deleted file mode 100644 index d00491fd7e5b..000000000000 --- a/tests/sumo/devices/rerouting/personTrip/carNoRoute/exitcode.sumo +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/sumo/devices/rerouting/personTrip/carNoRoute/vehroutes.sumo b/tests/sumo/devices/rerouting/personTrip/carNoRoute/vehroutes.sumo index 0bb49c992f9a..d3b9913a64bf 100644 --- a/tests/sumo/devices/rerouting/personTrip/carNoRoute/vehroutes.sumo +++ b/tests/sumo/devices/rerouting/personTrip/carNoRoute/vehroutes.sumo @@ -1,22 +1,33 @@ - - - + + + + + + + + + - - + + + + diff --git a/tests/sumo/devices/rerouting/personTrip/testsuite.sumo b/tests/sumo/devices/rerouting/personTrip/testsuite.sumo index 84231196b375..4ef942a596aa 100644 --- a/tests/sumo/devices/rerouting/personTrip/testsuite.sumo +++ b/tests/sumo/devices/rerouting/personTrip/testsuite.sumo @@ -183,4 +183,5 @@ toJunction_twice # trip between identical stops sameStops +carNoRoute errors diff --git a/tests/sumo/devices/ssm/testsuite.sumo b/tests/sumo/devices/ssm/testsuite.sumo index 3d565ca54894..47d249132d51 100644 --- a/tests/sumo/devices/ssm/testsuite.sumo +++ b/tests/sumo/devices/ssm/testsuite.sumo @@ -29,3 +29,4 @@ recurrent_net geo_coords bugs errors +more_cases_TODO diff --git a/tests/sumo/errors/testsuite.sumo b/tests/sumo/errors/testsuite.sumo index 659768e943b7..67ddae67118a 100644 --- a/tests/sumo/errors/testsuite.sumo +++ b/tests/sumo/errors/testsuite.sumo @@ -69,3 +69,4 @@ invalid_color_name # test for #5875 empty_line parkingArea_noCapacity +missing_first_param diff --git a/tests/sumo/extended/rerouter/closing_disallow_misleading_alternative/errors.sumo b/tests/sumo/extended/rerouter/closing_disallow_misleading_alternative/errors.sumo index 7f9eed9835db..fce615b6ed71 100644 --- a/tests/sumo/extended/rerouter/closing_disallow_misleading_alternative/errors.sumo +++ b/tests/sumo/extended/rerouter/closing_disallow_misleading_alternative/errors.sumo @@ -1,2 +1,2 @@ -Warning: No connection between 'beg2' and 'end' found. +Warning: No connection between edge 'beg2' and edge 'end' found. Warning: No route for vehicle 'veh0' found. diff --git a/tests/sumo/extended/rerouter/closing_disallows_dest/errors.sumo b/tests/sumo/extended/rerouter/closing_disallows_dest/errors.sumo index 13a8eb1d49b4..9391515e078f 100644 --- a/tests/sumo/extended/rerouter/closing_disallows_dest/errors.sumo +++ b/tests/sumo/extended/rerouter/closing_disallows_dest/errors.sumo @@ -1,2 +1,4 @@ -Warning: No connection between 'beg2left' and 'left' found. +Warning: Vehicle 'veh0' is not allowed on destination edge 'left'. +Warning: No route for vehicle 'veh0' found. +Warning: Vehicle 'veh1' is not allowed on destination edge 'left'. Warning: No route for vehicle 'veh1' found. diff --git a/tests/sumo/extended/rerouter/closing_disallows_dest/vehroutes.sumo b/tests/sumo/extended/rerouter/closing_disallows_dest/vehroutes.sumo index 71284a0b1312..a64101f4c043 100644 --- a/tests/sumo/extended/rerouter/closing_disallows_dest/vehroutes.sumo +++ b/tests/sumo/extended/rerouter/closing_disallows_dest/vehroutes.sumo @@ -1,11 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/output.sumo b/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/output.sumo index 8112c32675a0..a4b6a3de3d6b 100644 --- a/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/output.sumo +++ b/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/output.sumo @@ -1,12 +1,12 @@ -Loading net-file from 'net.net.xml' ... done (11ms). +Loading net-file from 'net.net.xml' ... done (15ms). Loading additional-files from 'input_additional.add.xml' ... done (1ms). -Loading additional-files from 'input_additional2.add.xml' ... done (2ms). +Loading additional-files from 'input_additional2.add.xml' ... done (4ms). Loading additional-files from 'input_additional3.add.xml' ... done (0ms). Loading done. -Simulation version v1_11_0+0155-d22fc9b started with time: 0.00. +Simulation version v1_19_0+0923-33f5cfd started with time: 0.00. Simulation ended at time: 500.00 Reason: The final simulation step has been reached. -Statistics (avg): +Statistics (avg of 10): RouteLength: 596.88 Speed: 1.22 Duration: 491.00 @@ -18,7 +18,7 @@ Statistics (avg): DijkstraRouter answered 90 queries and explored 22.70 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). DijkstraRouter answered 32 queries and explored 27.62 edges on average. -DijkstraRouter spent 0.00s answering queries (0.00ms on average). +DijkstraRouter spent 0.00s answering queries (0.03ms on average). DijkstraRouter answered 12 queries and explored 32.00 edges on average. DijkstraRouter spent 0.00s answering queries (0.00ms on average). DijkstraRouter answered 24 queries and explored 26.62 edges on average. diff --git a/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/stopinfos.sumo b/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/stopinfos.sumo index 8fdf2410cca2..2aeebf76e46f 100644 --- a/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/stopinfos.sumo +++ b/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/stopinfos.sumo @@ -1,11 +1,16 @@ - - - - - - - - - - - + + + + + + + + + + diff --git a/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/vehroutes.sumo b/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/vehroutes.sumo index aec6fec36518..d4a0600e533e 100644 --- a/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/vehroutes.sumo +++ b/tests/sumo/extended/rerouter/parking/parkingSearch/knowledge_1/vehroutes.sumo @@ -1,11 +1,16 @@ - - + + - - + + + + + + - - + + + + + + - + - - + + + + - + - - + + + + - + - - - - + + + + + + - + - - - - + + + + + + - + - - - + + + + + - + - - - - - + + + + + + + - + - - - - - + + + + + + + diff --git a/tests/sumo/extended/rerouter/parking/parkingSearch/testsuite.sumo b/tests/sumo/extended/rerouter/parking/parkingSearch/testsuite.sumo index 57c4facfec0a..9e226f168c58 100644 --- a/tests/sumo/extended/rerouter/parking/parkingSearch/testsuite.sumo +++ b/tests/sumo/extended/rerouter/parking/parkingSearch/testsuite.sumo @@ -42,3 +42,5 @@ opposite2 # the current target parkingArea should always be visible while the ego vehicle is on the parkingArea edge regardless of inclusion in the parkingAreaReroute alternatives. implicit_visibility +frustration_100 +knowledge_1 diff --git a/tests/sumo/extended/rerouter/testsuite.sumo b/tests/sumo/extended/rerouter/testsuite.sumo index 5ae63eb0b8b6..cf39dcc12469 100644 --- a/tests/sumo/extended/rerouter/testsuite.sumo +++ b/tests/sumo/extended/rerouter/testsuite.sumo @@ -80,3 +80,5 @@ use_routing_device # using the same id twice duplicate_id destProb +closing_disallow_misleading_alternative +closing_disallows_dest diff --git a/tests/sumo/gui/visualization/testsuite.sumo b/tests/sumo/gui/visualization/testsuite.sumo index bca72d7c1687..a49c391ba665 100644 --- a/tests/sumo/gui/visualization/testsuite.sumo +++ b/tests/sumo/gui/visualization/testsuite.sumo @@ -31,3 +31,4 @@ img_formats # aircraft visualisation / reversing aircraft +paradeOSG diff --git a/tests/sumo/lc_model/bugs/testsuite.sumo b/tests/sumo/lc_model/bugs/testsuite.sumo index 5bb2f215ead8..8f5b9f7a55b7 100644 --- a/tests/sumo/lc_model/bugs/testsuite.sumo +++ b/tests/sumo/lc_model/bugs/testsuite.sumo @@ -40,3 +40,4 @@ ticket12108 # counter lane change deadlock at busstop ticket12320 +ticket11468 diff --git a/tests/sumo/output/examples/straight1/straight1.edg.xml b/tests/sumo/output/examples/straight1/straight1.edg.xml deleted file mode 100644 index b0775cf6088b..000000000000 --- a/tests/sumo/output/examples/straight1/straight1.edg.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1.net.xml b/tests/sumo/output/examples/straight1/straight1.net.xml deleted file mode 100644 index 9d1a66c37d1a..000000000000 --- a/tests/sumo/output/examples/straight1/straight1.net.xml +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1.netccfg b/tests/sumo/output/examples/straight1/straight1.netccfg deleted file mode 100644 index 85b99e0920bb..000000000000 --- a/tests/sumo/output/examples/straight1/straight1.netccfg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1.nod.xml b/tests/sumo/output/examples/straight1/straight1.nod.xml deleted file mode 100644 index ee6bf76706ed..000000000000 --- a/tests/sumo/output/examples/straight1/straight1.nod.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1.rou.xml b/tests/sumo/output/examples/straight1/straight1.rou.xml deleted file mode 100644 index 666808d6b4ff..000000000000 --- a/tests/sumo/output/examples/straight1/straight1.rou.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_1.add.xml b/tests/sumo/output/examples/straight1/straight1_induct_loops_1.add.xml deleted file mode 100644 index 4c1f090326b3..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_1.add.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_1.sumocfg b/tests/sumo/output/examples/straight1/straight1_induct_loops_1.sumocfg deleted file mode 100644 index 6f278da3005c..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_1.sumocfg +++ /dev/null @@ -1,18 +0,0 @@ - - - - straight1.net.xml - straight1.rou.xml - straight1_induct_loops_1.add.xml - - - - - - true - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_10.add.xml b/tests/sumo/output/examples/straight1/straight1_induct_loops_10.add.xml deleted file mode 100644 index 4913ffc1643e..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_10.add.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_10.sumocfg b/tests/sumo/output/examples/straight1/straight1_induct_loops_10.sumocfg deleted file mode 100644 index eeb93ed3fcb2..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_10.sumocfg +++ /dev/null @@ -1,18 +0,0 @@ - - - - straight1.net.xml - straight1.rou.xml - straight1_induct_loops_10.add.xml - - - - - - true - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_60.add.xml b/tests/sumo/output/examples/straight1/straight1_induct_loops_60.add.xml deleted file mode 100644 index dd62e2eee487..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_60.add.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_60.sumocfg b/tests/sumo/output/examples/straight1/straight1_induct_loops_60.sumocfg deleted file mode 100644 index ca6aec13472f..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_60.sumocfg +++ /dev/null @@ -1,18 +0,0 @@ - - - - straight1.net.xml - straight1.rou.xml - straight1_induct_loops_60.add.xml - - - - - - true - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_600.add.xml b/tests/sumo/output/examples/straight1/straight1_induct_loops_600.add.xml deleted file mode 100644 index c8da9057b59e..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_600.add.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/tests/sumo/output/examples/straight1/straight1_induct_loops_600.sumocfg b/tests/sumo/output/examples/straight1/straight1_induct_loops_600.sumocfg deleted file mode 100644 index d31c821f3ed9..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_induct_loops_600.sumocfg +++ /dev/null @@ -1,18 +0,0 @@ - - - - straight1.net.xml - straight1.rou.xml - straight1_induct_loops_600.add.xml - - - - - - true - - - diff --git a/tests/sumo/output/examples/straight1/straight1_no_output.sumocfg b/tests/sumo/output/examples/straight1/straight1_no_output.sumocfg deleted file mode 100644 index 104ad1ec58d3..000000000000 --- a/tests/sumo/output/examples/straight1/straight1_no_output.sumocfg +++ /dev/null @@ -1,17 +0,0 @@ - - - - straight1.net.xml - straight1.rou.xml - - - - - - true - - - diff --git a/tests/sumo/output/fcd-output/testsuite.sumo b/tests/sumo/output/fcd-output/testsuite.sumo index 1047f914ac79..7250dde20f73 100644 --- a/tests/sumo/output/fcd-output/testsuite.sumo +++ b/tests/sumo/output/fcd-output/testsuite.sumo @@ -72,3 +72,5 @@ all_attributes # filter output with shape shape_filter +begin +period_begin diff --git a/tests/sumo/output/vehroutes/testsuite.sumo b/tests/sumo/output/vehroutes/testsuite.sumo index 488be7c0db70..a257c63e00a4 100644 --- a/tests/sumo/output/vehroutes/testsuite.sumo +++ b/tests/sumo/output/vehroutes/testsuite.sumo @@ -116,3 +116,4 @@ auto_trip # Testing error cases errors +write_unfinished_stops diff --git a/tests/sumo/sublane_model/junction/overlapping_internal_wrongAlignment/output.sumo b/tests/sumo/sublane_model/junction/overlapping_internal_wrongAlignment/output.sumo index 5a464b3ee187..4f2f963e2d21 100644 --- a/tests/sumo/sublane_model/junction/overlapping_internal_wrongAlignment/output.sumo +++ b/tests/sumo/sublane_model/junction/overlapping_internal_wrongAlignment/output.sumo @@ -1,23 +1,23 @@ Loading net-file from 'net.net.xml' ... done (1ms). Loading done. -Simulation version v1_5_0+0044-350a1d3618 started with time: 0.00. -Simulation ended at time: 228.00 +Simulation version v1_19_0+0923-33f5cfd started with time: 0.00. +Simulation ended at time: 283.00 Reason: All vehicles have left the simulation. Performance: - Duration: 84ms - Real time factor: 2714.29 - UPS: 54821.428571 + Duration: 0.09s + Real time factor: 3010.64 + UPS: 61723.404255 Vehicles: Inserted: 106 Running: 0 Waiting: 0 -Statistics (avg): +Statistics (avg of 106): RouteLength: 195.68 - Speed: 5.16 - Duration: 43.44 - WaitingTime: 6.99 - TimeLoss: 28.59 - DepartDelay: 32.70 + Speed: 4.31 + Duration: 54.73 + WaitingTime: 10.81 + TimeLoss: 39.90 + DepartDelay: 48.81 -DijkstraRouter answered 127 queries and explored 2.46 edges on average. -DijkstraRouter spent 0ms answering queries (0.00ms on average). +DijkstraRouter answered 147 queries and explored 2.47 edges on average. +DijkstraRouter spent 0.00s answering queries (0.00ms on average). diff --git a/tests/sumo/sublane_model/junction/testsuite.sumo b/tests/sumo/sublane_model/junction/testsuite.sumo index 06c50dae04be..a25fe31242ab 100644 --- a/tests/sumo/sublane_model/junction/testsuite.sumo +++ b/tests/sumo/sublane_model/junction/testsuite.sumo @@ -53,3 +53,4 @@ indirect_left_moped # see #11467 width_change +overlapping_internal_wrongAlignment diff --git a/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/output.sumo b/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/output.sumo index 6b026811f22d..c838545137ba 100644 --- a/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/output.sumo +++ b/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/output.sumo @@ -1,11 +1,11 @@ -Loading net-file from 'net.net.xml' ... done (11ms). -Loading additional-files from 'input_additional.add.xml' ... done (1ms). +Loading net-file from 'net.net.xml' ... done (9ms). +Loading additional-files from 'input_additional.add.xml' ... done (0ms). Loading additional-files from 'input_additional2.add.xml' ... done (0ms). Loading done. -Simulation version v1_11_0+0403-0176cbb started with time: 0.00. +Simulation version v1_19_0+0923-33f5cfd started with time: 0.00. Simulation ended at time: 300.00 Reason: The final simulation step has been reached. -Statistics (avg): +Statistics (avg of 0): RouteLength: 0.00 Speed: 0.00 Duration: 0.00 diff --git a/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/tls_state_switch.sumo b/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/tls_state_switch.sumo index d008c529c634..20019976af63 100644 --- a/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/tls_state_switch.sumo +++ b/tests/sumo/tls/delay_based/coordination/noTraffic/earliestEnd2/tls_state_switch.sumo @@ -1,11 +1,16 @@ -