Skip to content

Commit

Permalink
adapting test, refs eclipse-sumo#21 eclipse-sumo#7696
Browse files Browse the repository at this point in the history
  • Loading branch information
@behrisch
behrisch committed Oct 17, 2020
1 parent c3b073b commit 0277064
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
20 changes: 10 additions & 10 deletions tests/sumo/extended/state/load_collision_stopped/input_state.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Oct 16 22:00:09 2020 by Eclipse SUMO sumo Version v1_7_0+0582-8fbee7662e
<!-- generated on Sat Oct 17 22:46:09 2020 by Eclipse SUMO sumo Version v1_7_0+0639-1524680f03
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -41,18 +41,18 @@ SPDX-License-Identifier: EPL-2.0
</configuration>
-->

<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_7_0+0582-8fbee7662e" time="50.00">
<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_7_0+0639-1524680f03" time="50.00">
<route id="always_right" state="1" edges="3si 2o"/>
<route id="horizontal" state="1" edges="1si 2o"/>
<flowState id="always_right" index="50"/>
<flowState id="horizontal" index="50"/>
<delay number="26" begin="100" end="0" depart="468.00" time="0.00"/>
<vType id="SUMO_DEFAULT_TYPE" length="3.00" minGap="2.00" maxSpeed="70.00" accel="0.8" decel="4.5" sigma="0"/>
<vehicle id="always_right.0" type="SUMO_DEFAULT_TYPE" depart="0.00" route="always_right" speedFactor="1.00" state="1186 0 1 3.10 0 8.63 49000 1 0" pos="19.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="17.58" endPos="17.58" actualArrival="29.00"/>
<stop lane="2o_0" startPos="17.58" endPos="17.58" duration="30.00" actualArrival="29.00"/>
</vehicle>
<vehicle id="always_right.1" type="SUMO_DEFAULT_TYPE" depart="1.00" route="always_right" speedFactor="1.00" state="1186 4000 1 3.10 0 8.93 49000 1 0" pos="14.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="12.58" endPos="12.58" actualArrival="33.00"/>
<stop lane="2o_0" startPos="12.58" endPos="12.58" duration="34.00" actualArrival="33.00"/>
</vehicle>
<vehicle id="always_right.10" type="SUMO_DEFAULT_TYPE" depart="10.00" route="always_right" speedFactor="1.00" state="1186 40000 0 3.10 0 6.41 49000 0 0" pos="39.10" speed="7.20" posLat="0.00"/>
<vehicle id="always_right.11" type="SUMO_DEFAULT_TYPE" depart="11.00" route="always_right" speedFactor="1.00" state="1186 44000 0 3.10 0 4.14 49000 0 0" pos="15.10" speed="4.00" posLat="0.00"/>
Expand All @@ -65,7 +65,7 @@ SPDX-License-Identifier: EPL-2.0
<vehicle id="always_right.18" type="SUMO_DEFAULT_TYPE" depart="18.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="always_right.19" type="SUMO_DEFAULT_TYPE" depart="19.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="always_right.2" type="SUMO_DEFAULT_TYPE" depart="2.00" route="always_right" speedFactor="1.00" state="1186 8000 1 3.10 0 9.32 49000 1 0" pos="9.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="7.58" endPos="7.58" actualArrival="37.00"/>
<stop lane="2o_0" startPos="7.58" endPos="7.58" duration="38.00" actualArrival="37.00"/>
</vehicle>
<vehicle id="always_right.20" type="SUMO_DEFAULT_TYPE" depart="20.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="always_right.21" type="SUMO_DEFAULT_TYPE" depart="21.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
Expand All @@ -78,7 +78,7 @@ SPDX-License-Identifier: EPL-2.0
<vehicle id="always_right.28" type="SUMO_DEFAULT_TYPE" depart="28.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="always_right.29" type="SUMO_DEFAULT_TYPE" depart="29.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="always_right.3" type="SUMO_DEFAULT_TYPE" depart="3.00" route="always_right" speedFactor="1.00" state="1186 12000 1 3.10 0 8.88 49000 1 0" pos="2.58" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="2.58" endPos="2.58" actualArrival="40.00"/>
<stop lane="2o_0" startPos="2.58" endPos="2.58" duration="41.00" actualArrival="40.00"/>
</vehicle>
<vehicle id="always_right.30" type="SUMO_DEFAULT_TYPE" depart="30.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="always_right.31" type="SUMO_DEFAULT_TYPE" depart="31.00" route="always_right" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
Expand Down Expand Up @@ -107,10 +107,10 @@ SPDX-License-Identifier: EPL-2.0
<vehicle id="always_right.8" type="SUMO_DEFAULT_TYPE" depart="8.00" route="always_right" speedFactor="1.00" state="1186 32000 0 3.10 0 8.19 49000 0 0" pos="125.50" speed="13.60" posLat="0.00"/>
<vehicle id="always_right.9" type="SUMO_DEFAULT_TYPE" depart="9.00" route="always_right" speedFactor="1.00" state="1186 36000 0 3.10 0 7.76 49000 0 0" pos="75.90" speed="10.40" posLat="0.00"/>
<vehicle id="horizontal.0" type="SUMO_DEFAULT_TYPE" depart="0.00" route="horizontal" speedFactor="1.00" state="1186 0 1 3.10 0 9.44 49000 1 0" pos="19.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="19.83" endPos="19.83" actualArrival="30.00"/>
<stop lane="2o_0" startPos="19.83" endPos="19.83" duration="31.00" actualArrival="30.00"/>
</vehicle>
<vehicle id="horizontal.1" type="SUMO_DEFAULT_TYPE" depart="1.00" route="horizontal" speedFactor="1.00" state="1186 4000 1 3.10 0 9.89 49000 1 0" pos="14.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="14.83" endPos="14.83" actualArrival="34.00"/>
<stop lane="2o_0" startPos="14.83" endPos="14.83" duration="35.00" actualArrival="34.00"/>
</vehicle>
<vehicle id="horizontal.10" type="SUMO_DEFAULT_TYPE" depart="10.00" route="horizontal" speedFactor="1.00" state="1186 40000 0 3.10 0 6.41 49000 0 0" pos="39.10" speed="7.20" posLat="0.00"/>
<vehicle id="horizontal.11" type="SUMO_DEFAULT_TYPE" depart="11.00" route="horizontal" speedFactor="1.00" state="1186 44000 0 3.10 0 4.14 49000 0 0" pos="15.10" speed="4.00" posLat="0.00"/>
Expand All @@ -123,7 +123,7 @@ SPDX-License-Identifier: EPL-2.0
<vehicle id="horizontal.18" type="SUMO_DEFAULT_TYPE" depart="18.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="horizontal.19" type="SUMO_DEFAULT_TYPE" depart="19.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="horizontal.2" type="SUMO_DEFAULT_TYPE" depart="2.00" route="horizontal" speedFactor="1.00" state="1186 8000 1 3.10 0 9.32 49000 1 0" pos="9.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="9.83" endPos="9.83" actualArrival="37.00"/>
<stop lane="2o_0" startPos="9.83" endPos="9.83" duration="38.00" actualArrival="37.00"/>
</vehicle>
<vehicle id="horizontal.20" type="SUMO_DEFAULT_TYPE" depart="20.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="horizontal.21" type="SUMO_DEFAULT_TYPE" depart="21.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
Expand All @@ -136,7 +136,7 @@ SPDX-License-Identifier: EPL-2.0
<vehicle id="horizontal.28" type="SUMO_DEFAULT_TYPE" depart="28.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="horizontal.29" type="SUMO_DEFAULT_TYPE" depart="29.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="horizontal.3" type="SUMO_DEFAULT_TYPE" depart="3.00" route="horizontal" speedFactor="1.00" state="1186 12000 1 3.10 0 9.74 49000 1 0" pos="4.83" speed="0.00" posLat="0.00">
<stop lane="2o_0" startPos="4.83" endPos="4.83" actualArrival="41.00"/>
<stop lane="2o_0" startPos="4.83" endPos="4.83" duration="42.00" actualArrival="41.00"/>
</vehicle>
<vehicle id="horizontal.30" type="SUMO_DEFAULT_TYPE" depart="30.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
<vehicle id="horizontal.31" type="SUMO_DEFAULT_TYPE" depart="31.00" route="horizontal" speedFactor="1.00" state="1186 9223372036854775807 0 -1.00 0 0.00 0 0 0" pos="0.00" speed="0.00" posLat="0.00"/>
Expand Down
22 changes: 11 additions & 11 deletions tests/sumo/extended/state/load_collision_stopped/stopinfos.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Oct 16 22:00:09 2020 by Eclipse SUMO sumo Version v1_7_0+0582-8fbee7662e
<!-- generated on Sat Oct 17 22:46:09 2020 by Eclipse SUMO sumo Version v1_7_0+0639-1524680f03
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -42,14 +42,14 @@ SPDX-License-Identifier: EPL-2.0
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="always_right.0" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="19.83" parking="0" started="29.00" ended="79.00" delay="79.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.0" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="19.83" parking="0" started="30.00" ended="80.00" delay="80.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.1" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="14.83" parking="0" started="33.00" ended="83.00" delay="83.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.1" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="14.83" parking="0" started="34.00" ended="84.00" delay="84.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.2" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="9.83" parking="0" started="37.00" ended="87.00" delay="87.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.2" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="9.83" parking="0" started="37.00" ended="87.00" delay="87.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.3" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="2.58" parking="0" started="40.00" ended="90.00" delay="90.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.3" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="4.83" parking="0" started="41.00" ended="91.00" delay="91.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.4" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="2.38" parking="0" started="94.00" ended="144.00" delay="144.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.4" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="0.13" parking="0" started="94.00" ended="144.00" delay="144.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.0" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="19.83" parking="0" started="29.00" ended="79.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.0" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="19.83" parking="0" started="30.00" ended="80.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.1" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="14.83" parking="0" started="33.00" ended="83.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.1" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="14.83" parking="0" started="34.00" ended="84.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.2" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="9.83" parking="0" started="37.00" ended="87.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.2" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="9.83" parking="0" started="37.00" ended="87.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.3" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="2.58" parking="0" started="40.00" ended="90.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.3" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="4.83" parking="0" started="41.00" ended="91.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="horizontal.4" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="2.38" parking="0" started="94.00" ended="144.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
<stopinfo id="always_right.4" type="SUMO_DEFAULT_TYPE" lane="2o_0" pos="0.13" parking="0" started="94.00" ended="144.00" delay="-1.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
Loading

0 comments on commit 0277064

Please sign in to comment.