patching expected results refs #21, #5196

eclipse-sumo · Feb 15, 2019 · 4a61d22 · 4a61d22
1 parent 3006c31
commit 4a61d22
Show file tree

Hide file tree

Showing 38 changed files with 1,998 additions and 1,593 deletions.
diff --git a/tests/netconvert/bugs/ticket19_falseFoe/net.netconvert b/tests/netconvert/bugs/ticket19_falseFoe/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Feb 11 16:42:04 2019 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Feb 15 13:34:43 2019 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
 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
@@ -33,37 +33,31 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":6365_0_0" index="0" speed="7.62" length="9.87" shape="154.40,250.86 151.74,251.78 149.78,253.17 148.53,255.04 147.99,257.39"/>
     </edge>
     <edge id=":6365_1" function="internal">
-        <lane id=":6365_1_0" index="0" speed="7.34" length="10.44" shape="154.40,250.86 150.38,251.14 147.63,249.89 146.16,247.10 146.15,246.86"/>
-    </edge>
-    <edge id=":6365_8" function="internal">
-        <lane id=":6365_8_0" index="0" speed="7.34" length="4.10" shape="146.15,246.86 145.96,242.77"/>
+        <lane id=":6365_1_0" index="0" speed="7.34" length="14.54" shape="154.40,250.86 150.38,251.14 147.63,249.89 146.16,247.10 145.96,242.77"/>
     </edge>
     <edge id=":6365_2" function="internal">
         <lane id=":6365_2_0" index="0" speed="13.90" length="14.40" shape="149.15,243.04 147.99,257.39"/>
     </edge>
     <edge id=":6365_3" function="internal">
         <lane id=":6365_3_0" index="0" speed="3.65" length="2.34" shape="149.15,243.04 148.25,244.17 147.42,244.50"/>
     </edge>
-    <edge id=":6365_9" function="internal">
-        <lane id=":6365_9_0" index="0" speed="3.65" length="2.34" shape="147.42,244.50 146.65,244.03 145.96,242.77"/>
+    <edge id=":6365_8" function="internal">
+        <lane id=":6365_8_0" index="0" speed="3.65" length="2.34" shape="147.42,244.50 146.65,244.03 145.96,242.77"/>
     </edge>
     <edge id=":6365_4" function="internal">
         <lane id=":6365_4_0" index="0" speed="6.11" length="9.06" shape="139.73,246.99 142.27,247.37 144.15,246.80 145.38,245.26 145.96,242.77"/>
     </edge>
     <edge id=":6365_5" function="internal">
-        <lane id=":6365_5_0" index="0" speed="8.81" length="10.67" shape="139.73,246.99 143.56,248.64 146.21,250.92 147.57,253.61"/>
-    </edge>
-    <edge id=":6365_10" function="internal">
-        <lane id=":6365_10_0" index="0" speed="8.81" length="3.83" shape="147.57,253.61 147.69,253.84 147.99,257.39"/>
+        <lane id=":6365_5_0" index="0" speed="8.81" length="14.50" shape="139.73,246.99 143.56,248.64 146.21,250.92 147.69,253.84 147.99,257.39"/>
     </edge>
     <edge id=":6365_6" function="internal">
         <lane id=":6365_6_0" index="0" speed="13.90" length="14.44" shape="144.80,257.15 145.96,242.77"/>
     </edge>
     <edge id=":6365_7" function="internal">
         <lane id=":6365_7_0" index="0" speed="3.65" length="2.34" shape="144.80,257.15 145.69,256.02 146.51,255.68"/>
     </edge>
-    <edge id=":6365_11" function="internal">
-        <lane id=":6365_11_0" index="0" speed="3.65" length="2.34" shape="146.51,255.68 147.28,256.14 147.99,257.39"/>
+    <edge id=":6365_9" function="internal">
+        <lane id=":6365_9_0" index="0" speed="3.65" length="2.34" shape="146.51,255.68 147.28,256.14 147.99,257.39"/>
     </edge>
     <edge id=":6454_0" function="internal">
         <lane id=":6454_0_0" index="0" speed="3.65" length="4.67" shape="157.43,109.12 158.33,108.00 159.16,107.67 159.92,108.13 160.61,109.40"/>
@@ -92,20 +86,22 @@ SPDX-License-Identifier: EPL-2.0
     </edge>
 
     <tlLogic id="6365" type="static" programID="0" offset="0">
-        <phase duration="42" state="rrGgrrGg"/>
+        <phase duration="27" state="rrGgrrGg"/>
         <phase duration="3"  state="rryyrryy"/>
-        <phase duration="42" state="GgrrGgrr"/>
-        <phase duration="3"  state="yyrryyrr"/>
+        <phase duration="27" state="GGrrrrrr"/>
+        <phase duration="3"  state="yyrrrrrr"/>
+        <phase duration="27" state="rrrrGGrr"/>
+        <phase duration="3"  state="rrrryyrr"/>
     </tlLogic>
 
-    <junction id="6365" type="traffic_light" x="146.87" y="250.87" incLanes="1816_0 -1839_0 -1570_0 1841_0" intLanes=":6365_0_0 :6365_8_0 :6365_2_0 :6365_9_0 :6365_4_0 :6365_10_0 :6365_6_0 :6365_11_0" shape="154.75,252.42 154.04,249.30 151.94,249.01 151.27,248.21 150.84,246.97 150.67,245.29 150.74,243.18 144.37,242.63 143.75,244.71 143.15,245.33 142.36,245.66 141.37,245.70 140.19,245.46 139.27,248.52 141.69,250.07 142.49,251.32 143.00,252.91 143.24,254.81 143.20,257.04 149.59,257.51 150.29,255.17 151.02,254.24 152.01,253.48 153.25,252.87">
+    <junction id="6365" type="traffic_light" x="146.87" y="250.87" incLanes="1816_0 -1839_0 -1570_0 1841_0" intLanes=":6365_0_0 :6365_1_0 :6365_2_0 :6365_8_0 :6365_4_0 :6365_5_0 :6365_6_0 :6365_9_0" shape="154.75,252.42 154.04,249.30 151.94,249.01 151.27,248.21 150.84,246.97 150.67,245.29 150.74,243.18 144.37,242.63 143.75,244.71 143.15,245.33 142.36,245.66 141.37,245.70 140.19,245.46 139.27,248.52 141.69,250.07 142.49,251.32 143.00,252.91 143.24,254.81 143.20,257.04 149.59,257.51 150.29,255.17 151.02,254.24 152.01,253.48 153.25,252.87">
         <request index="0" response="00000100" foes="10100100" cont="0"/>
-        <request index="1" response="01010100" foes="01011100" cont="1"/>
-        <request index="2" response="00100010" foes="10100011" cont="0"/>
+        <request index="1" response="01010100" foes="01011100" cont="0"/>
+        <request index="2" response="00000000" foes="10100011" cont="0"/>
         <request index="3" response="01010010" foes="01010010" cont="1"/>
         <request index="4" response="01000000" foes="01001010" cont="0"/>
-        <request index="5" response="01000101" foes="11000101" cont="1"/>
-        <request index="6" response="00100010" foes="00111010" cont="0"/>
+        <request index="5" response="01000101" foes="11000101" cont="0"/>
+        <request index="6" response="00000000" foes="00111010" cont="0"/>
         <request index="7" response="00100101" foes="00100101" cont="1"/>
     </junction>
     <junction id="6366" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.05,-0.00 3.24,-0.24"/>
@@ -117,10 +113,8 @@ SPDX-License-Identifier: EPL-2.0
     </junction>
     <junction id="6564" type="dead_end" x="224.35" y="221.05" incLanes="" intLanes="" shape="224.37,221.11 225.58,224.07"/>
 
-    <junction id=":6365_8_0" type="internal" x="146.15" y="246.86" incLanes=":6365_1_0 -1570_0" intLanes=":6365_2_0 :6365_3_0 :6365_4_0 :6365_6_0"/>
-    <junction id=":6365_9_0" type="internal" x="147.42" y="244.50" incLanes=":6365_3_0 -1570_0 1816_0 1841_0" intLanes=":6365_1_0 :6365_4_0 :6365_6_0"/>
-    <junction id=":6365_10_0" type="internal" x="147.57" y="253.61" incLanes=":6365_5_0 1816_0" intLanes=":6365_0_0 :6365_2_0 :6365_6_0 :6365_7_0"/>
-    <junction id=":6365_11_0" type="internal" x="146.51" y="255.68" incLanes=":6365_7_0 -1570_0 -1839_0 1816_0" intLanes=":6365_0_0 :6365_2_0 :6365_5_0"/>
+    <junction id=":6365_8_0" type="internal" x="147.42" y="244.50" incLanes=":6365_3_0 -1570_0 1816_0 1841_0" intLanes=":6365_1_0 :6365_4_0 :6365_6_0"/>
+    <junction id=":6365_9_0" type="internal" x="146.51" y="255.68" incLanes=":6365_7_0 -1570_0 -1839_0 1816_0" intLanes=":6365_0_0 :6365_2_0 :6365_5_0"/>
 
     <connection from="-1570" to="1839" fromLane="0" toLane="0" via=":6365_4_0" tl="6365" linkIndex="4" dir="r" state="o"/>
     <connection from="-1570" to="-1841" fromLane="0" toLane="0" via=":6365_5_0" tl="6365" linkIndex="5" dir="l" state="o"/>
@@ -134,17 +128,15 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="1841" to="-1841" fromLane="0" toLane="0" via=":6365_7_0" tl="6365" linkIndex="7" dir="t" state="o"/>
 
     <connection from=":6365_0" to="-1841" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":6365_1" to="1839" fromLane="0" toLane="0" via=":6365_8_0" dir="l" state="m"/>
-    <connection from=":6365_8" to="1839" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":6365_1" to="1839" fromLane="0" toLane="0" dir="l" state="M"/>
     <connection from=":6365_2" to="-1841" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":6365_3" to="1839" fromLane="0" toLane="0" via=":6365_9_0" dir="t" state="m"/>
-    <connection from=":6365_9" to="1839" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":6365_3" to="1839" fromLane="0" toLane="0" via=":6365_8_0" dir="t" state="m"/>
+    <connection from=":6365_8" to="1839" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":6365_4" to="1839" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":6365_5" to="-1841" fromLane="0" toLane="0" via=":6365_10_0" dir="l" state="m"/>
-    <connection from=":6365_10" to="-1841" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":6365_5" to="-1841" fromLane="0" toLane="0" dir="l" state="M"/>
     <connection from=":6365_6" to="1839" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":6365_7" to="-1841" fromLane="0" toLane="0" via=":6365_11_0" dir="t" state="m"/>
-    <connection from=":6365_11" to="-1841" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":6365_7" to="-1841" fromLane="0" toLane="0" via=":6365_9_0" dir="t" state="m"/>
+    <connection from=":6365_9" to="-1841" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":6454_0" to="-1839" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":6562_0" to="1841" fromLane="0" toLane="0" dir="t" state="M"/>