added test refs #21, #13512, #13519

tests/tools/public_transport/generateRailSignalConstraints/bidi/multiple_conflicts/additional.tools

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2023-06-28 15:51:27.136697 by generateRailSignalConstraints.py v1_17_0+1329-7bea33f
+<configuration>
+    <net-file value="net.net.xml"/>
+    <additional-file value="input_additional.add.xml"/>
+    <route-file value="input_routes.rou.xml"/>
+    <output-file value="out.add.xml"/>
+    <bidi-conflicts value="True"/>
+    <comment.all value="True"/>
+</configuration>
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <railSignalConstraints id="A">
+        <bidiPredecessor tripId="t0" tl="J9" foes="t1"/>   <!-- busStop=f busStop2=-a2 priorStop=a priorStop2=-d arrival=00:03:27 foeArrival=00:03:04 stopArrival=00:04:00 foeStopArrival=00:03:20 -->
+        <bidiPredecessor tripId="t0" tl="J1" foes="t1"/>   <!-- busStop=f busStop2=-a2 priorStop=a priorStop2=-f2 arrival=00:03:45 foeArrival=00:03:04 stopArrival=00:04:00 foeStopArrival=00:03:20 -->
+    </railSignalConstraints>
+    <railSignalConstraints id="J0">
+        <bidiPredecessor tripId="t0" tl="J12" foes="t1"/>   <!-- busStop=j busStop2=-f2 priorStop=f priorStop2=-j2 arrival=00:05:25 foeArrival=00:01:22 stopArrival=00:05:40 foeStopArrival=00:01:40 -->
+    </railSignalConstraints>
+</additional>

tests/tools/public_transport/generateRailSignalConstraints/bidi/multiple_conflicts/input_additional.add.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2022-11-17 17:42:06 by Eclipse SUMO netedit Version v1_15_0+0371-9d085b1
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <!-- StoppingPlaces -->
+    <busStop id="-a2" lane="-a2_0" startPos="50.00" endPos="150.00"/>
+    <busStop id="-d" lane="-d_0" startPos="50.00" endPos="150.00"/>
+    <busStop id="-f2" lane="-f2_0" startPos="50.00" endPos="150.00"/>
+    <busStop id="-j2" lane="-j2_0" startPos="50.33" endPos="150.33"/>
+    <busStop id="a" lane="a_0" startPos="50.00" endPos="150.00"/>
+    <busStop id="f" lane="f_0" startPos="50.00" endPos="150.00"/>
+    <busStop id="j" lane="j_0" startPos="50.00" endPos="150.00"/>
+</additional>

tests/tools/public_transport/generateRailSignalConstraints/bidi/multiple_conflicts/input_routes.rou.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed Sep  9 10:11:50 2020 by Eclipse SUMO duarouter Version v1_7_0+0007-9073c1719d
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/duarouterConfiguration.xsd">
+
+    <input>
+        <net-file value="net.net.xml"/>
+        <additional-files value="input_additional.add.xml"/>
+        <route-files value="input_routes.rou.xml"/>
+    </input>
+
+    <output>
+        <output-file value="input_routes.rou.xml.rou.xml"/>
+        <alternatives-output value="input_routes.rou.xml.rou.alt.xml"/>
+    </output>
+
+    <report>
+        <ignore-errors value="true"/>
+        <no-step-log value="true"/>
+    </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"/>
+    <vehicle id="t0" type="train" depart="0.00" departSpeed="max">
+        <route edges="a b c d e f g h i j"/>
+        <stop busStop="a" arrival="10.00"  duration="20.00" until="30.00"/>
+        <stop busStop="f" arrival="240.00" duration="20.00" until="260.00"/>
+        <stop busStop="j" arrival="340.00" duration="20.00" until="360.00"/>
+    </vehicle>
+    <vehicle id="t1" type="train" depart="20.00" departSpeed="max">
+        <route edges="-j2 -i2 -h -g2 -f2 -e2 -d -c -b2 -a2"/>
+        <stop busStop="-j2" arrival="30.00" duration="20.00" until="50.00"/>
+        <stop busStop="-f2" arrival="100.00" duration="20.00" until="120.00"/>
+        <stop busStop="-d"  arrival="150.00" duration="20.00" until="170.00"/>
+        <stop busStop="-a2" arrival="200.00" duration="20.00" until="220.00"/>
+    </vehicle>
+</routes>

tests/tools/public_transport/generateRailSignalConstraints/bidi/multiple_conflicts/options.tools

@@ -0,0 +1,3 @@
+-n net.net.xml -a input_additional.add.xml -r input_routes.rou.xml -o out.add.xml
+--comment.all
+--bidi-conflicts

tests/tools/public_transport/generateRailSignalConstraints/bidi/multiple_conflicts/output.tools

@@ -0,0 +1,7 @@
+read 7 busStops on 7 edges
+read 2 routes (2 unique) and 7 stops at 7 busStops
+processed 2 routes across 18 edges with 0 merging switches
+Found 0 stops after merging switches and 0 signals that guard switches
+Found 0 conflicts
+Found 0 insertion conflicts
+Found 3 bidi conflicts

tests/tools/public_transport/generateRailSignalConstraints/bidi/testsuite.tools

@@ -40,3 +40,6 @@ oneSideInsertion
 
 # only one side has a diverging track and the other side has a train insertion. The train coming from the diverging side is late and therefore the insertion must be delayed as well to avoid deadlock
 oneSideInsertion2
+
+# multuple conflicts between the same vehicles (due to one vehice having intermediate stops)	
+multiple_conflicts