patching expected refs #21, #2956, #2599

eclipse-sumo · Jan 25, 2019 · 1019569 · 1019569
1 parent d0f7885
commit 1019569
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/tests/netconvert/bugs/ticket4188/net.netconvert b/tests/netconvert/bugs/ticket4188/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec 14 09:28:01 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:52 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -232,8 +232,8 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="NS1" to="EW2" fromLane="0" toLane="1" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_18_0" tl="_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8" linkIndex="18" dir="r" state="o"/>
     <connection from="NS1" to="NS2" fromLane="1" toLane="0" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_19_0" tl="_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8" linkIndex="19" dir="s" state="o"/>
     <connection from="NS1" to="WE2" fromLane="1" toLane="1" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_20_0" tl="_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8" linkIndex="20" dir="l" state="o"/>
-    <connection from="SN1" to="WE2" fromLane="0" toLane="0" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_6_0" dir="r" state="m"/>
-    <connection from="SN1" to="WE2" fromLane="0" toLane="1" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_7_0" dir="r" state="m"/>
+    <connection from="SN1" to="WE2" fromLane="0" toLane="0" uncontrolled="1" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_6_0" dir="r" state="m"/>
+    <connection from="SN1" to="WE2" fromLane="0" toLane="1" uncontrolled="1" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_7_0" dir="r" state="m"/>
     <connection from="SN1" to="SN2" fromLane="1" toLane="0" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_8_0" tl="_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8" linkIndex="8" dir="s" state="o"/>
     <connection from="SN1" to="EW2" fromLane="1" toLane="0" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_9_0" tl="_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8" linkIndex="9" dir="l" state="o"/>
     <connection from="SN1" to="EW2" fromLane="1" toLane="1" via=":_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8_10_0" tl="_gneJ11_gneJ12_gneJ15_gneJ17_gneJ18_gneJ4_gneJ7_gneJ8" linkIndex="10" dir="l" state="o"/>

diff --git a/tests/netconvert/import/SUMO/add_tls_prgram/net.netconvert b/tests/netconvert/import/SUMO/add_tls_prgram/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec 14 09:27:49 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:37 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -261,8 +261,8 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="34" to="113" fromLane="0" toLane="0" via=":27_11_0" tl="210" linkIndex="11" dir="s" state="O"/>
     <connection from="34" to="113" fromLane="1" toLane="1" via=":27_11_1" tl="210" linkIndex="12" dir="s" state="O"/>
     <connection from="34" to="134" fromLane="2" toLane="0" via=":27_13_0" tl="210" linkIndex="13" dir="l" state="o"/>
-    <connection from="43[0]" to="43[1]" fromLane="0" toLane="0" via=":34_0_0" dir="s" state="M"/>
-    <connection from="43[0]" to="43[1]" fromLane="1" toLane="1" via=":34_0_1" dir="s" state="M"/>
+    <connection from="43[0]" to="43[1]" fromLane="0" toLane="0" uncontrolled="1" via=":34_0_0" dir="s" state="M"/>
+    <connection from="43[0]" to="43[1]" fromLane="1" toLane="1" uncontrolled="1" via=":34_0_1" dir="s" state="M"/>
     <connection from="43[0]" to="118" fromLane="2" toLane="0" via=":34_2_0" tl="210" linkIndex="14" dir="l" state="o"/>
     <connection from="43[1]" to="134" fromLane="0" toLane="0" via=":27_3_0" tl="210" linkIndex="3" dir="r" state="O"/>
     <connection from="43[1]" to="201" fromLane="0" toLane="0" via=":27_4_0" tl="210" linkIndex="4" dir="s" state="O"/>

diff --git a/tests/netconvert/import/SUMO/connections/cross3l_uncontrolled/net.netconvert b/tests/netconvert/import/SUMO/connections/cross3l_uncontrolled/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec 14 09:27:48 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:36 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -250,21 +250,21 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="2fi" to="2si" fromLane="0" toLane="1" via=":m2_0_1" dir="s" state="M"/>
     <connection from="2fi" to="2si" fromLane="1" toLane="2" via=":m2_0_2" dir="s" state="M"/>
     <connection from="2o" to="2fi" fromLane="0" toLane="1" via=":2_0_0" dir="t" state="M"/>
-    <connection from="2si" to="4o" fromLane="0" toLane="0" via=":0_3_0" dir="r" state="m"/>
+    <connection from="2si" to="4o" fromLane="0" toLane="0" uncontrolled="1" via=":0_3_0" dir="r" state="m"/>
     <connection from="2si" to="1o" fromLane="1" toLane="0" via=":0_4_0" tl="0" linkIndex="2" dir="s" state="o"/>
     <connection from="2si" to="3o" fromLane="2" toLane="0" via=":0_5_0" tl="0" linkIndex="3" dir="l" state="o"/>
     <connection from="3fi" to="3si" fromLane="0" toLane="0" via=":m3_0_0" dir="s" state="M"/>
     <connection from="3fi" to="3si" fromLane="0" toLane="1" via=":m3_0_1" dir="s" state="M"/>
     <connection from="3fi" to="3si" fromLane="1" toLane="2" via=":m3_0_2" dir="s" state="M"/>
     <connection from="3o" to="3fi" fromLane="0" toLane="1" via=":3_0_0" dir="t" state="M"/>
-    <connection from="3si" to="2o" fromLane="0" toLane="0" via=":0_6_0" dir="r" state="m"/>
+    <connection from="3si" to="2o" fromLane="0" toLane="0" uncontrolled="1" via=":0_6_0" dir="r" state="m"/>
     <connection from="3si" to="4o" fromLane="1" toLane="0" via=":0_7_0" tl="0" linkIndex="4" dir="s" state="O"/>
     <connection from="3si" to="1o" fromLane="2" toLane="0" via=":0_8_0" tl="0" linkIndex="5" dir="l" state="o"/>
     <connection from="4fi" to="4si" fromLane="0" toLane="0" via=":m4_0_0" dir="s" state="M"/>
     <connection from="4fi" to="4si" fromLane="0" toLane="1" via=":m4_0_1" dir="s" state="M"/>
     <connection from="4fi" to="4si" fromLane="1" toLane="2" via=":m4_0_2" dir="s" state="M"/>
     <connection from="4o" to="4fi" fromLane="0" toLane="1" via=":4_0_0" dir="t" state="M"/>
-    <connection from="4si" to="1o" fromLane="0" toLane="0" via=":0_0_0" dir="r" state="m"/>
+    <connection from="4si" to="1o" fromLane="0" toLane="0" uncontrolled="1" via=":0_0_0" dir="r" state="m"/>
     <connection from="4si" to="3o" fromLane="1" toLane="0" via=":0_1_0" tl="0" linkIndex="0" dir="s" state="O"/>
     <connection from="4si" to="2o" fromLane="2" toLane="0" via=":0_2_0" tl="0" linkIndex="1" dir="l" state="o"/>
 

diff --git a/tests/netconvert/import/SUMO/joined_traffic_light_with_internal_junctions/net.netconvert b/tests/netconvert/import/SUMO/joined_traffic_light_with_internal_junctions/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec 14 09:27:49 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:37 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -241,8 +241,8 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="34" to="113" fromLane="0" toLane="0" via=":27_11_0" tl="210" linkIndex="11" dir="s" state="O"/>
     <connection from="34" to="113" fromLane="1" toLane="1" via=":27_11_1" tl="210" linkIndex="12" dir="s" state="O"/>
     <connection from="34" to="134" fromLane="2" toLane="0" via=":27_13_0" tl="210" linkIndex="13" dir="l" state="o"/>
-    <connection from="43[0]" to="43[1]" fromLane="0" toLane="0" via=":34_0_0" dir="s" state="M"/>
-    <connection from="43[0]" to="43[1]" fromLane="1" toLane="1" via=":34_0_1" dir="s" state="M"/>
+    <connection from="43[0]" to="43[1]" fromLane="0" toLane="0" uncontrolled="1" via=":34_0_0" dir="s" state="M"/>
+    <connection from="43[0]" to="43[1]" fromLane="1" toLane="1" uncontrolled="1" via=":34_0_1" dir="s" state="M"/>
     <connection from="43[0]" to="118" fromLane="2" toLane="0" via=":34_2_0" tl="210" linkIndex="14" dir="l" state="o"/>
     <connection from="43[1]" to="134" fromLane="0" toLane="0" via=":27_3_0" tl="210" linkIndex="3" dir="r" state="O"/>
     <connection from="43[1]" to="201" fromLane="0" toLane="0" via=":27_4_0" tl="210" linkIndex="4" dir="s" state="O"/>

diff --git a/tests/netconvert/import/SUMO/joined_traffic_lights_with_controlledInner/net.netconvert b/tests/netconvert/import/SUMO/joined_traffic_lights_with_controlledInner/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Jan 17 09:50:33 2019 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:37 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -185,8 +185,8 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="27441289.95" to="27445015#0" fromLane="0" toLane="0" via=":56231397_0_0" tl="joinedS_0" linkIndex="5" dir="r" state="O"/>
     <connection from="27441289.95" to="27445003" fromLane="0" toLane="0" via=":56231397_1_0" tl="joinedS_0" linkIndex="6" dir="s" state="O"/>
     <connection from="27441289.95" to="27445003" fromLane="1" toLane="1" via=":56231397_1_1" tl="joinedS_0" linkIndex="7" dir="s" state="O"/>
-    <connection from="27445003" to="27441189" fromLane="0" toLane="2" pass="1" via=":301292612_2_0" dir="l" state="M"/>
-    <connection from="27445003" to="27441189" fromLane="1" toLane="3" pass="1" via=":301292612_3_0" dir="l" state="M"/>
+    <connection from="27445003" to="27441189" fromLane="0" toLane="2" pass="1" uncontrolled="1" via=":301292612_2_0" dir="l" state="M"/>
+    <connection from="27445003" to="27441189" fromLane="1" toLane="3" pass="1" uncontrolled="1" via=":301292612_3_0" dir="l" state="M"/>
     <connection from="46039050" to="27441289.0" fromLane="0" toLane="0" via=":59993001_0_0" tl="joinedS_0" linkIndex="8" dir="r" state="O"/>
     <connection from="46039050" to="27441168" fromLane="0" toLane="0" via=":59993001_1_0" tl="joinedS_0" linkIndex="9" dir="s" state="O"/>
     <connection from="6137245" to="27441289.0" fromLane="0" toLane="0" via=":59993001_2_0" tl="joinedS_0" linkIndex="10" dir="s" state="o"/>

diff --git a/...nvert/import/SUMO/joined_traffic_lights_with_controlledInner/plain_connections.netconvert b/...nvert/import/SUMO/joined_traffic_lights_with_controlledInner/plain_connections.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec 14 09:27:49 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:37 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -57,8 +57,8 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="27441289.95" to="27445003" fromLane="0" toLane="0"/>
     <connection from="27441289.95" to="27445003" fromLane="1" toLane="1"/>
 
-    <connection from="27445003" to="27441189" fromLane="0" toLane="2" pass="1"/>
-    <connection from="27445003" to="27441189" fromLane="1" toLane="3" pass="1"/>
+    <connection from="27445003" to="27441189" fromLane="0" toLane="2" pass="1" uncontrolled="1"/>
+    <connection from="27445003" to="27441189" fromLane="1" toLane="3" pass="1" uncontrolled="1"/>
 
     <connection from="46039050" to="27441289.0" fromLane="0" toLane="0"/>
     <connection from="46039050" to="27441168" fromLane="0" toLane="0"/>

diff --git a/tests/netconvert/import/XML/connections/cross3l_uncontrolled/net.netconvert b/tests/netconvert/import/XML/connections/cross3l_uncontrolled/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec 14 09:27:40 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 01:26:28 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -231,28 +231,28 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="1fi" to="1si" fromLane="0" toLane="1" via=":m1_0_1" dir="s" state="M"/>
     <connection from="1fi" to="1si" fromLane="1" toLane="2" via=":m1_0_2" dir="s" state="M"/>
     <connection from="1o" to="1fi" fromLane="0" toLane="1" via=":1_0_0" dir="t" state="M"/>
-    <connection from="1si" to="3o" fromLane="0" toLane="0" via=":0_9_0" dir="r" state="m"/>
+    <connection from="1si" to="3o" fromLane="0" toLane="0" uncontrolled="1" via=":0_9_0" dir="r" state="m"/>
     <connection from="1si" to="2o" fromLane="1" toLane="0" via=":0_10_0" tl="0" linkIndex="6" dir="s" state="o"/>
     <connection from="1si" to="4o" fromLane="2" toLane="0" via=":0_11_0" tl="0" linkIndex="7" dir="l" state="o"/>
     <connection from="2fi" to="2si" fromLane="0" toLane="0" via=":m2_0_0" dir="s" state="M"/>
     <connection from="2fi" to="2si" fromLane="0" toLane="1" via=":m2_0_1" dir="s" state="M"/>
     <connection from="2fi" to="2si" fromLane="1" toLane="2" via=":m2_0_2" dir="s" state="M"/>
     <connection from="2o" to="2fi" fromLane="0" toLane="1" via=":2_0_0" dir="t" state="M"/>
-    <connection from="2si" to="4o" fromLane="0" toLane="0" via=":0_3_0" dir="r" state="m"/>
+    <connection from="2si" to="4o" fromLane="0" toLane="0" uncontrolled="1" via=":0_3_0" dir="r" state="m"/>
     <connection from="2si" to="1o" fromLane="1" toLane="0" via=":0_4_0" tl="0" linkIndex="2" dir="s" state="o"/>
     <connection from="2si" to="3o" fromLane="2" toLane="0" via=":0_5_0" tl="0" linkIndex="3" dir="l" state="o"/>
     <connection from="3fi" to="3si" fromLane="0" toLane="0" via=":m3_0_0" dir="s" state="M"/>
     <connection from="3fi" to="3si" fromLane="0" toLane="1" via=":m3_0_1" dir="s" state="M"/>
     <connection from="3fi" to="3si" fromLane="1" toLane="2" via=":m3_0_2" dir="s" state="M"/>
     <connection from="3o" to="3fi" fromLane="0" toLane="1" via=":3_0_0" dir="t" state="M"/>
-    <connection from="3si" to="2o" fromLane="0" toLane="0" via=":0_6_0" dir="r" state="m"/>
+    <connection from="3si" to="2o" fromLane="0" toLane="0" uncontrolled="1" via=":0_6_0" dir="r" state="m"/>
     <connection from="3si" to="4o" fromLane="1" toLane="0" via=":0_7_0" tl="0" linkIndex="4" dir="s" state="O"/>
     <connection from="3si" to="1o" fromLane="2" toLane="0" via=":0_8_0" tl="0" linkIndex="5" dir="l" state="o"/>
     <connection from="4fi" to="4si" fromLane="0" toLane="0" via=":m4_0_0" dir="s" state="M"/>
     <connection from="4fi" to="4si" fromLane="0" toLane="1" via=":m4_0_1" dir="s" state="M"/>
     <connection from="4fi" to="4si" fromLane="1" toLane="2" via=":m4_0_2" dir="s" state="M"/>
     <connection from="4o" to="4fi" fromLane="0" toLane="1" via=":4_0_0" dir="t" state="M"/>
-    <connection from="4si" to="1o" fromLane="0" toLane="0" via=":0_0_0" dir="r" state="m"/>
+    <connection from="4si" to="1o" fromLane="0" toLane="0" uncontrolled="1" via=":0_0_0" dir="r" state="m"/>
     <connection from="4si" to="3o" fromLane="1" toLane="0" via=":0_1_0" tl="0" linkIndex="0" dir="s" state="O"/>
     <connection from="4si" to="2o" fromLane="2" toLane="0" via=":0_2_0" tl="0" linkIndex="1" dir="l" state="o"/>
 

diff --git a/tests/netconvert/import/XML/tl_types/uncontrolled_links_joinedTls/net.netconvert b/tests/netconvert/import/XML/tl_types/uncontrolled_links_joinedTls/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Jan 17 09:46:33 2019 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Fri Jan 25 00:56:37 2019 by Eclipse SUMO netconvert Version v1_1_0+0435-678c69824b
 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
@@ -135,7 +135,7 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="-gneE2" to="-gneE0" fromLane="1" toLane="1" via=":gneJ1_0_0" tl="gneJ1" linkIndex="0" dir="r" state="o"/>
     <connection from="-gneE2" to="gneE1" fromLane="1" toLane="0" via=":gneJ1_1_0" tl="gneJ1" linkIndex="1" dir="l" state="o"/>
     <connection from="gneE0" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_4_0" tl="gneJ1" linkIndex="4" dir="s" state="o"/>
-    <connection from="gneE0" to="gneE2" fromLane="0" toLane="1" via=":gneJ1_5_0" dir="l" state="m"/>
+    <connection from="gneE0" to="gneE2" fromLane="0" toLane="1" uncontrolled="1" via=":gneJ1_5_0" dir="l" state="m"/>
     <connection from="gneE0a" to="gneE0" fromLane="0" toLane="0" via=":gneJ4_1_0" tl="gneJ1" linkIndex="6" dir="s" state="O"/>
 
     <connection from=":gneJ1_0" to="-gneE0" fromLane="0" toLane="1" dir="r" state="M"/>