patching expected results refs #21, #4252

eclipse-sumo · Jun 21, 2021 · 4f83650 · 4f83650
1 parent f72fd02
commit 4f83650
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tests/netconvert/import/XML/connections/indirect_left/net.netconvert b/tests/netconvert/import/XML/connections/indirect_left/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-06-21 12:47:44 by Eclipse SUMO netconvert Version v1_9_2+0614-a54d251
+<!-- generated on 2021-06-21 16:31:02 by Eclipse SUMO netconvert Version v1_9_2+0617-4f5baab
 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
@@ -208,28 +208,28 @@ SPDX-License-Identifier: EPL-2.0
     <junction id="C" type="traffic_light" x="100.00" y="100.00" incLanes="NC_0 NC_1 NC_2 EC_0 EC_1 EC_2 SC_0 SC_1 SC_2 WC_0 WC_1 WC_2" intLanes=":C_0_0 :C_1_0 :C_28_0 :C_29_0 :C_4_0 :C_4_1 :C_30_0 :C_7_0 :C_8_0 :C_31_0 :C_32_0 :C_11_0 :C_11_1 :C_33_0 :C_14_0 :C_15_0 :C_34_0 :C_35_0 :C_18_0 :C_18_1 :C_36_0 :C_21_0 :C_22_0 :C_37_0 :C_38_0 :C_25_0 :C_25_1 :C_39_0" shape="92.60,113.40 107.40,113.40 108.07,110.07 108.90,108.90 110.07,108.07 111.57,107.57 113.40,107.40 113.40,92.60 110.07,91.93 108.90,91.10 108.07,89.93 107.57,88.43 107.40,86.60 92.60,86.60 91.93,89.93 91.10,91.10 89.93,91.93 88.43,92.43 86.60,92.60 86.60,107.40 89.93,108.07 91.10,108.90 91.93,110.07 92.43,111.57" radius="6.00">
         <request index="0"  response="0000000000000000000100000000" foes="0000000000010000000100000000" cont="0"/>
         <request index="1"  response="1111111000000001101100000000" foes="1111111100010001101100001100" cont="0"/>
-        <request index="2"  response="1110110111111111101100110000" foes="1110110111111111101100111010" cont="1"/>
+        <request index="2"  response="1110110111111111101100110010" foes="1110110111111111101100111010" cont="1"/>
         <request index="3"  response="0000000000000001100100000110" foes="0000000100010001100100000110" cont="1"/>
         <request index="4"  response="1111110000000011101100000000" foes="1111110100010011101100000100" cont="0"/>
         <request index="5"  response="1111110000000011101100000000" foes="1111110100010011101100000100" cont="0"/>
         <request index="6"  response="1110100011111011101100000000" foes="1110100011111011101100000000" cont="1"/>
         <request index="7"  response="0000000000000000000000000000" foes="0000100000001000000000000000" cont="0"/>
         <request index="8"  response="0000000000010000000001001100" foes="1000100011011000011001111111" cont="0"/>
-        <request index="9"  response="1111111100010001100001000100" foes="1111111111011001110101110110" cont="1"/>
+        <request index="9"  response="1111111100010001100101000100" foes="1111111111011001110101110110" cont="1"/>
         <request index="10" response="0000000000000000001100000000" foes="1000100011001000001100000000" cont="1"/>
         <request index="11" response="0000000100010000000001001100" foes="1000100111011000001001111110" cont="0"/>
         <request index="12" response="0000000100010000000001001100" foes="1000100111011000001001111110" cont="0"/>
         <request index="13" response="0111110100010000000001000100" foes="0111110111011000000001110100" cont="1"/>
         <request index="14" response="0000010000000000000000000000" foes="0000010000000000000000000100" cont="0"/>
         <request index="15" response="0110110000000011111110000000" foes="0110110000110011111111000100" cont="0"/>
-        <request index="16" response="1110110011000011101100111011" foes="1110110011101011101101111111" cont="1"/>
+        <request index="16" response="1110110011001011101100111011" foes="1110110011101011101101111111" cont="1"/>
         <request index="17" response="0110010000011000000000000000" foes="0110010000011000000001000100" cont="1"/>
         <request index="18" response="1110110000000011111100000000" foes="1110110000010011111101000100" cont="0"/>
         <request index="19" response="1110110000000011111100000000" foes="1110110000010011111101000100" cont="0"/>
         <request index="20" response="1110110000000011101000111010" foes="1110110000000011101000111110" cont="1"/>
         <request index="21" response="0000000000000000000000000000" foes="0000000000000000001000000010" cont="0"/>
         <request index="22" response="0000000100110000000000000100" foes="0001100111111110001000110110" cont="0"/>
-        <request index="23" response="0110000100010001110111000100" foes="0111010111011011111111110110" cont="1"/>
+        <request index="23" response="0110010100010001110111000100" foes="0111010111011011111111110110" cont="1"/>
         <request index="24" response="0000110000000000000000000000" foes="0000110000000010001000110010" cont="1"/>
         <request index="25" response="0000000100110000000001000100" foes="0000100111111010001001110110" cont="0"/>
         <request index="26" response="0000000100110000000001000100" foes="0000100111111010001001110110" cont="0"/>

diff --git a/tests/netconvert/import/XML/connections/indirect_left_priority/net.netconvert b/tests/netconvert/import/XML/connections/indirect_left_priority/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-06-21 12:47:44 by Eclipse SUMO netconvert Version v1_9_2+0614-a54d251
+<!-- generated on 2021-06-21 16:31:02 by Eclipse SUMO netconvert Version v1_9_2+0617-4f5baab
 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
@@ -189,28 +189,28 @@ SPDX-License-Identifier: EPL-2.0
     <junction id="C" type="priority" x="100.00" y="100.00" incLanes="NC_0 NC_1 NC_2 EC_0 EC_1 EC_2 SC_0 SC_1 SC_2 WC_0 WC_1 WC_2" intLanes=":C_0_0 :C_1_0 :C_28_0 :C_3_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_29_0 :C_30_0 :C_11_0 :C_11_1 :C_31_0 :C_14_0 :C_15_0 :C_32_0 :C_17_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_33_0 :C_34_0 :C_25_0 :C_25_1 :C_35_0" shape="92.60,113.40 107.40,113.40 108.07,110.07 108.90,108.90 110.07,108.07 111.57,107.57 113.40,107.40 113.40,92.60 110.07,91.93 108.90,91.10 108.07,89.93 107.57,88.43 107.40,86.60 92.60,86.60 91.93,89.93 91.10,91.10 89.93,91.93 88.43,92.43 86.60,92.60 86.60,107.40 89.93,108.07 91.10,108.90 91.93,110.07 92.43,111.57" radius="6.00">
         <request index="0"  response="0000000000000000000100000000" foes="0000000000010000000100000000" cont="0"/>
         <request index="1"  response="1111111000000001101100000000" foes="1111111100010001101100001100" cont="0"/>
-        <request index="2"  response="1110110111111111101100110000" foes="1110110111111111101100111010" cont="1"/>
+        <request index="2"  response="1110110111111111101100110010" foes="1110110111111111101100111010" cont="1"/>
         <request index="3"  response="0000000000000001100100000110" foes="0000000100010001100100000110" cont="0"/>
         <request index="4"  response="1111110000000011101100000000" foes="1111110100010011101100000100" cont="0"/>
         <request index="5"  response="1111110000000011101100000000" foes="1111110100010011101100000100" cont="0"/>
         <request index="6"  response="1110100011111011101100000000" foes="1110100011111011101100000000" cont="0"/>
         <request index="7"  response="0000000000000000000000000000" foes="0000100000001000000000000000" cont="0"/>
         <request index="8"  response="0000000000000000000000000000" foes="1000100011011000011001111111" cont="0"/>
-        <request index="9"  response="1111111000000001100000000000" foes="1111111111011001110101110110" cont="1"/>
+        <request index="9"  response="1111111000000001100100000000" foes="1111111111011001110101110110" cont="1"/>
         <request index="10" response="0000000000000000001100000000" foes="1000100011001000001100000000" cont="1"/>
         <request index="11" response="0000000000000000000000000000" foes="1000100111011000001001111110" cont="0"/>
         <request index="12" response="0000000000000000000000000000" foes="1000100111011000001001111110" cont="0"/>
         <request index="13" response="0111110000000000000000000000" foes="0111110111011000000001110100" cont="1"/>
         <request index="14" response="0000010000000000000000000000" foes="0000010000000000000000000100" cont="0"/>
         <request index="15" response="0110110000000011111110000000" foes="0110110000110011111111000100" cont="0"/>
-        <request index="16" response="1110110011000011101100111011" foes="1110110011101011101101111111" cont="1"/>
+        <request index="16" response="1110110011001011101100111011" foes="1110110011101011101101111111" cont="1"/>
         <request index="17" response="0110010000011000000000000000" foes="0110010000011000000001000100" cont="0"/>
         <request index="18" response="1110110000000011111100000000" foes="1110110000010011111101000100" cont="0"/>
         <request index="19" response="1110110000000011111100000000" foes="1110110000010011111101000100" cont="0"/>
         <request index="20" response="1110110000000011101000111010" foes="1110110000000011101000111110" cont="0"/>
         <request index="21" response="0000000000000000000000000000" foes="0000000000000000001000000010" cont="0"/>
         <request index="22" response="0000000000000000000000000000" foes="0001100111111110001000110110" cont="0"/>
-        <request index="23" response="0110000000000001110110000000" foes="0111010111011011111111110110" cont="1"/>
+        <request index="23" response="0110010000000001110110000000" foes="0111010111011011111111110110" cont="1"/>
         <request index="24" response="0000110000000000000000000000" foes="0000110000000010001000110010" cont="1"/>
         <request index="25" response="0000000000000000000000000000" foes="0000100111111010001001110110" cont="0"/>
         <request index="26" response="0000000000000000000000000000" foes="0000100111111010001001110110" cont="0"/>