added tests refs #21, #15474

eclipse-sumo · Oct 15, 2024 · b8a4ddd · b8a4ddd
1 parent abe25e3
commit b8a4ddd
Show file tree

Hide file tree

Showing 8 changed files with 652 additions and 0 deletions.
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/errors.sumo b/tests/sumo/rail/siding/long_siding_occupied_wait2/errors.sumo
@@ -0,0 +1,4 @@
+Warning: Vehicle 't2' performs emergency braking on lane '-g_0' with decel=5.00, wished=1.30, severity=1.00, time=1.00.
+Warning: Vehicle 't2' performs emergency stop at the end of lane '-g_0' because of a red traffic light (decel=-13.89, offset=8.89), time=1.00.
+Warning: Vehicle 't3' performs emergency braking on lane 'E1_0' with decel=5.00, wished=1.30, severity=1.00, time=1.00.
+Warning: Vehicle 't3' performs emergency stop at the end of lane 'E1_0' because of a red traffic light (decel=-13.89, offset=8.89), time=1.00.
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/input_routes.rou.xml b/tests/sumo/rail/siding/long_siding_occupied_wait2/input_routes.rou.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Fri 21 Aug 2020 02:28:17 PM CEST by Eclipse SUMO netedit Version v1_6_0+1707-2370e97800
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+
+    <input>
+        <new value="true"/>
+    </input>
+
+    <output>
+        <output-file value="/home/kobo/dlr/debug/7435/net.net.xml"/>
+    </output>
+
+    <processing>
+        <offset.disable-normalization value="true"/>
+    </processing>
+
+    <junctions>
+        <no-internal-links value="true"/>
+    </junctions>
+
+    <netedit>
+        <route-files value="/home/kobo/dlr/debug/7435/input_routes.rou.xml"/>
+    </netedit>
+
+    <report>
+        <aggregate-warnings value="5"/>
+    </report>
+
+</configuration>
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vType id="train" length="50.00" vClass="rail"/>
+    <vType id="longtrain" length="250.00" vClass="rail"/>
+    <trip id="t2" type="longtrain" depart="0.00" from="-g" to="-E1" departSpeed="max">
+        <stop edge="-d2" duration="1"/>
+    </trip>
+    <trip id="t3" type="longtrain" depart="0.00" from="E1" to="g" departSpeed="max">
+        <stop edge="d" duration="1"/>
+    </trip>
+    <trip id="t0" type="train" depart="0.00" from="-d2" to="-E2" departSpeed="max">
+        <stop edge="-d2" duration="250"/>
+    </trip>
+    <trip id="t1" type="train" depart="0.00" from="d" to="g" departSpeed="max">
+        <stop edge="d" duration="250"/>
+    </trip>
+</routes>
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/net.net.xml b/tests/sumo/rail/siding/long_siding_occupied_wait2/net.net.xml
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/options.sumo b/tests/sumo/rail/siding/long_siding_occupied_wait2/options.sumo
@@ -0,0 +1,2 @@
+--no-step-log --no-duration-log --net-file=net.net.xml -r=input_routes.rou.xml 
+--tripinfo-output tripinfos.xml
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/output.sumo b/tests/sumo/rail/siding/long_siding_occupied_wait2/output.sumo
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/railsignalblocks.sumo b/tests/sumo/rail/siding/long_siding_occupied_wait2/railsignalblocks.sumo
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-15 10:19:29 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<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>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<railsignal-block-output>
+    <railSignal id="A">
+        <link linkIndex="0" from="a_0" to=":A_1_0">
+            <driveWay id="A.0" vehicle="t3" edges="b c d e f g">
+                <forward lanes=":A_1_0 b_0 :B_2_0 c_0"/>
+                <bidi lanes=":A_0_0 -b_0 :B_1_0 -c_0 :C_0_0 -d_0 :D_0_0 -e_0 :E_1_0"
+                    deadlockCheck="-f_0 :F_0_0 -g_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals="F_0 J3_0"/>
+                <foes driveWays="A.0 G.d0 J3.0.2"/>
+                <sidings foe="G.d0">
+                    <siding start="c" end="c" length="194.64"/>
+                    <siding start="c" end="d" length="294.64"/>
+                </sidings>
+            </driveWay>
+            <subDriveWay id="A.0.0" vehicle="" edges="b">
+                <forward lanes=":A_1_0 b_0"/>
+            </subDriveWay>
+        </link>
+    </railSignal>
+    <railSignal id="C">
+        <link linkIndex="0" from="c_0" to=":C_1_0">
+            <driveWay id="C.0" vehicle="t3" edges="d e f g">
+                <forward lanes=":C_1_0 d_0"/>
+                <bidi lanes=":C_0_0 -d_0 :D_0_0 -e_0 :E_1_0"
+                    deadlockCheck="-f_0 :F_0_0 -g_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="C.0 C.d3"/>
+            </driveWay>
+        </link>
+    </railSignal>
+    <railSignal id="D">
+        <link linkIndex="0" from="d_0" to=":D_1_0">
+            <driveWay id="D.0" vehicle="t3" edges="e f g">
+                <forward lanes=":D_1_0 e_0 :E_2_0 f_0 :F_1_0 g_0"/>
+                <bidi lanes=":D_0_0 -e_0 :E_1_0 -f_0 :F_0_0 -g_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="D.0 F.0.0 G.d0"/>
+            </driveWay>
+            <subDriveWay id="D.0.0" vehicle="" edges="e f">
+                <forward lanes=":D_1_0 e_0 :E_2_0 f_0 :F_1_0"/>
+            </subDriveWay>
+        </link>
+    </railSignal>
+    <railSignal id="F">
+        <link linkIndex="0" from="-g_0" to=":F_0_0">
+            <driveWay id="F.0" vehicle="t2" edges="-f -e2 -d2.0 -d2 -d20 -c2 -b -a -E1">
+                <forward lanes=":F_0_0 -f_0 :E_0_0 -e2_0 :D2_0_0 -d2.0_0"/>
+                <bidi lanes=":F_1_0 f_0 :E_3_0 e2_0 :D2_1_0 d20_0 :J6_1_0 d2.100_0 :J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0"
+                    deadlockCheck="b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals="A_0 D_0 J0_0"/>
+                <foes driveWays="D.0.0 F.0 J0.0 J5.d2"/>
+                <sidings foe="J0.0">
+                    <siding start="-e2" end="-d2.0" length="234.74"/>
+                    <siding start="-e2" end="-d2" length="334.74"/>
+                </sidings>
+                <sidings foe="J5.d2">
+                    <siding start="-e2" end="-d2.0" length="234.74"/>
+                    <siding start="-e2" end="-d2" length="334.74"/>
+                </sidings>
+            </driveWay>
+            <subDriveWay id="F.0.0" vehicle="" edges="-f">
+                <forward lanes=":F_0_0 -f_0"/>
+            </subDriveWay>
+        </link>
+    </railSignal>
+    <railSignal id="J0">
+        <link linkIndex="0" from="E1_0" to=":J0_1_0">
+            <driveWay id="J0.0" vehicle="t3" edges="a b c d e f g">
+                <forward lanes=":J0_1_0 a_0"/>
+                <bidi lanes=":J0_0_0 -a_0 :A_0_0 -b_0 :B_1_0 -c_0 :C_0_0 -d_0 :D_0_0 -e_0 :E_1_0"
+                    deadlockCheck="-f_0 :F_0_0 -g_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals="F_0 J3_0"/>
+                <foes driveWays="G.d0 J0.0 J3.0.1"/>
+                <sidings foe="G.d0">
+                    <siding start="c" end="c" length="194.64"/>
+                    <siding start="c" end="d" length="294.64"/>
+                </sidings>
+            </driveWay>
+        </link>
+    </railSignal>
+    <railSignal id="J3">
+        <link linkIndex="0" from="-d2_0" to=":J3_0_0">
+            <driveWay id="J3.0" vehicle="t2" edges="-d20 -c2 -b -a -E1">
+                <forward lanes=":J3_0_0 -d20_0 :C2_1_0 -c2_0 :B_0_0 -b_0 :A_0_0 -a_0 :J0_0_0 -E1_0"/>
+                <bidi lanes=":J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0 b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="A.0.0 J0.0 J3.0 J3.1.0 J5.d2"/>
+            </driveWay>
+            <subDriveWay id="J3.0.0" vehicle="" edges="-d20">
+                <forward lanes=":J3_0_0 -d20_0"/>
+            </subDriveWay>
+            <subDriveWay id="J3.0.1" vehicle="" edges="-d20 -c2 -b -a">
+                <forward lanes=":J3_0_0 -d20_0 :C2_1_0 -c2_0 :B_0_0 -b_0 :A_0_0 -a_0 :J0_0_0"/>
+            </subDriveWay>
+            <subDriveWay id="J3.0.2" vehicle="" edges="-d20 -c2 -b">
+                <forward lanes=":J3_0_0 -d20_0 :C2_1_0 -c2_0 :B_0_0 -b_0 :A_0_0"/>
+            </subDriveWay>
+            <driveWay id="J3.1" vehicle="t0" edges="-d20 -E2">
+                <forward lanes=":J3_0_0 -d20_0 :C2_0_0 -E2_0"/>
+                <bidi lanes=":J3_1_0 d2_0 :C2_3_0 E2_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="J3.0.0 J3.1"/>
+            </driveWay>
+            <subDriveWay id="J3.1.0" vehicle="" edges="-d20">
+                <forward lanes=":J3_0_0 -d20_0"/>
+            </subDriveWay>
+        </link>
+    </railSignal>
+    <railSignal id="J6">
+        <link linkIndex="0" from="-d2.0_0" to=":J6_0_0">
+            <driveWay id="J6.0" vehicle="t2" edges="-d2 -d20 -c2 -b -a -E1">
+                <forward lanes=":J6_0_0 -d2_0"/>
+                <bidi lanes=":J6_1_0 d2.100_0 :J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0"
+                    deadlockCheck="b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="J6.0 J6.1 J6.d1"/>
+            </driveWay>
+            <driveWay id="J6.1" vehicle="t0" edges="-d2 -d20 -E2">
+                <forward lanes=":J6_0_0 -d2_0"/>
+                <bidi lanes=":J6_1_0 d2.100_0 :J3_1_0 d2_0 :C2_3_0 E2_0"/>
+                <flank lanes=""/>
+                <conflictLinks signals=""/>
+                <foes driveWays="J6.0 J6.1 J6.d1"/>
+            </driveWay>
+        </link>
+    </railSignal>
+    <departJunction id="J6">
+        <driveWay id="J6.d1" vehicle="t0" edges="-d2 -d20 -E2">
+            <forward lanes="-d2_0"/>
+            <bidi lanes="d2.100_0 :J3_1_0 d2_0 :C2_3_0 E2_0"/>
+            <flank lanes=""/>
+            <conflictLinks signals="J6_0"/>
+            <foes driveWays="J6.0 J6.1 J6.d1"/>
+        </driveWay>
+    </departJunction>
+    <departJunction id="G">
+        <driveWay id="G.d0" vehicle="t2" edges="-g -f -e2 -d2.0 -d2 -d20 -c2 -b -a -E1">
+            <forward lanes="-g_0"/>
+            <bidi lanes="g_0 :F_1_0 f_0 :E_3_0 e2_0 :D2_1_0 d20_0 :J6_1_0 d2.100_0 :J3_1_0 d2_0 :C2_2_0 c2_0 :B_3_0"
+                    deadlockCheck="b_0 :A_1_0 a_0 :J0_1_0 E1_0"/>
+            <flank lanes=""/>
+            <conflictLinks signals="A_0 D_0 J0_0"/>
+            <foes driveWays="D.0 G.d0 J0.0 J5.d2"/>
+            <sidings foe="J0.0">
+                <siding start="-e2" end="-d2.0" length="234.74"/>
+                <siding start="-e2" end="-d2" length="334.74"/>
+            </sidings>
+            <sidings foe="J5.d2">
+                <siding start="-e2" end="-d2.0" length="234.74"/>
+                <siding start="-e2" end="-d2" length="334.74"/>
+            </sidings>
+        </driveWay>
+    </departJunction>
+    <departJunction id="J5">
+        <driveWay id="J5.d2" vehicle="t3" edges="E1 a b c d e f g">
+            <forward lanes="E1_0"/>
+            <bidi lanes="-E1_0 :J0_0_0 -a_0 :A_0_0 -b_0 :B_1_0 -c_0 :C_0_0 -d_0 :D_0_0 -e_0 :E_1_0"
+                    deadlockCheck="-f_0 :F_0_0 -g_0"/>
+            <flank lanes=""/>
+            <conflictLinks signals="F_0 J3_0"/>
+            <foes driveWays="G.d0 J3.0 J5.d2"/>
+            <sidings foe="G.d0">
+                <siding start="c" end="c" length="194.64"/>
+                <siding start="c" end="d" length="294.64"/>
+            </sidings>
+        </driveWay>
+    </departJunction>
+    <departJunction id="C">
+        <driveWay id="C.d3" vehicle="t1" edges="d e f g">
+            <forward lanes="d_0"/>
+            <bidi lanes="-d_0 :D_0_0 -e_0 :E_1_0"
+                    deadlockCheck="-f_0 :F_0_0 -g_0"/>
+            <flank lanes=""/>
+            <conflictLinks signals="C_0"/>
+            <foes driveWays="C.0 C.d3"/>
+        </driveWay>
+    </departJunction>
+</railsignal-block-output>
diff --git a/tests/sumo/rail/siding/long_siding_occupied_wait2/tripinfos.sumo b/tests/sumo/rail/siding/long_siding_occupied_wait2/tripinfos.sumo
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-10-15 10:28:33 by Eclipse SUMO sumo Version v1_20_0+0658-896cbfcc7a2
+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
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<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>
+        <write-license value="true"/>
+        <tripinfo-output value="tripinfos.xml"/>
+        <railsignal-block-output value="railsignal_blocks.xml"/>
+    </output>
+
+    <processing>
+        <time-to-teleport.railsignal-deadlock value="200"/>
+        <default.speeddev value="0"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+</configuration>
+-->
+
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
+    <tripinfo id="t0" depart="0.00" departLane="-d2_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="299.00" arrivalLane="-E2_0" arrivalPos="94.64" arrivalSpeed="10.00" duration="299.00" routeLength="250.01" waitingTime="0.00" waitingCount="0" stopTime="250.00" timeLoss="30.65" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t1" depart="0.00" departLane="d_0" departPos="50.10" departSpeed="10.74" departDelay="0.00" arrival="404.00" arrivalLane="g_0" arrivalPos="199.80" arrivalSpeed="13.89" duration="404.00" routeLength="550.03" waitingTime="81.00" waitingCount="1" stopTime="250.00" timeLoss="113.69" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t2" depart="0.00" departLane="-g_0" departPos="199.80" departSpeed="13.89" departDelay="0.00" arrival="452.00" arrivalLane="-E1_0" arrivalPos="200.00" arrivalSpeed="13.89" duration="452.00" routeLength="1082.48" waitingTime="300.00" waitingCount="2" stopTime="1.00" timeLoss="371.87" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="longtrain" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="t3" depart="0.00" departLane="E1_0" departPos="200.00" departSpeed="13.89" departDelay="0.00" arrival="468.00" arrivalLane="g_0" arrivalPos="199.80" arrivalSpeed="13.89" duration="468.00" routeLength="1000.34" waitingTime="312.00" waitingCount="3" stopTime="1.00" timeLoss="393.63" rerouteNo="1" devices="tripinfo_t3 routing_t3" vType="longtrain" speedFactor="1.00" vaporized=""/>
+</tripinfos>
diff --git a/tests/sumo/rail/siding/testsuite.sumo b/tests/sumo/rail/siding/testsuite.sumo
@@ -37,6 +37,10 @@ siding_noSignal2
 # 
 long_siding_occupied_wait
 
+# no deadlock should be found because the sidings will clear up in time (even if the first siding is too short for the train)
+# 
+long_siding_occupied_wait2
+
 # no deadlock should be found because the sidings accomodate multiple vehicles
 long_siding_occupied_advance