Skip to content

Commit

Permalink
patching expected results refs #21, #4252
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Jun 21, 2021
1 parent f0ac0e1 commit 51175d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions tests/netconvert/import/XML/connections/indirect_left/net.netconvert
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2021-06-21 16:31:02 by Eclipse SUMO netconvert Version v1_9_2+0617-4f5baab
<!-- generated on 2021-06-21 16:49:32 by Eclipse SUMO netconvert Version v1_9_2+0619-dab67b0
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
Expand Down Expand Up @@ -248,16 +248,16 @@ SPDX-License-Identifier: EPL-2.0
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<junction id=":C_28_0" type="internal" x="92.10" y="93.10" incLanes=":C_2_0 NC_1 NC_2 SC_0 SC_1 SC_2" intLanes=":C_4_0 :C_4_1 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_17_0 :C_18_0 :C_18_1 :C_20_0 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_28_0" type="internal" x="92.10" y="93.10" incLanes=":C_2_0 NC_0 NC_1 NC_2 SC_0 SC_1 SC_2" intLanes=":C_1_0 :C_4_0 :C_4_1 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_17_0 :C_18_0 :C_18_1 :C_20_0 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_29_0" type="internal" x="94.10" y="108.70" incLanes=":C_3_0 NC_0" intLanes=":C_1_0 :C_2_0 :C_8_0 :C_11_0 :C_11_1 :C_16_0 :C_20_0"/>
<junction id=":C_30_0" type="internal" x="100.00" y="105.73" incLanes=":C_6_0 SC_0 SC_1 SC_2" intLanes=":C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_17_0 :C_18_0 :C_18_1 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_31_0" type="internal" x="93.10" y="107.90" incLanes=":C_9_0 :C_23_0 :C_27_0 EC_1 EC_2 WC_0 WC_1 WC_2" intLanes=":C_37_0 :C_39_0 :C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_11_0 :C_11_1 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_23_0 :C_24_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_31_0" type="internal" x="93.10" y="107.90" incLanes=":C_9_0 :C_23_0 :C_27_0 EC_0 EC_1 EC_2 WC_0 WC_1 WC_2" intLanes=":C_37_0 :C_39_0 :C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_8_0 :C_11_0 :C_11_1 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_23_0 :C_24_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_32_0" type="internal" x="108.70" y="105.90" incLanes=":C_10_0 EC_0" intLanes=":C_8_0 :C_9_0 :C_15_0 :C_18_0 :C_18_1 :C_23_0 :C_27_0"/>
<junction id=":C_33_0" type="internal" x="107.90" y="100.81" incLanes=":C_13_0 :C_23_0 WC_0 WC_1 WC_2" intLanes=":C_37_0 :C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_23_0 :C_24_0 :C_25_0 :C_25_1"/>
<junction id=":C_34_0" type="internal" x="107.90" y="106.90" incLanes=":C_16_0 NC_0 NC_1 NC_2 SC_1 SC_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_4_1 :C_6_0 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_18_0 :C_18_1 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_34_0" type="internal" x="107.90" y="106.90" incLanes=":C_16_0 NC_0 NC_1 NC_2 SC_0 SC_1 SC_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_4_1 :C_6_0 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_15_0 :C_18_0 :C_18_1 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_35_0" type="internal" x="105.90" y="91.30" incLanes=":C_17_0 SC_0" intLanes=":C_2_0 :C_6_0 :C_15_0 :C_16_0 :C_22_0 :C_25_0 :C_25_1"/>
<junction id=":C_36_0" type="internal" x="100.00" y="94.27" incLanes=":C_20_0 NC_0 NC_1 NC_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_4_1 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_37_0" type="internal" x="106.90" y="92.10" incLanes=":C_23_0 EC_0 EC_1 EC_2 WC_1 WC_2" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_11_1 :C_13_0 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_25_0 :C_25_1"/>
<junction id=":C_37_0" type="internal" x="106.90" y="92.10" incLanes=":C_23_0 EC_0 EC_1 EC_2 WC_0 WC_1 WC_2" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_11_1 :C_13_0 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_22_0 :C_25_0 :C_25_1"/>
<junction id=":C_38_0" type="internal" x="91.30" y="94.10" incLanes=":C_24_0 WC_0" intLanes=":C_1_0 :C_4_0 :C_4_1 :C_9_0 :C_13_0 :C_22_0 :C_23_0"/>
<junction id=":C_39_0" type="internal" x="92.10" y="99.19" incLanes=":C_27_0 EC_0 EC_1 EC_2" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_11_1 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0"/>

Expand Down
10 changes: 5 additions & 5 deletions tests/netconvert/import/XML/connections/indirect_left_priority/net.netconvert
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2021-06-21 16:31:02 by Eclipse SUMO netconvert Version v1_9_2+0617-4f5baab
<!-- generated on 2021-06-21 16:49:32 by Eclipse SUMO netconvert Version v1_9_2+0619-dab67b0
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
Expand Down Expand Up @@ -229,12 +229,12 @@ SPDX-License-Identifier: EPL-2.0
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<junction id=":C_28_0" type="internal" x="92.10" y="93.10" incLanes=":C_2_0 NC_1 NC_2" intLanes=":C_4_0 :C_4_1 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_17_0 :C_18_0 :C_18_1 :C_20_0 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_29_0" type="internal" x="93.10" y="107.90" incLanes=":C_9_0 :C_23_0 :C_27_0 EC_1 EC_2 WC_0 WC_1 WC_2" intLanes=":C_33_0 :C_35_0 :C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_11_0 :C_11_1 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_23_0 :C_24_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_28_0" type="internal" x="92.10" y="93.10" incLanes=":C_2_0 NC_0 NC_1 NC_2" intLanes=":C_1_0 :C_4_0 :C_4_1 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_17_0 :C_18_0 :C_18_1 :C_20_0 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_29_0" type="internal" x="93.10" y="107.90" incLanes=":C_9_0 :C_23_0 :C_27_0 EC_0 EC_1 EC_2 WC_0 WC_1 WC_2" intLanes=":C_33_0 :C_35_0 :C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_8_0 :C_11_0 :C_11_1 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_23_0 :C_24_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_30_0" type="internal" x="108.70" y="105.90" incLanes=":C_10_0 EC_0" intLanes=":C_8_0 :C_9_0 :C_15_0 :C_18_0 :C_18_1 :C_23_0 :C_27_0"/>
<junction id=":C_31_0" type="internal" x="107.90" y="100.81" incLanes=":C_13_0 :C_23_0 WC_0 WC_1 WC_2" intLanes=":C_33_0 :C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_21_0 :C_22_0 :C_23_0 :C_24_0 :C_25_0 :C_25_1"/>
<junction id=":C_32_0" type="internal" x="107.90" y="106.90" incLanes=":C_16_0 SC_1 SC_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_4_1 :C_6_0 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_18_0 :C_18_1 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_33_0" type="internal" x="106.90" y="92.10" incLanes=":C_23_0 EC_0 EC_1 EC_2 WC_1 WC_2" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_11_1 :C_13_0 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_25_0 :C_25_1"/>
<junction id=":C_32_0" type="internal" x="107.90" y="106.90" incLanes=":C_16_0 SC_0 SC_1 SC_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_4_1 :C_6_0 :C_8_0 :C_9_0 :C_11_0 :C_11_1 :C_13_0 :C_15_0 :C_18_0 :C_18_1 :C_22_0 :C_23_0 :C_25_0 :C_25_1 :C_27_0"/>
<junction id=":C_33_0" type="internal" x="106.90" y="92.10" incLanes=":C_23_0 EC_0 EC_1 EC_2 WC_0 WC_1 WC_2" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_11_1 :C_13_0 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0 :C_22_0 :C_25_0 :C_25_1"/>
<junction id=":C_34_0" type="internal" x="91.30" y="94.10" incLanes=":C_24_0 WC_0" intLanes=":C_1_0 :C_4_0 :C_4_1 :C_9_0 :C_13_0 :C_22_0 :C_23_0"/>
<junction id=":C_35_0" type="internal" x="92.10" y="99.19" incLanes=":C_27_0 EC_0 EC_1 EC_2" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_4_1 :C_6_0 :C_7_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_11_1 :C_15_0 :C_16_0 :C_18_0 :C_18_1 :C_20_0"/>

Expand Down

0 comments on commit 51175d9

Please sign in to comment.