Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
218 additions
and
0 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
tests/complex/state/save_rail_signal_approach_steplength/errors.complex
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| /scr1/sumo/tools/sumolib/net/__init__.py:34: ImportWarning: Not importing directory '/home/erdm_ja/scr1/sumo/tests/complex/state/xml': missing __init__.py | ||
| from xml.sax import handler, parse | ||
| Warning: Value of tau=1.00 in vehicle type 'train' lower than simulation step size may cause collisions. |
8 changes: 8 additions & 0 deletions
8
tests/complex/state/save_rail_signal_approach_steplength/input_routes.rou.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd"> | ||
| <vType id="train" vClass="rail" length="20" accel="2"/> | ||
| <vehicle id="train" type="train" depart="2" departSpeed="max"> | ||
| <route edges="a b e"/> | ||
| </vehicle> | ||
| </routes> |
134 changes: 134 additions & 0 deletions
134
tests/complex/state/save_rail_signal_approach_steplength/net.net.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on Mon 24 Aug 2020 02:41:05 PM CEST by Eclipse SUMO netedit Version v1_6_0+1739-1f7f00f504 | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd"> | ||
| <input> | ||
| <sumo-net-file value="net.net.xml"/> | ||
| </input> | ||
| <output> | ||
| <output-file value="net.net.xml"/> | ||
| </output> | ||
| <processing> | ||
| <geometry.min-radius.fix.railways value="false"/> | ||
| <geometry.max-grade.fix value="false"/> | ||
| <offset.disable-normalization value="true"/> | ||
| <lefthand value="false"/> | ||
| </processing> | ||
| <junctions> | ||
| <no-turnarounds value="true"/> | ||
| <junctions.corner-detail value="0"/> | ||
| <junctions.limit-turn-speed value="-1"/> | ||
| <rectangular-lane-cut value="false"/> | ||
| </junctions> | ||
| <pedestrian> | ||
| <walkingareas value="false"/> | ||
| </pedestrian> | ||
| <report> | ||
| <aggregate-warnings value="5"/> | ||
| </report> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <net version="1.6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd"> | ||
|
|
||
| <location netOffset="100.00,100.00" convBoundary="0.00,300.00,400.00,400.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/> | ||
|
|
||
| <edge id=":A_0" function="internal" bidi=":A_3"> | ||
| <lane id=":A_0_0" index="0" allow="rail" speed="13.89" length="7.19" shape="102.16,300.00 100.98,300.24 99.59,300.95 98.00,302.13 96.21,303.79"/> | ||
| </edge> | ||
| <edge id=":A_1" function="internal" bidi=":A_2"> | ||
| <lane id=":A_1_0" index="0" allow="rail" speed="13.89" length="7.53" shape="102.16,300.00 94.64,300.00"/> | ||
| </edge> | ||
| <edge id=":A_2" function="internal" bidi=":A_1"> | ||
| <lane id=":A_2_0" index="0" allow="rail" speed="13.89" length="7.53" shape="94.64,300.00 102.16,300.00"/> | ||
| </edge> | ||
| <edge id=":A_3" function="internal" bidi=":A_0"> | ||
| <lane id=":A_3_0" index="0" allow="rail" speed="13.89" length="7.19" shape="96.21,303.79 98.00,302.13 99.59,300.95 100.98,300.24 102.16,300.00"/> | ||
| </edge> | ||
| <edge id=":B_0" function="internal" bidi=":B_3"> | ||
| <lane id=":B_0_0" index="0" allow="rail" speed="13.89" length="7.19" shape="303.79,303.79 302.00,302.13 300.41,300.95 299.02,300.24 297.84,300.00"/> | ||
| </edge> | ||
| <edge id=":B_1" function="internal" bidi=":B_2"> | ||
| <lane id=":B_1_0" index="0" allow="rail" speed="13.89" length="7.53" shape="305.36,300.00 297.84,300.00"/> | ||
| </edge> | ||
| <edge id=":B_2" function="internal" bidi=":B_1"> | ||
| <lane id=":B_2_0" index="0" allow="rail" speed="13.89" length="7.53" shape="297.84,300.00 305.36,300.00"/> | ||
| </edge> | ||
| <edge id=":B_3" function="internal" bidi=":B_0"> | ||
| <lane id=":B_3_0" index="0" allow="rail" speed="13.89" length="7.19" shape="297.84,300.00 299.02,300.24 300.41,300.95 302.00,302.13 303.79,303.79"/> | ||
| </edge> | ||
|
|
||
| <edge id="-a" from="A" to="gneJ0" priority="-1" spreadType="center" bidi="a"> | ||
| <lane id="-a_0" index="0" allow="rail" speed="13.89" length="94.64" shape="94.64,300.00 0.00,300.00"/> | ||
| </edge> | ||
| <edge id="-b" from="B" to="A" priority="-1" spreadType="center" bidi="b"> | ||
| <lane id="-b_0" index="0" allow="rail" speed="13.89" length="195.67" shape="297.84,300.00 102.16,300.00"/> | ||
| </edge> | ||
| <edge id="-c" from="gneJ5" to="B" priority="-1" spreadType="center" bidi="c"> | ||
| <lane id="-c_0" index="0" allow="rail" speed="13.89" length="94.64" shape="400.00,300.00 305.36,300.00"/> | ||
| </edge> | ||
| <edge id="-d" from="A" to="gneJ6" priority="-1" spreadType="center" bidi="d"> | ||
| <lane id="-d_0" index="0" allow="rail" speed="13.89" length="136.06" shape="96.21,303.79 0.00,400.00"/> | ||
| </edge> | ||
| <edge id="-e" from="gneJ7" to="B" priority="-1" spreadType="center" bidi="e"> | ||
| <lane id="-e_0" index="0" allow="rail" speed="13.89" length="136.06" shape="400.00,400.00 303.79,303.79"/> | ||
| </edge> | ||
| <edge id="a" from="gneJ0" to="A" priority="-1" spreadType="center" bidi="-a"> | ||
| <lane id="a_0" index="0" allow="rail" speed="13.89" length="94.64" shape="0.00,300.00 94.64,300.00"/> | ||
| </edge> | ||
| <edge id="b" from="A" to="B" priority="-1" spreadType="center" bidi="-b"> | ||
| <lane id="b_0" index="0" allow="rail" speed="13.89" length="195.67" shape="102.16,300.00 297.84,300.00"/> | ||
| </edge> | ||
| <edge id="c" from="B" to="gneJ5" priority="-1" spreadType="center" bidi="-c"> | ||
| <lane id="c_0" index="0" allow="rail" speed="13.89" length="94.64" shape="305.36,300.00 400.00,300.00"/> | ||
| </edge> | ||
| <edge id="d" from="gneJ6" to="A" priority="-1" spreadType="center" bidi="-d"> | ||
| <lane id="d_0" index="0" allow="rail" speed="13.89" length="136.06" shape="0.00,400.00 96.21,303.79"/> | ||
| </edge> | ||
| <edge id="e" from="B" to="gneJ7" priority="-1" spreadType="center" bidi="-e"> | ||
| <lane id="e_0" index="0" allow="rail" speed="13.89" length="136.06" shape="303.79,303.79 400.00,400.00"/> | ||
| </edge> | ||
|
|
||
| <junction id="A" type="rail_signal" x="100.00" y="300.00" incLanes="-b_0 a_0 d_0" intLanes=":A_0_0 :A_1_0 :A_2_0 :A_3_0" shape="102.16,301.60 102.16,298.40 94.64,298.40 94.64,301.60 95.08,302.66 97.34,304.92"> | ||
| <request index="0" response="0000" foes="0000" cont="0"/> | ||
| <request index="1" response="0000" foes="1000" cont="0"/> | ||
| <request index="2" response="0000" foes="1000" cont="0"/> | ||
| <request index="3" response="0110" foes="0110" cont="0"/> | ||
| </junction> | ||
| <junction id="B" type="rail_signal" x="300.00" y="300.00" incLanes="-e_0 -c_0 b_0" intLanes=":B_0_0 :B_1_0 :B_2_0 :B_3_0" shape="302.66,304.92 304.92,302.66 305.36,301.60 305.36,298.40 297.84,298.40 297.84,301.60"> | ||
| <request index="0" response="0000" foes="0010" cont="0"/> | ||
| <request index="1" response="0001" foes="1001" cont="0"/> | ||
| <request index="2" response="0000" foes="0000" cont="0"/> | ||
| <request index="3" response="0010" foes="0010" cont="0"/> | ||
| </junction> | ||
| <junction id="gneJ0" type="dead_end" x="0.00" y="300.00" incLanes="-a_0" intLanes="" shape="0.00,301.60 0.00,298.40 0.00,301.60 0.00,298.40"/> | ||
| <junction id="gneJ5" type="dead_end" x="400.00" y="300.00" incLanes="c_0" intLanes="" shape="400.00,298.40 400.00,301.60 400.00,298.40 400.00,301.60"/> | ||
| <junction id="gneJ6" type="dead_end" x="0.00" y="400.00" incLanes="-d_0" intLanes="" shape="1.13,401.13 -1.13,398.87 1.13,401.13 -1.13,398.87"/> | ||
| <junction id="gneJ7" type="dead_end" x="400.00" y="400.00" incLanes="e_0" intLanes="" shape="401.13,398.87 398.87,401.13 401.13,398.87 398.87,401.13"/> | ||
|
|
||
| <connection from="-b" to="-d" fromLane="0" toLane="0" uncontrolled="1" via=":A_0_0" dir="r" state="M"/> | ||
| <connection from="-b" to="-a" fromLane="0" toLane="0" uncontrolled="1" via=":A_1_0" dir="s" state="M"/> | ||
| <connection from="-c" to="-b" fromLane="0" toLane="0" uncontrolled="1" via=":B_1_0" dir="s" state="M"/> | ||
| <connection from="-e" to="-b" fromLane="0" toLane="0" via=":B_0_0" tl="B" linkIndex="0" dir="r" state="O"/> | ||
| <connection from="a" to="b" fromLane="0" toLane="0" via=":A_2_0" tl="A" linkIndex="0" dir="s" state="O"/> | ||
| <connection from="b" to="c" fromLane="0" toLane="0" uncontrolled="1" via=":B_2_0" dir="s" state="M"/> | ||
| <connection from="b" to="e" fromLane="0" toLane="0" uncontrolled="1" via=":B_3_0" dir="l" state="M"/> | ||
| <connection from="d" to="b" fromLane="0" toLane="0" uncontrolled="1" via=":A_3_0" dir="l" state="M"/> | ||
|
|
||
| <connection from=":A_0" to="-d" fromLane="0" toLane="0" dir="r" state="M"/> | ||
| <connection from=":A_1" to="-a" fromLane="0" toLane="0" dir="s" state="M"/> | ||
| <connection from=":A_2" to="b" fromLane="0" toLane="0" dir="s" state="M"/> | ||
| <connection from=":A_3" to="b" fromLane="0" toLane="0" dir="l" state="M"/> | ||
| <connection from=":B_0" to="-b" fromLane="0" toLane="0" dir="r" state="M"/> | ||
| <connection from=":B_1" to="-b" fromLane="0" toLane="0" dir="s" state="M"/> | ||
| <connection from=":B_2" to="c" fromLane="0" toLane="0" dir="s" state="M"/> | ||
| <connection from=":B_3" to="e" fromLane="0" toLane="0" dir="l" state="M"/> | ||
|
|
||
| </net> |
12 changes: 12 additions & 0 deletions
12
tests/complex/state/save_rail_signal_approach_steplength/options.complex
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --no-step-log --no-duration-log -v --net-file=net.net.xml | ||
| -r=input_routes.rou.xml | ||
| --save-state.times 6 | ||
| --save-state.files state.xml | ||
| --default.speeddev 0 | ||
| : | ||
| --no-step-log --no-duration-log -v --net-file=net.net.xml | ||
| --load-state state.xml | ||
| --default.speeddev 0 | ||
| --step-length 2 | ||
| -t | ||
| tests/complex/state/runner.py |
10 changes: 10 additions & 0 deletions
10
tests/complex/state/save_rail_signal_approach_steplength/output.complex
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| Loading net-file from 'net.net.xml' ... done (1ms). | ||
| Loading done. | ||
| Simulation version v1_17_0+0042-7e466a0 started with time: 0.00. | ||
| Simulation ended at time: 34.00 | ||
| Reason: All vehicles have left the simulation. | ||
| Loading net-file from 'net.net.xml' ... done (1ms). | ||
| Loading state from 'state.xml' ... | ||
| done (5ms). | ||
| Loading done. | ||
| Simulation version v1_17_0+0042-7e466a0 started with time: 6.00. |
50 changes: 50 additions & 0 deletions
50
tests/complex/state/save_rail_signal_approach_steplength/state.complex
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- generated on 2023-04-27 10:40:47 by Eclipse SUMO sumo Version v1_17_0+0042-7e466a0 | ||
| <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd"> | ||
| <input> | ||
| <net-file value="net.net.xml"/> | ||
| <route-files value="input_routes.rou.xml"/> | ||
| </input> | ||
| <output> | ||
| <save-state.times value="6"/> | ||
| <save-state.files value="state.xml"/> | ||
| </output> | ||
| <processing> | ||
| <default.speeddev value="0"/> | ||
| </processing> | ||
| <report> | ||
| <verbose value="true"/> | ||
| <duration-log.disable value="true"/> | ||
| <no-step-log value="true"/> | ||
| </report> | ||
| </configuration> | ||
| --> | ||
|
|
||
| <snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_17_0+0042-7e466a0" time="6.00" type="micro"> | ||
| <route id="!train" state="0" edges="a b e"/> | ||
| <delay number="1" begin="1" end="0" depart="0.00" time="0.00"/> | ||
| <vType id="train" length="20.00" vClass="rail" accel="2"/> | ||
| <vehicle id="train" type="train" depart="2.00" departSpeed="max" route="!train" distance="0 0" speedFactor="1.0000" state="18 2000 0 20.10 0 0.00 5000 0 0" pos="61.77 41.77 13.89" speed="13.89 13.89" angle="90.00" posLat="0.00" waitingTime="100000 0"/> | ||
| <lane id=":A_2_0"> | ||
| <link to="b_0"> | ||
| <approaching id="train" arrivalTime="7909" arrivalSpeed="13.89" departSpeed="13.89" request="1" arrivalSpeedBraking="9.38" waitingTime="0" distance="54.29"/> | ||
| </link> | ||
| </lane> | ||
| <lane id="a_0"> | ||
| <vehicles value="train"/> | ||
| <link to=":A_2_0"> | ||
| <approaching id="train" arrivalTime="7366" arrivalSpeed="13.89" departSpeed="13.89" request="1" arrivalSpeedBraking="10.37" waitingTime="0" distance="46.76"/> | ||
| </link> | ||
| </lane> | ||
| <lane id="b_0"> | ||
| <link to=":B_3_0"> | ||
| <approaching id="train" arrivalTime="21996" arrivalSpeed="13.89" departSpeed="13.89" request="1" arrivalSpeedBraking="0.00" waitingTime="0" distance="249.96"/> | ||
| </link> | ||
| </lane> | ||
| </snapshot> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters