Skip to content

Commit

Permalink
patching expected results refs #21, refs #5121
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Jan 30, 2019
1 parent f52facb commit 479d30f
Show file tree
Hide file tree
Showing 81 changed files with 4,383 additions and 13,015 deletions.
616 changes: 143 additions & 473 deletions tests/netconvert/function/crossings/guessed/adlershof_dlr/net.netconvert
View file

Large diffs are not rendered by default.

36 changes: 7 additions & 29 deletions tests/netconvert/function/geometry.remove/exclude/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Dec 14 09:27:54 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
<!-- generated on Wed Jan 30 12:23:47 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
Expand Down Expand Up @@ -41,19 +41,7 @@ SPDX-License-Identifier: EPL-2.0
<lane id=":gneJ1_0_0" index="0" speed="13.89" length="0.10" shape="20.00,1.60 20.00,1.60"/>
</edge>
<edge id=":gneJ1_1" function="internal">
<lane id=":gneJ1_1_0" index="0" speed="3.65" length="2.34" shape="20.00,1.60 18.80,0.80 18.40,0.00"/>
</edge>
<edge id=":gneJ1_4" function="internal">
<lane id=":gneJ1_4_0" index="0" speed="3.65" length="2.34" shape="18.40,0.00 18.80,-0.80 20.00,-1.60"/>
</edge>
<edge id=":gneJ1_2" function="internal">
<lane id=":gneJ1_2_0" index="0" speed="13.89" length="0.10" shape="20.00,-1.60 20.00,-1.60"/>
</edge>
<edge id=":gneJ1_3" function="internal">
<lane id=":gneJ1_3_0" index="0" speed="3.65" length="2.34" shape="20.00,-1.60 21.20,-0.80 21.60,0.00"/>
</edge>
<edge id=":gneJ1_5" function="internal">
<lane id=":gneJ1_5_0" index="0" speed="3.65" length="2.34" shape="21.60,0.00 21.20,0.80 20.00,1.60"/>
<lane id=":gneJ1_1_0" index="0" speed="13.89" length="0.10" shape="20.00,-1.60 20.00,-1.60"/>
</edge>
<edge id=":gneJ3_0" function="internal">
<lane id=":gneJ3_0_0" index="0" speed="13.89" length="3.00" shape="61.50,1.60 58.50,1.60"/>
Expand Down Expand Up @@ -90,11 +78,9 @@ SPDX-License-Identifier: EPL-2.0
<junction id="gneJ0" type="priority" x="0.00" y="0.00" incLanes="gneE1_0" intLanes=":gneJ0_0_0" shape="0.00,0.00 0.00,3.20 0.00,0.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="gneJ1" type="priority" x="20.00" y="0.00" incLanes="gneE5_0 gneE0_0" intLanes=":gneJ1_0_0 :gneJ1_4_0 :gneJ1_2_0 :gneJ1_5_0" shape="20.00,3.20 20.00,-3.20 20.00,3.20">
<request index="0" response="0000" foes="1000" cont="0"/>
<request index="1" response="0100" foes="0100" cont="1"/>
<request index="2" response="0000" foes="0010" cont="0"/>
<request index="3" response="0001" foes="0001" cont="1"/>
<junction id="gneJ1" type="priority" x="20.00" y="0.00" incLanes="gneE5_0 gneE0_0" intLanes=":gneJ1_0_0 :gneJ1_1_0" shape="20.00,3.20 20.00,-3.20 20.00,3.20">
<request index="0" response="00" foes="00" cont="0"/>
<request index="1" response="00" foes="00" cont="0"/>
</junction>
<junction id="gneJ3" type="priority" x="60.00" y="0.00" incLanes="gneE7_0 gneE2_0" intLanes=":gneJ3_0_0 :gneJ3_2_0" shape="61.50,3.20 61.50,0.00 58.50,-3.20 58.50,3.20">
<request index="0" response="00" foes="10" cont="0"/>
Expand All @@ -105,26 +91,18 @@ SPDX-License-Identifier: EPL-2.0
</junction>
<junction id="gneJ5" type="dead_end" x="100.00" y="0.00" incLanes="" intLanes="" shape="100.00,0.00 100.00,3.20"/>

<junction id=":gneJ1_4_0" type="internal" x="18.40" y="0.00" incLanes=":gneJ1_1_0 gneE0_0" intLanes=":gneJ1_2_0"/>
<junction id=":gneJ1_5_0" type="internal" x="21.60" y="0.00" incLanes=":gneJ1_3_0 gneE5_0" intLanes=":gneJ1_0_0"/>
<junction id=":gneJ3_2_0" type="internal" x="60.10" y="0.00" incLanes=":gneJ3_1_0 gneE7_0" intLanes=":gneJ3_0_0"/>

<connection from="gneE0" to="gneE2" fromLane="0" toLane="0" via=":gneJ1_2_0" dir="s" state="M"/>
<connection from="gneE0" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_3_0" dir="t" state="m"/>
<connection from="gneE0" to="gneE2" fromLane="0" toLane="0" via=":gneJ1_1_0" dir="s" state="M"/>
<connection from="gneE1" to="gneE0" fromLane="0" toLane="0" via=":gneJ0_0_0" dir="t" state="M"/>
<connection from="gneE2" to="gneE5" fromLane="0" toLane="0" via=":gneJ3_1_0" dir="t" state="m"/>
<connection from="gneE5" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_0_0" dir="s" state="M"/>
<connection from="gneE5" to="gneE2" fromLane="0" toLane="0" via=":gneJ1_1_0" dir="t" state="m"/>
<connection from="gneE7" to="gneE5" fromLane="0" toLane="0" via=":gneJ3_0_0" dir="s" state="M"/>
<connection from="gneE9" to="gneE7" fromLane="0" toLane="0" via=":gneJ4_0_0" dir="s" state="M"/>

<connection from=":gneJ0_0" to="gneE0" fromLane="0" toLane="0" dir="t" state="M"/>
<connection from=":gneJ1_0" to="gneE1" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_1" to="gneE2" fromLane="0" toLane="0" via=":gneJ1_4_0" dir="t" state="m"/>
<connection from=":gneJ1_4" to="gneE2" fromLane="0" toLane="0" dir="t" state="M"/>
<connection from=":gneJ1_2" to="gneE2" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ1_3" to="gneE1" fromLane="0" toLane="0" via=":gneJ1_5_0" dir="t" state="m"/>
<connection from=":gneJ1_5" to="gneE1" fromLane="0" toLane="0" dir="t" state="M"/>
<connection from=":gneJ1_1" to="gneE2" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ3_0" to="gneE5" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":gneJ3_1" to="gneE5" fromLane="0" toLane="0" via=":gneJ3_2_0" dir="t" state="m"/>
<connection from=":gneJ3_2" to="gneE5" fromLane="0" toLane="0" dir="t" state="M"/>
Expand Down
58 changes: 15 additions & 43 deletions tests/netconvert/function/keep_edges/components/net.netconvert
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Dec 14 09:27:53 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
<!-- generated on Wed Jan 30 12:23:47 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
Expand Down Expand Up @@ -82,75 +82,47 @@ SPDX-License-Identifier: EPL-2.0
</edge>

<junction id="gneJ41" type="priority" x="315.87" y="408.31" incLanes="-gneE29_0 gneE35_0" intLanes="" shape="319.65,408.43 314.35,404.85 313.40,411.17 315.87,411.14 316.96,410.79 317.95,410.22 318.85,409.44">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="gneJ42" type="priority" x="436.64" y="229.98" incLanes="-gneE30_0 gneE29_0" intLanes="" shape="438.78,226.99 432.97,229.69 438.27,233.27 439.23,231.24 439.42,230.20 439.40,229.15 439.19,228.08">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="gneJ43" type="priority" x="348.86" y="41.11" incLanes="gneE30_0 -gneE31_0" intLanes="" shape="346.64,43.92 352.44,41.22 351.34,39.53 350.63,38.87 349.83,38.34 348.92,37.93 347.92,37.65">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="gneJ44" type="priority" x="147.77" y="0.00" incLanes="gneE31_0 -gneE32_0" intLanes="" shape="148.27,3.37 149.55,-2.90 147.90,-3.16 147.30,-3.14 146.72,-2.99 146.06,-2.70 145.22,-2.26">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="gneJ45" type="priority" x="0.00" y="79.99" incLanes="-gneE33_0 gneE32_0" intLanes="" shape="-2.82,82.71 3.51,81.73 0.46,76.10 -1.67,77.79 -2.34,78.83 -2.76,79.99 -2.92,81.29">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="gneJ46" type="priority" x="30.00" y="274.42" incLanes="-gneE34_0 gneE33_0" intLanes="" shape="28.32,277.31 33.01,272.96 26.69,273.94 26.95,275.33 27.13,275.81 27.39,276.24 27.78,276.71">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="gneJ47" type="priority" x="127.77" y="379.97" incLanes="-gneE35_0 gneE34_0" intLanes="" shape="128.40,383.30 129.36,376.97 124.66,381.32 125.80,382.46 126.29,382.78 126.82,382.99 127.50,383.15">
<request index="0" response="0000" foes="1000"/>
<request index="1" response="0100" foes="0100"/>
<request index="2" response="0000" foes="0010"/>
<request index="3" response="0001" foes="0001"/>
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>

<connection from="-gneE29" to="-gneE35" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from="-gneE29" to="gneE29" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="-gneE30" to="-gneE29" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from="-gneE30" to="gneE30" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="-gneE31" to="-gneE30" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from="-gneE31" to="gneE31" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="-gneE32" to="-gneE31" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="-gneE32" to="gneE32" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="-gneE33" to="-gneE32" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from="-gneE33" to="gneE33" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="-gneE34" to="-gneE33" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="-gneE34" to="gneE34" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="-gneE35" to="-gneE34" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="-gneE35" to="gneE35" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE29" to="gneE30" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from="gneE29" to="-gneE29" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE30" to="gneE31" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from="gneE30" to="-gneE30" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE31" to="gneE32" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="gneE31" to="-gneE31" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE32" to="gneE33" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from="gneE32" to="-gneE32" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE33" to="gneE34" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="gneE33" to="-gneE33" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE34" to="gneE35" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="gneE34" to="-gneE34" fromLane="0" toLane="0" dir="t" state="m"/>
<connection from="gneE35" to="gneE29" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from="gneE35" to="-gneE35" fromLane="0" toLane="0" dir="t" state="m"/>

</net>

0 comments on commit 479d30f

Please sign in to comment.