added test fix #4518

eclipse-sumo · Sep 5, 2018 · 85a2829 · 85a2829
1 parent fd79c09
commit 85a2829
Show file tree

Hide file tree

Showing 7 changed files with 1,981 additions and 0 deletions.
diff --git a/tests/sumo/bugs/4xxx/testsuite.sumo b/tests/sumo/bugs/4xxx/testsuite.sumo
@@ -42,3 +42,6 @@ ticket4299
 
 # collision on junction with link leader from the same source lane who is only partially on the junction
 ticket4430
+
+# deadlock on parallel routing
+ticket4518
diff --git a/tests/sumo/bugs/4xxx/ticket4518/errors.sumo b/tests/sumo/bugs/4xxx/ticket4518/errors.sumo
diff --git a/tests/sumo/bugs/4xxx/ticket4518/input_additional.add.xml b/tests/sumo/bugs/4xxx/ticket4518/input_additional.add.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+    <parkingArea id="parkingArea_A0A1_1_17" lane="A0A1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_A0B0_1_9"  lane="A0B0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_A1A0_1_16" lane="A1A0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_A1B1_1_1"  lane="A1B1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_B0A0_1_8"  lane="B0A0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_B0B1_1_19" lane="B0B1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_B0C0_1_11" lane="B0C0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_B1A1_1_15" lane="B1A1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_B1B0_1_18" lane="B1B0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_B1C1_1_2"  lane="B1C1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_C0B0_1_10" lane="C0B0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_C0C1_1_21" lane="C0C1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_C0D0_1_13" lane="C0D0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_C1B1_1_6"  lane="C1B1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_C1C0_1_20" lane="C1C0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_C1D1_1_3"  lane="C1D1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_D0C0_1_12" lane="D0C0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_D0D1_1_23" lane="D0D1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_D1C1_1_5"  lane="D1C1_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+    <parkingArea id="parkingArea_D1D0_1_22" lane="D1D0_1" friendlyPos="1" roadsideCapacity="50" startPos="25.0" endPos="450.0"/>
+</additional>
diff --git a/tests/sumo/bugs/4xxx/ticket4518/input_routes.rou.xml b/tests/sumo/bugs/4xxx/ticket4518/input_routes.rou.xml
@@ -0,0 +1,46 @@
+<?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 vClass="passenger"  id="default"/>
+
+    <vehicle id="pedestrian_1_1096_tr" type="default" depart="triggered" departLane="best" arrivalPos="27.5">
+        <route edges="D0C0 C0B0 B0B1 B1C1"/>
+        <stop parkingArea="parkingArea_B1C1_1_2" duration="600"/>
+    </vehicle>
+    <person id="pedestrian_1_1096" depart="0">
+        <ride from="D0C0" to="B1C1" lines="pedestrian_1_1096_tr"/>
+        <walk edges="B1C1"/>
+    </person>
+    <vehicle id="pedestrian_1_2360_tr" type="default" depart="triggered" departLane="best" arrivalPos="27.5">
+        <route edges="C0D0 D0D1"/>
+        <stop parkingArea="parkingArea_D0D1_1_23" duration="600"/>
+    </vehicle>
+    <person id="pedestrian_1_2360" depart="6">
+        <ride from="C0D0" to="D0D1" lines="pedestrian_1_2360_tr"/>
+        <walk edges="D0D1 D0right0"/>
+    </person>
+    <vehicle id="pedestrian_1_2312_tr" type="default" depart="triggered" departLane="best" arrivalPos="27.5">
+        <route edges="left1A1 A1B1 B1C1 C1C0"/>
+        <stop parkingArea="parkingArea_C1C0_1_20" duration="600"/>
+    </vehicle>
+    <person id="pedestrian_1_2312" depart="7">
+        <ride from="left1A1" to="C1C0" lines="pedestrian_1_2312_tr"/>
+        <walk edges="C1C0"/>
+    </person>
+    <vehicle id="pedestrian_1_3518_tr" type="default" depart="triggered" departLane="best" arrivalPos="27.5">
+        <route edges="top3D1 D1D0 D0C0"/>
+        <stop parkingArea="parkingArea_D0C0_1_12" duration="600"/>
+    </vehicle>
+    <person id="pedestrian_1_3518" depart="8">
+        <ride from="top3D1" to="D0C0" lines="pedestrian_1_3518_tr"/>
+        <walk edges="D0C0"/>
+    </person>
+    <vehicle id="pedestrian_1_1417_tr" type="default" depart="triggered" departLane="best" arrivalPos="27.5">
+        <route edges="A0A1 A1B1 B1B0 B0A0"/>
+        <stop parkingArea="parkingArea_B0A0_1_8" duration="600"/>
+    </vehicle>
+    <person id="pedestrian_1_1417" depart="9">
+        <ride from="A0A1" to="B0A0" lines="pedestrian_1_1417_tr"/>
+        <walk edges="B0A0 B0bottom1"/>
+    </person>
+</routes>