From bb6da1dbe3c6893cc10a598fec16b89564f54395 Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Fri, 16 Oct 2020 22:37:06 +0200 Subject: [PATCH] adding failing test, refs #21 #7696 --- .../state/load_collision_stopped/errors.sumo | 30 +++ .../input_additional.add.xml | 6 + .../input_routes.rou.xml | 7 + .../load_collision_stopped/input_state.xml | 179 ++++++++++++++++++ .../state/load_collision_stopped/net.net.xml | 155 +++++++++++++++ .../state/load_collision_stopped/options.sumo | 5 + .../state/load_collision_stopped/output.sumo | 17 ++ .../load_collision_stopped/stopinfos.sumo | 55 ++++++ .../state/save_collision_stopped/errors.sumo | 30 +++ .../input_additional.add.xml | 6 + .../input_routes.rou.xml | 7 + .../state/save_collision_stopped/net.net.xml | 155 +++++++++++++++ .../state/save_collision_stopped/options.sumo | 5 + .../state/save_collision_stopped/output.sumo | 17 ++ .../state/save_collision_stopped/state.sumo | 179 ++++++++++++++++++ .../save_collision_stopped/stopinfos.sumo | 55 ++++++ tests/sumo/extended/state/testsuite.sumo | 6 + .../extended/state/updated_loaded_states.sh | 2 +- 18 files changed, 915 insertions(+), 1 deletion(-) create mode 100644 tests/sumo/extended/state/load_collision_stopped/errors.sumo create mode 100644 tests/sumo/extended/state/load_collision_stopped/input_additional.add.xml create mode 100644 tests/sumo/extended/state/load_collision_stopped/input_routes.rou.xml create mode 100644 tests/sumo/extended/state/load_collision_stopped/input_state.xml create mode 100644 tests/sumo/extended/state/load_collision_stopped/net.net.xml create mode 100644 tests/sumo/extended/state/load_collision_stopped/options.sumo create mode 100644 tests/sumo/extended/state/load_collision_stopped/output.sumo create mode 100644 tests/sumo/extended/state/load_collision_stopped/stopinfos.sumo create mode 100644 tests/sumo/extended/state/save_collision_stopped/errors.sumo create mode 100644 tests/sumo/extended/state/save_collision_stopped/input_additional.add.xml create mode 100644 tests/sumo/extended/state/save_collision_stopped/input_routes.rou.xml create mode 100644 tests/sumo/extended/state/save_collision_stopped/net.net.xml create mode 100644 tests/sumo/extended/state/save_collision_stopped/options.sumo create mode 100644 tests/sumo/extended/state/save_collision_stopped/output.sumo create mode 100644 tests/sumo/extended/state/save_collision_stopped/state.sumo create mode 100644 tests/sumo/extended/state/save_collision_stopped/stopinfos.sumo diff --git a/tests/sumo/extended/state/load_collision_stopped/errors.sumo b/tests/sumo/extended/state/load_collision_stopped/errors.sumo new file mode 100644 index 000000000000..0fb08c88bb71 --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/errors.sumo @@ -0,0 +1,30 @@ +Warning: Missing yellow phase in tlLogic '0', program 'freaky' for tl-index 0 when switching to phase 1 +Warning: Vehicle 'always_right.0'; collision with vehicle 'horizontal.0', lane='2o_0', gap=-5.00, time=27.00 stage=move. +Warning: Vehicle 'always_right.1'; collision with vehicle 'horizontal.1', lane='2o_0', gap=-5.00, time=31.00 stage=move. +Warning: Vehicle 'always_right.2'; collision with vehicle 'horizontal.2', lane='2o_0', gap=-5.00, time=35.00 stage=move. +Warning: Vehicle 'always_right.3'; collision with vehicle 'horizontal.3', lane='2o_0', gap=-5.00, time=39.00 stage=move. +Warning: Teleporting vehicle 'always_right.0' after earlier collision, lane='2o_0, time=79.00. +Warning: Vehicle 'always_right.0' teleports beyond arrival edge '2o', time 79.00. +Warning: Teleporting vehicle 'horizontal.0' after earlier collision, lane='2o_0, time=80.00. +Warning: Vehicle 'horizontal.0' teleports beyond arrival edge '2o', time 80.00. +Warning: Teleporting vehicle 'always_right.1' after earlier collision, lane='2o_0, time=83.00. +Warning: Vehicle 'always_right.1' teleports beyond arrival edge '2o', time 83.00. +Warning: Teleporting vehicle 'horizontal.1' after earlier collision, lane='2o_0, time=84.00. +Warning: Vehicle 'horizontal.1' teleports beyond arrival edge '2o', time 84.00. +Warning: Teleporting vehicle 'horizontal.2' after earlier collision, lane='2o_0, time=87.00. +Warning: Vehicle 'horizontal.2' teleports beyond arrival edge '2o', time 87.00. +Warning: Teleporting vehicle 'always_right.2' after earlier collision, lane='2o_0, time=87.00. +Warning: Vehicle 'always_right.2' teleports beyond arrival edge '2o', time 87.00. +Warning: Teleporting vehicle 'always_right.3' after earlier collision, lane='2o_0, time=90.00. +Warning: Vehicle 'always_right.3' teleports beyond arrival edge '2o', time 90.00. +Warning: Teleporting vehicle 'horizontal.3' after earlier collision, lane='2o_0, time=91.00. +Warning: Vehicle 'horizontal.3' teleports beyond arrival edge '2o', time 91.00. +Warning: Vehicle 'always_right.4'; collision with vehicle 'horizontal.4', lane='2o_0', gap=-5.00, time=93.00 stage=move. +Warning: Teleporting vehicle 'horizontal.4' after earlier collision, lane='2o_0, time=144.00. +Warning: Vehicle 'horizontal.4' teleports beyond arrival edge '2o', time 144.00. +Warning: Teleporting vehicle 'always_right.4' after earlier collision, lane='2o_0, time=144.00. +Warning: Vehicle 'always_right.4' teleports beyond arrival edge '2o', time 144.00. +Warning: Teleporting vehicle 'horizontal.5'; waited too long (yield), lane='1si_1', time=447.00. +Warning: Vehicle 'horizontal.5' ends teleporting on edge '2o', time 447.00. +Warning: Teleporting vehicle 'always_right.5'; waited too long (yield), lane='3si_0', time=448.00. +Warning: Vehicle 'always_right.5' ends teleporting on edge '2o', time 448.00. diff --git a/tests/sumo/extended/state/load_collision_stopped/input_additional.add.xml b/tests/sumo/extended/state/load_collision_stopped/input_additional.add.xml new file mode 100644 index 000000000000..1cd69f5c4742 --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/input_additional.add.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/sumo/extended/state/load_collision_stopped/input_routes.rou.xml b/tests/sumo/extended/state/load_collision_stopped/input_routes.rou.xml new file mode 100644 index 000000000000..4c77df4a2770 --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/input_routes.rou.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tests/sumo/extended/state/load_collision_stopped/input_state.xml b/tests/sumo/extended/state/load_collision_stopped/input_state.xml new file mode 100644 index 000000000000..5a7dffc7b46c --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/input_state.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/state/load_collision_stopped/net.net.xml b/tests/sumo/extended/state/load_collision_stopped/net.net.xml new file mode 100644 index 000000000000..6e0b6d3d26db --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/net.net.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/state/load_collision_stopped/options.sumo b/tests/sumo/extended/state/load_collision_stopped/options.sumo new file mode 100644 index 000000000000..8a56a23c1685 --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/options.sumo @@ -0,0 +1,5 @@ +--no-step-log -v --net-file=net.net.xml --additional-files +input_additional.add.xml --route-files input_routes.rou.xml --end 500 +--collision.stoptime 50 --default.emergencydecel decel +--load-state input_state.xml +--stop-output stopinfos.xml \ No newline at end of file diff --git a/tests/sumo/extended/state/load_collision_stopped/output.sumo b/tests/sumo/extended/state/load_collision_stopped/output.sumo new file mode 100644 index 000000000000..9b311309abbb --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/output.sumo @@ -0,0 +1,17 @@ +Loading net-file from 'net.net.xml' ... done (2ms). +Loading additional-files from 'input_additional.add.xml' ... +done (1ms). +Loading done. +Simulation version v1_7_0+0582-8fbee7662e started with time: 0.00 +Simulation ended at time: 500.00 +Reason: The final simulation step has been reached. +Performance: + Duration: 0.22s + Real time factor: 2314.81 + UPS: 224824.074074 +Vehicles: + Inserted: 160 (Loaded: 1000) + Running: 148 + Waiting: 840 +Teleports: 7 (Collisions: 5, Yield: 2) + diff --git a/tests/sumo/extended/state/load_collision_stopped/stopinfos.sumo b/tests/sumo/extended/state/load_collision_stopped/stopinfos.sumo new file mode 100644 index 000000000000..490f5a36bb30 --- /dev/null +++ b/tests/sumo/extended/state/load_collision_stopped/stopinfos.sumo @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/state/save_collision_stopped/errors.sumo b/tests/sumo/extended/state/save_collision_stopped/errors.sumo new file mode 100644 index 000000000000..0fb08c88bb71 --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/errors.sumo @@ -0,0 +1,30 @@ +Warning: Missing yellow phase in tlLogic '0', program 'freaky' for tl-index 0 when switching to phase 1 +Warning: Vehicle 'always_right.0'; collision with vehicle 'horizontal.0', lane='2o_0', gap=-5.00, time=27.00 stage=move. +Warning: Vehicle 'always_right.1'; collision with vehicle 'horizontal.1', lane='2o_0', gap=-5.00, time=31.00 stage=move. +Warning: Vehicle 'always_right.2'; collision with vehicle 'horizontal.2', lane='2o_0', gap=-5.00, time=35.00 stage=move. +Warning: Vehicle 'always_right.3'; collision with vehicle 'horizontal.3', lane='2o_0', gap=-5.00, time=39.00 stage=move. +Warning: Teleporting vehicle 'always_right.0' after earlier collision, lane='2o_0, time=79.00. +Warning: Vehicle 'always_right.0' teleports beyond arrival edge '2o', time 79.00. +Warning: Teleporting vehicle 'horizontal.0' after earlier collision, lane='2o_0, time=80.00. +Warning: Vehicle 'horizontal.0' teleports beyond arrival edge '2o', time 80.00. +Warning: Teleporting vehicle 'always_right.1' after earlier collision, lane='2o_0, time=83.00. +Warning: Vehicle 'always_right.1' teleports beyond arrival edge '2o', time 83.00. +Warning: Teleporting vehicle 'horizontal.1' after earlier collision, lane='2o_0, time=84.00. +Warning: Vehicle 'horizontal.1' teleports beyond arrival edge '2o', time 84.00. +Warning: Teleporting vehicle 'horizontal.2' after earlier collision, lane='2o_0, time=87.00. +Warning: Vehicle 'horizontal.2' teleports beyond arrival edge '2o', time 87.00. +Warning: Teleporting vehicle 'always_right.2' after earlier collision, lane='2o_0, time=87.00. +Warning: Vehicle 'always_right.2' teleports beyond arrival edge '2o', time 87.00. +Warning: Teleporting vehicle 'always_right.3' after earlier collision, lane='2o_0, time=90.00. +Warning: Vehicle 'always_right.3' teleports beyond arrival edge '2o', time 90.00. +Warning: Teleporting vehicle 'horizontal.3' after earlier collision, lane='2o_0, time=91.00. +Warning: Vehicle 'horizontal.3' teleports beyond arrival edge '2o', time 91.00. +Warning: Vehicle 'always_right.4'; collision with vehicle 'horizontal.4', lane='2o_0', gap=-5.00, time=93.00 stage=move. +Warning: Teleporting vehicle 'horizontal.4' after earlier collision, lane='2o_0, time=144.00. +Warning: Vehicle 'horizontal.4' teleports beyond arrival edge '2o', time 144.00. +Warning: Teleporting vehicle 'always_right.4' after earlier collision, lane='2o_0, time=144.00. +Warning: Vehicle 'always_right.4' teleports beyond arrival edge '2o', time 144.00. +Warning: Teleporting vehicle 'horizontal.5'; waited too long (yield), lane='1si_1', time=447.00. +Warning: Vehicle 'horizontal.5' ends teleporting on edge '2o', time 447.00. +Warning: Teleporting vehicle 'always_right.5'; waited too long (yield), lane='3si_0', time=448.00. +Warning: Vehicle 'always_right.5' ends teleporting on edge '2o', time 448.00. diff --git a/tests/sumo/extended/state/save_collision_stopped/input_additional.add.xml b/tests/sumo/extended/state/save_collision_stopped/input_additional.add.xml new file mode 100644 index 000000000000..1cd69f5c4742 --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/input_additional.add.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/sumo/extended/state/save_collision_stopped/input_routes.rou.xml b/tests/sumo/extended/state/save_collision_stopped/input_routes.rou.xml new file mode 100644 index 000000000000..4c77df4a2770 --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/input_routes.rou.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/tests/sumo/extended/state/save_collision_stopped/net.net.xml b/tests/sumo/extended/state/save_collision_stopped/net.net.xml new file mode 100644 index 000000000000..6e0b6d3d26db --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/net.net.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/state/save_collision_stopped/options.sumo b/tests/sumo/extended/state/save_collision_stopped/options.sumo new file mode 100644 index 000000000000..36900e8da4b5 --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/options.sumo @@ -0,0 +1,5 @@ +--no-step-log -v --net-file=net.net.xml --additional-files +input_additional.add.xml --route-files input_routes.rou.xml --end 500 +--collision.stoptime 50 --default.emergencydecel decel +--save-state.times 50 --save-state.files state.xml +--stop-output stopinfos.xml \ No newline at end of file diff --git a/tests/sumo/extended/state/save_collision_stopped/output.sumo b/tests/sumo/extended/state/save_collision_stopped/output.sumo new file mode 100644 index 000000000000..9b311309abbb --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/output.sumo @@ -0,0 +1,17 @@ +Loading net-file from 'net.net.xml' ... done (2ms). +Loading additional-files from 'input_additional.add.xml' ... +done (1ms). +Loading done. +Simulation version v1_7_0+0582-8fbee7662e started with time: 0.00 +Simulation ended at time: 500.00 +Reason: The final simulation step has been reached. +Performance: + Duration: 0.22s + Real time factor: 2314.81 + UPS: 224824.074074 +Vehicles: + Inserted: 160 (Loaded: 1000) + Running: 148 + Waiting: 840 +Teleports: 7 (Collisions: 5, Yield: 2) + diff --git a/tests/sumo/extended/state/save_collision_stopped/state.sumo b/tests/sumo/extended/state/save_collision_stopped/state.sumo new file mode 100644 index 000000000000..5a7dffc7b46c --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/state.sumo @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/state/save_collision_stopped/stopinfos.sumo b/tests/sumo/extended/state/save_collision_stopped/stopinfos.sumo new file mode 100644 index 000000000000..490f5a36bb30 --- /dev/null +++ b/tests/sumo/extended/state/save_collision_stopped/stopinfos.sumo @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + diff --git a/tests/sumo/extended/state/testsuite.sumo b/tests/sumo/extended/state/testsuite.sumo index 2ec086248dc3..e8010d5a4039 100644 --- a/tests/sumo/extended/state/testsuite.sumo +++ b/tests/sumo/extended/state/testsuite.sumo @@ -88,6 +88,12 @@ save_stopped # the input is taken from test save/save_stopped/state.sumo load_stopped +# save a vehicle stooped due to collision +save_collision_stopped + +# the input is taken from test save_collision_stopped/state.sumo +load_collision_stopped + # load a vehicle that arrives in the first step (see #2938) # the input is regenerated by running saveState.sumocfg load_arriving diff --git a/tests/sumo/extended/state/updated_loaded_states.sh b/tests/sumo/extended/state/updated_loaded_states.sh index e734d990f705..5c539eec7169 100755 --- a/tests/sumo/extended/state/updated_loaded_states.sh +++ b/tests/sumo/extended/state/updated_loaded_states.sh @@ -28,7 +28,7 @@ for f in flow parking parking_busStop stopped cyclic_stops rng routeDistribution cp save_$f/state.sumo.meso load_$f/input_meso_state.xml done -for f in rail_signal on_rail_signal rail_signal_constraint; do +for f in rail_signal on_rail_signal rail_signal_constraint collision_stopped; do cp save_$f/state.sumo load_$f/input_state.xml done