Skip to content

Commit e2de0a4

Browse files
committed
patching expected results refs #21, #16954
1 parent 4149e5e commit e2de0a4

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

tests/tools/net/abstractRail/horizontal/net.tools

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2025-04-29 12:41:30 by Eclipse SUMO netconvert Version v1_22_0+1808-f189571dda8
3+
<!-- generated on 2025-08-01 17:34:00 by Eclipse SUMO netconvert Version v1_24_0+0111-4149e5ee6da
44
<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
55
66
<input>
@@ -192,7 +192,7 @@
192192
<lane id=":1383487393_1_0" index="0" allow="rail rail_fast" speed="63.89" length="7.53" shape="317.96,160.00 325.48,160.00"/>
193193
</edge>
194194
<edge id=":1383499632_0" function="internal">
195-
<lane id=":1383499632_0_0" index="0" allow="rail rail_electric rail_fast" speed="15.20" length="7.19" shape="248.07,120.00 249.25,119.76 250.64,119.05 252.23,117.87 254.02,116.21"/>
195+
<lane id=":1383499632_0_0" index="0" allow="rail rail_electric rail_fast" speed="15.42" length="7.40" shape="248.07,120.00 250.14,119.76 251.43,119.04 252.53,117.85 254.02,116.21"/>
196196
</edge>
197197
<edge id=":1383499632_1" function="internal">
198198
<lane id=":1383499632_1_0" index="0" allow="rail rail_electric rail_fast" speed="44.44" length="7.53" shape="248.07,120.00 255.59,120.00"/>
@@ -204,7 +204,7 @@
204204
<lane id=":1383506146_1_0" index="0" allow="rail" speed="44.44" length="7.13" shape="-108.10,240.00 -115.23,240.00"/>
205205
</edge>
206206
<edge id=":1383506147_0" function="internal">
207-
<lane id=":1383506147_0_0" index="0" allow="rail" speed="15.20" length="7.19" shape="-76.58,263.79 -78.37,262.13 -79.96,260.95 -81.35,260.24 -82.53,260.00"/>
207+
<lane id=":1383506147_0_0" index="0" allow="rail" speed="15.42" length="7.40" shape="-76.58,263.79 -78.07,262.15 -79.17,260.96 -80.46,260.24 -82.53,260.00"/>
208208
</edge>
209209
<edge id=":1383506147_1" function="internal">
210210
<lane id=":1383506147_1_0" index="0" allow="rail" speed="44.44" length="7.53" shape="-75.01,260.00 -82.53,260.00"/>

tests/tools/net/abstractRail/multiple_stations/horizontal/net.tools

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2025-04-29 12:41:31 by Eclipse SUMO netconvert Version v1_22_0+1808-f189571dda8
3+
<!-- generated on 2025-08-01 17:34:00 by Eclipse SUMO netconvert Version v1_24_0+0111-4149e5ee6da
44
<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
55
66
<input>
@@ -1345,7 +1345,7 @@
13451345
<junction id="10707518644" type="rail_signal" x="91.66" y="160.00" incLanes="121902860#1_0" intLanes="" shape="91.66,161.60 91.66,158.40 91.66,161.60">
13461346
<request index="0" response="0" foes="0"/>
13471347
</junction>
1348-
<junction id="10707518645" type="rail_signal" x="0.00" y="300.00" incLanes="742458418#1_0 -334912225#1_0" intLanes="" shape="0.00,301.60 0.00,298.40 0.00,301.60">
1348+
<junction id="10707518645" type="rail_signal" x="0.00" y="300.00" incLanes="742458418#1_0 -334912225#1_0" intLanes="" shape="-0.00,301.60 -0.00,298.40 0.00,301.60">
13491349
<request index="0" response="00" foes="00"/>
13501350
<request index="1" response="00" foes="00"/>
13511351
</junction>
@@ -1646,7 +1646,7 @@
16461646
<request index="2" response="010" foes="010"/>
16471647
</junction>
16481648
<junction id="294077605" type="dead_end" x="-22.97" y="40.00" incLanes="" intLanes="" shape="-22.97,38.40 -22.97,41.60"/>
1649-
<junction id="294077608" type="priority" x="-63.20" y="40.00" incLanes="26807695#0_0" intLanes="" shape="-57.84,41.60 -57.84,38.40 -58.55,38.28 -58.70,38.13 -58.70,37.93 -58.56,37.66 -58.28,37.34 -60.54,35.08 -65.86,40.40 -63.60,42.66 -61.83,41.47 -61.04,41.35 -60.17,41.41 -59.14,41.53">
1649+
<junction id="294077608" type="priority" x="-63.20" y="40.00" incLanes="26807695#0_0" intLanes="" shape="-57.84,41.60 -57.84,38.40 -58.55,38.28 -58.70,38.13 -58.70,37.93 -58.56,37.66 -58.28,37.34 -60.54,35.08 -65.86,40.40 -63.60,42.66 -62.49,42.07 -61.63,41.87 -60.57,41.72 -59.30,41.63">
16501650
<request index="0" response="0" foes="0"/>
16511651
</junction>
16521652
<junction id="294077609" type="priority" x="-123.20" y="100.00" incLanes="26926983_0 26807695#3_0" intLanes="" shape="-117.84,101.60 -117.84,98.40 -118.55,98.28 -118.70,98.13 -118.70,97.93 -118.56,97.66 -118.28,97.34 -120.54,95.08 -122.55,96.92 -123.41,97.57 -124.16,98.03 -124.81,98.31 -125.36,98.40 -125.36,101.60">
@@ -1727,7 +1727,7 @@
17271727
<request index="0" response="00" foes="10"/>
17281728
<request index="1" response="01" foes="01"/>
17291729
</junction>
1730-
<junction id="3542016394" type="priority" x="-43.20" y="20.00" incLanes="347977094_0 121902855#0_0" intLanes="" shape="-37.84,21.60 -37.84,18.40 -38.55,18.28 -38.70,18.13 -38.70,17.93 -38.56,17.66 -38.28,17.34 -40.54,15.08 -45.86,20.40 -43.60,22.66 -42.49,22.07 -41.63,21.87 -40.57,21.72 -39.30,21.63">
1730+
<junction id="3542016394" type="priority" x="-43.20" y="20.00" incLanes="347977094_0 121902855#0_0" intLanes="" shape="-37.84,21.60 -37.84,18.40 -38.55,18.28 -38.70,18.13 -38.70,17.93 -38.56,17.66 -38.28,17.34 -40.54,15.08 -45.86,20.40 -43.60,22.66 -41.83,21.47 -41.04,21.35 -40.17,21.41 -39.14,21.53">
17311731
<request index="0" response="0" foes="0"/>
17321732
</junction>
17331733
<junction id="3542016399" type="dead_end" x="-23.16" y="20.00" incLanes="" intLanes="" shape="-23.16,18.40 -23.16,21.60"/>
@@ -1787,7 +1787,7 @@
17871787
<request index="0" response="00" foes="10"/>
17881788
<request index="1" response="01" foes="01"/>
17891789
</junction>
1790-
<junction id="428647207" type="priority" x="891.85" y="20.00" incLanes="36867853_0 26633642#0_0" intLanes="" shape="895.99,21.60 895.99,18.40 895.24,18.25 895.04,18.07 894.97,17.81 895.02,17.48 895.19,17.07 892.35,15.59 891.39,17.52 891.03,18.19 890.62,18.81 890.04,19.51 889.19,20.40 891.45,22.66 892.43,22.07 893.12,21.87 893.94,21.72 894.90,21.63">
1790+
<junction id="428647207" type="priority" x="891.85" y="20.00" incLanes="36867853_0 26633642#0_0" intLanes="" shape="895.99,21.60 895.99,18.40 895.24,18.25 895.04,18.07 894.97,17.81 895.02,17.48 895.19,17.07 892.35,15.59 891.39,17.52 891.03,18.19 890.62,18.81 890.04,19.51 889.19,20.40 891.45,22.66 892.84,21.65 893.47,21.51 894.14,21.51 894.96,21.56">
17911791
<request index="0" response="00" foes="10"/>
17921792
<request index="1" response="01" foes="01"/>
17931793
</junction>

tests/tools/net/abstractRail/plain/net.tools

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2025-04-29 12:41:30 by Eclipse SUMO netconvert Version v1_22_0+1808-f189571dda8
3+
<!-- generated on 2025-08-01 17:34:00 by Eclipse SUMO netconvert Version v1_24_0+0111-4149e5ee6da
44
<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
55
66
<input>
@@ -249,7 +249,7 @@
249249
<lane id=":3692318838_0_0" index="0" allow="rail" speed="44.44" length="7.52" shape="18353.73,42047.97 18346.88,42051.10"/>
250250
</edge>
251251
<edge id=":3692318838_1" function="internal">
252-
<lane id=":3692318838_1_0" index="0" allow="rail" speed="15.42" length="7.40" shape="18353.73,42047.97 18351.75,42048.61 18350.27,42048.50 18348.77,42047.88 18346.74,42047.00"/>
252+
<lane id=":3692318838_1_0" index="0" allow="rail" speed="15.20" length="7.19" shape="18353.73,42047.97 18352.55,42048.25 18351.00,42048.18 18349.06,42047.76 18346.74,42047.00"/>
253253
</edge>
254254
<edge id=":3692318843_0" function="internal">
255255
<lane id=":3692318843_0_0" index="0" allow="rail" speed="0.10" length="0.10" shape="18280.57,42037.43 18280.57,42037.43"/>

0 commit comments

Comments
 (0)