patching expected results refs #21, #5061

eclipse-sumo · Jan 28, 2019 · 8773f7f · 8773f7f
1 parent 9403895
commit 8773f7f
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 46 deletions.
diff --git a/tests/netconvert/function/railway/all-bidi/net.netconvert b/tests/netconvert/function/railway/all-bidi/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:51 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -507,24 +507,24 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="-buffer2" to="-gneE11" fromLane="0" toLane="0" via=":gneJ14_1_0" dir="s" state="M"/>
     <connection from="-buffer3" to="gneE19" fromLane="0" toLane="0" via=":gneJ23_1_0" dir="s" state="M"/>
     <connection from="-gneE1" to="-buffer1" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="M"/>
-    <connection from="-gneE11" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_3_0" dir="s" state="m"/>
+    <connection from="-gneE11" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_3_0" dir="s" state="M"/>
     <connection from="-gneE14" to="-gneE13" fromLane="0" toLane="0" via=":gneJ19_0_0" dir="s" state="M"/>
     <connection from="-gneE15" to="gneE16" fromLane="0" toLane="0" via=":gneJ20_0_0" dir="s" state="M"/>
     <connection from="-gneE15" to="-gneE14" fromLane="0" toLane="0" via=":gneJ20_1_0" dir="s" state="M"/>
-    <connection from="-gneE16" to="gneE15" fromLane="0" toLane="0" via=":gneJ20_3_0" dir="s" state="m"/>
+    <connection from="-gneE16" to="gneE15" fromLane="0" toLane="0" via=":gneJ20_3_0" dir="s" state="M"/>
     <connection from="-gneE2" to="-gneE5" fromLane="0" toLane="0" via=":gneJ3_2_0" dir="s" state="M"/>
-    <connection from="-gneE20" to="gneE5" fromLane="0" toLane="0" via=":gneJ6_0_0" dir="s" state="m"/>
+    <connection from="-gneE20" to="gneE5" fromLane="0" toLane="0" via=":gneJ6_0_0" dir="s" state="M"/>
     <connection from="-gneE21" to="gneE5" fromLane="0" toLane="0" via=":gneJ6_1_0" dir="s" state="M"/>
     <connection from="-gneE25" to="-gneE24" fromLane="0" toLane="0" via=":gneJ31_0_0" dir="s" state="M"/>
     <connection from="-gneE26" to="-gneE27" fromLane="0" toLane="0" via=":gneJ33_1_0" dir="s" state="M"/>
     <connection from="-gneE27" to="gneE28" fromLane="0" toLane="0" via=":gneJ34_1_0" dir="s" state="M"/>
     <connection from="-gneE28" to="gneE27" fromLane="0" toLane="0" via=":gneJ34_0_0" dir="s" state="M"/>
     <connection from="-gneE29" to="-gneE28" fromLane="0" toLane="0" via=":gneJ35_0_0" dir="s" state="M"/>
-    <connection from="-gneE3" to="-gneE2" fromLane="0" toLane="0" via=":gneJ2_2_0" dir="s" state="m"/>
+    <connection from="-gneE3" to="-gneE2" fromLane="0" toLane="0" via=":gneJ2_2_0" dir="s" state="M"/>
     <connection from="-gneE30" to="-gneE29" fromLane="0" toLane="0" via=":gneJ36_0_0" dir="s" state="M"/>
     <connection from="-gneE4" to="-gneE3" fromLane="0" toLane="0" via=":gneJ4_1_0" dir="s" state="M"/>
     <connection from="-gneE5" to="gneE21" fromLane="0" toLane="0" via=":gneJ6_2_0" dir="s" state="M"/>
-    <connection from="-gneE5" to="gneE20" fromLane="0" toLane="0" via=":gneJ6_3_0" dir="L" state="m"/>
+    <connection from="-gneE5" to="gneE20" fromLane="0" toLane="0" via=":gneJ6_3_0" dir="L" state="M"/>
     <connection from="-gneE8" to="gneE11" fromLane="0" toLane="0" via=":gneJ9_0_0" dir="s" state="M"/>
     <connection from="-gneE8" to="-gneE7" fromLane="0" toLane="0" via=":gneJ9_1_0" dir="s" state="M"/>
     <connection from="-gneE9" to="-gneE10" fromLane="0" toLane="0" via=":gneJ11_1_0" dir="s" state="M"/>
@@ -538,8 +538,8 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="gneE17" to="buffer3" fromLane="0" toLane="0" via=":gneJ23_0_0" dir="s" state="M"/>
     <connection from="gneE19" to="-gneE16" fromLane="0" toLane="0" via=":gneJ22_1_0" dir="s" state="M"/>
     <connection from="gneE2" to="-gneE1" fromLane="0" toLane="0" via=":gneJ2_0_0" dir="s" state="M"/>
-    <connection from="gneE2" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="L" state="m"/>
-    <connection from="gneE22" to="-gneE4" fromLane="0" toLane="0" via=":gneJ5_3_0" dir="s" state="m"/>
+    <connection from="gneE2" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="L" state="M"/>
+    <connection from="gneE22" to="-gneE4" fromLane="0" toLane="0" via=":gneJ5_3_0" dir="s" state="M"/>
     <connection from="gneE23" to="-gneE4" fromLane="0" toLane="0" via=":gneJ5_2_0" dir="s" state="M"/>
     <connection from="gneE24" to="gneE25" fromLane="0" toLane="0" via=":gneJ31_1_0" dir="s" state="M"/>
     <connection from="gneE25" to="-gneE26" fromLane="0" toLane="0" via=":gneJ32_1_0" dir="s" state="M"/>
@@ -552,7 +552,7 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="gneE4" to="-gneE23" fromLane="0" toLane="0" via=":gneJ5_1_0" dir="s" state="M"/>
     <connection from="gneE5" to="-gneE6" fromLane="0" toLane="0" via=":gneJ3_0_0" dir="s" state="M"/>
     <connection from="gneE5" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_1_0" dir="s" state="M"/>
-    <connection from="gneE6" to="-gneE5" fromLane="0" toLane="0" via=":gneJ3_3_0" dir="s" state="m"/>
+    <connection from="gneE6" to="-gneE5" fromLane="0" toLane="0" via=":gneJ3_3_0" dir="s" state="M"/>
     <connection from="gneE7" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_2_0" dir="s" state="M"/>
     <connection from="gneE8" to="-gneE9" fromLane="0" toLane="0" via=":gneJ10_1_0" dir="s" state="M"/>
     <connection from="gneE9" to="-gneE8" fromLane="0" toLane="0" via=":gneJ10_0_0" dir="s" state="M"/>

diff --git a/tests/netconvert/function/railway/repair/buffers/net.netconvert b/tests/netconvert/function/railway/repair/buffers/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:50 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -325,9 +325,9 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="-buffer2" to="-gneE11" fromLane="0" toLane="0" via=":gneJ14_1_0" dir="s" state="M"/>
     <connection from="-buffer3" to="gneE19" fromLane="0" toLane="0" via=":gneJ23_1_0" dir="s" state="M"/>
     <connection from="-gneE1" to="-buffer1" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="M"/>
-    <connection from="-gneE11" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_1_0" dir="s" state="m"/>
+    <connection from="-gneE11" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_1_0" dir="s" state="M"/>
     <connection from="-gneE15" to="gneE16" fromLane="0" toLane="0" via=":gneJ20_0_0" dir="s" state="M"/>
-    <connection from="-gneE16" to="gneE15" fromLane="0" toLane="0" via=":gneJ20_2_0" dir="s" state="m"/>
+    <connection from="-gneE16" to="gneE15" fromLane="0" toLane="0" via=":gneJ20_2_0" dir="s" state="M"/>
     <connection from="buffer1" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_1_0" dir="s" state="M"/>
     <connection from="gneE1" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_2_0" dir="r" state="M"/>
     <connection from="gneE10" to="gneE9" fromLane="0" toLane="0" via=":gneJ11_0_0" dir="s" state="M"/>
@@ -338,13 +338,13 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="gneE17" to="buffer3" fromLane="0" toLane="0" via=":gneJ23_0_0" dir="s" state="M"/>
     <connection from="gneE19" to="-gneE16" fromLane="0" toLane="0" via=":gneJ22_1_0" dir="s" state="M"/>
     <connection from="gneE2" to="-gneE1" fromLane="0" toLane="0" via=":gneJ2_0_0" dir="s" state="M"/>
-    <connection from="gneE2" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="L" state="m"/>
+    <connection from="gneE2" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="L" state="M"/>
     <connection from="gneE24" to="gneE25" fromLane="0" toLane="0" via=":gneJ31_0_0" dir="s" state="M"/>
     <connection from="gneE28" to="gneE29" fromLane="0" toLane="0" via=":gneJ35_0_0" dir="s" state="M"/>
     <connection from="gneE29" to="gneE30" fromLane="0" toLane="0" via=":gneJ36_0_0" dir="s" state="M"/>
     <connection from="gneE3" to="gneE4" fromLane="0" toLane="0" via=":gneJ4_0_0" dir="s" state="M"/>
     <connection from="gneE5" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_0_0" dir="s" state="M"/>
-    <connection from="gneE6" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_1_0" dir="r" state="m"/>
+    <connection from="gneE6" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_1_0" dir="r" state="M"/>
     <connection from="gneE7" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_0_0" dir="s" state="M"/>
 
     <connection from=":gneJ1_0" to="-buffer1" fromLane="0" toLane="0" dir="s" state="M"/>

diff --git a/tests/netconvert/function/railway/repair/stops_1bidi/net.netconvert b/tests/netconvert/function/railway/repair/stops_1bidi/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:51 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -163,12 +163,12 @@ SPDX-License-Identifier: EPL-2.0
     </junction>
 
     <connection from="-a" to="-b" fromLane="0" toLane="0" via=":2_1_0" dir="s" state="M"/>
-    <connection from="-b" to="c" fromLane="0" toLane="0" via=":3_1_0" dir="s" state="m"/>
+    <connection from="-b" to="c" fromLane="0" toLane="0" via=":3_1_0" dir="s" state="M"/>
     <connection from="-f" to="-gneE1" fromLane="0" toLane="0" via=":9_1_0" dir="s" state="M"/>
     <connection from="a" to="-a" fromLane="0" toLane="0" speed="0.10" via=":1_0_0" dir="t" state="M"/>
     <connection from="b" to="a" fromLane="0" toLane="0" via=":2_0_0" dir="s" state="M"/>
     <connection from="e" to="d" fromLane="0" toLane="0" via=":7_0_0" dir="s" state="M"/>
-    <connection from="f" to="e" fromLane="0" toLane="0" via=":8_0_0" dir="s" state="m"/>
+    <connection from="f" to="e" fromLane="0" toLane="0" via=":8_0_0" dir="s" state="M"/>
     <connection from="g" to="-f" fromLane="0" toLane="0" via=":8_1_0" dir="s" state="M"/>
     <connection from="gneE1" to="f" fromLane="0" toLane="0" via=":9_0_0" dir="s" state="M"/>
     <connection from="gneE2" to="b" fromLane="0" toLane="0" via=":3_0_0" dir="s" state="M"/>

diff --git a/tests/netconvert/function/railway/repair/stops_1bidi_extend/net.netconvert b/tests/netconvert/function/railway/repair/stops_1bidi_extend/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:51 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -197,7 +197,7 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="-b" to="-a" fromLane="0" toLane="0" via=":2_0_0" dir="s" state="M"/>
     <connection from="-c" to="c" fromLane="0" toLane="0" speed="0.10" via=":4_0_0" dir="t" state="M"/>
     <connection from="-f" to="g" fromLane="0" toLane="0" via=":8_0_0" dir="s" state="M"/>
-    <connection from="-g" to="f" fromLane="0" toLane="0" via=":8_2_0" dir="s" state="m"/>
+    <connection from="-g" to="f" fromLane="0" toLane="0" via=":8_2_0" dir="s" state="M"/>
     <connection from="-gneE1" to="-f" fromLane="0" toLane="0" via=":9_0_0" dir="s" state="M"/>
     <connection from="-h" to="-g" fromLane="0" toLane="0" via=":11_1_0" dir="s" state="M"/>
     <connection from="a" to="b" fromLane="0" toLane="0" via=":2_1_0" dir="s" state="M"/>

diff --git a/tests/netconvert/function/railway/repair/stops_bidi_between/net.netconvert b/tests/netconvert/function/railway/repair/stops_bidi_between/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:51 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -181,18 +181,18 @@ SPDX-License-Identifier: EPL-2.0
 
     <connection from="-a" to="a" fromLane="0" toLane="0" speed="0.10" via=":1_0_0" dir="t" state="M"/>
     <connection from="-b" to="-c" fromLane="0" toLane="0" via=":3_4_0" dir="s" state="M"/>
-    <connection from="-b" to="-p" fromLane="0" toLane="0" via=":3_5_0" dir="L" state="m"/>
+    <connection from="-b" to="-p" fromLane="0" toLane="0" via=":3_5_0" dir="L" state="M"/>
     <connection from="-c" to="d" fromLane="0" toLane="0" via=":4_2_0" dir="s" state="M"/>
     <connection from="-d" to="c" fromLane="0" toLane="0" via=":4_0_0" dir="s" state="M"/>
     <connection from="a" to="-b" fromLane="0" toLane="0" via=":2_1_0" dir="s" state="M"/>
-    <connection from="a" to="m" fromLane="0" toLane="0" via=":2_2_0" dir="L" state="m"/>
+    <connection from="a" to="m" fromLane="0" toLane="0" via=":2_2_0" dir="L" state="M"/>
     <connection from="b" to="-a" fromLane="0" toLane="0" via=":2_0_0" dir="s" state="M"/>
     <connection from="c" to="b" fromLane="0" toLane="0" via=":3_2_0" dir="s" state="M"/>
-    <connection from="c" to="n" fromLane="0" toLane="0" via=":3_3_0" dir="L" state="m"/>
+    <connection from="c" to="n" fromLane="0" toLane="0" via=":3_3_0" dir="L" state="M"/>
     <connection from="d" to="-d" fromLane="0" toLane="0" speed="0.10" via=":5_0_0" dir="t" state="M"/>
-    <connection from="o" to="d" fromLane="0" toLane="0" via=":4_1_0" dir="s" state="m"/>
-    <connection from="p" to="b" fromLane="0" toLane="0" via=":3_0_0" dir="s" state="m"/>
-    <connection from="p" to="n" fromLane="0" toLane="0" via=":3_1_0" dir="s" state="m"/>
+    <connection from="o" to="d" fromLane="0" toLane="0" via=":4_1_0" dir="s" state="M"/>
+    <connection from="p" to="b" fromLane="0" toLane="0" via=":3_0_0" dir="s" state="M"/>
+    <connection from="p" to="n" fromLane="0" toLane="0" via=":3_1_0" dir="s" state="M"/>
 
     <connection from=":1_0" to="a" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":2_0" to="-a" fromLane="0" toLane="0" dir="s" state="M"/>

diff --git a/tests/netconvert/function/railway/repair/stops_reverse_en_route/net.netconvert b/tests/netconvert/function/railway/repair/stops_reverse_en_route/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:51 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -134,7 +134,7 @@ SPDX-License-Identifier: EPL-2.0
 
     <connection from="-branch" to="-h" fromLane="0" toLane="0" via=":11_1_0" dir="s" state="M"/>
     <connection from="-h" to="g" fromLane="0" toLane="0" via=":10_0_0" dir="s" state="M"/>
-    <connection from="b" to="end" fromLane="0" toLane="0" via=":2_1_0" dir="s" state="m"/>
+    <connection from="b" to="end" fromLane="0" toLane="0" via=":2_1_0" dir="s" state="M"/>
     <connection from="beg" to="f" fromLane="0" toLane="0" via=":1_0_0" dir="R" state="M"/>
     <connection from="beg" to="b" fromLane="0" toLane="0" via=":1_1_0" dir="s" state="M"/>
     <connection from="branch" to="-branch" fromLane="0" toLane="0" speed="0.10" via=":12_0_0" dir="t" state="M"/>

diff --git a/tests/netconvert/function/railway/repair/synthetic/net.netconvert b/tests/netconvert/function/railway/repair/synthetic/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jan 18 13:22:50 2019 by Eclipse SUMO netconvert Version v1_1_0+0258-169157deea
+<!-- generated on Mon Jan 28 13:30:56 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
@@ -285,9 +285,9 @@ SPDX-License-Identifier: EPL-2.0
 
     <connection from="-buffer3" to="gneE19" fromLane="0" toLane="0" via=":gneJ23_1_0" dir="s" state="M"/>
     <connection from="-gneE15" to="gneE16" fromLane="0" toLane="0" via=":gneJ20_0_0" dir="s" state="M"/>
-    <connection from="-gneE16" to="gneE15" fromLane="0" toLane="0" via=":gneJ20_2_0" dir="s" state="m"/>
+    <connection from="-gneE16" to="gneE15" fromLane="0" toLane="0" via=":gneJ20_2_0" dir="s" state="M"/>
     <connection from="buffer1" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="M"/>
-    <connection from="gneE1" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="r" state="m"/>
+    <connection from="gneE1" to="gneE3" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="r" state="M"/>
     <connection from="gneE10" to="gneE9" fromLane="0" toLane="0" via=":gneJ11_0_0" dir="s" state="M"/>
     <connection from="gneE11" to="buffer2" fromLane="0" toLane="0" via=":gneJ14_0_0" dir="s" state="M"/>
     <connection from="gneE13" to="gneE14" fromLane="0" toLane="0" via=":gneJ19_0_0" dir="s" state="M"/>
@@ -301,7 +301,7 @@ SPDX-License-Identifier: EPL-2.0
     <connection from="gneE29" to="gneE30" fromLane="0" toLane="0" via=":gneJ36_0_0" dir="s" state="M"/>
     <connection from="gneE3" to="gneE4" fromLane="0" toLane="0" via=":gneJ4_0_0" dir="s" state="M"/>
     <connection from="gneE5" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_0_0" dir="s" state="M"/>
-    <connection from="gneE6" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_1_0" dir="r" state="m"/>
+    <connection from="gneE6" to="gneE2" fromLane="0" toLane="0" via=":gneJ3_1_0" dir="r" state="M"/>
     <connection from="gneE7" to="gneE8" fromLane="0" toLane="0" via=":gneJ9_0_0" dir="s" state="M"/>
 
     <connection from=":gneJ1_0" to="gneE1" fromLane="0" toLane="0" dir="s" state="M"/>