Skip to content

Commit

Permalink
added test refs #21, #16127
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Feb 5, 2025
1 parent 2be0a1c commit 3429e9c
Show file tree
Hide file tree
Showing 26 changed files with 773 additions and 0 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:30:06 by Eclipse SUMO netedit Version 1.21.0
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="/localdata1/debug/16036/net3.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</neteditConfiguration>
-->

<edges version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
<edge id="E0" from="J0" to="J1" priority="-1" numLanes="2" speed="27.78"/>
<edge id="E1" from="J1" to="J2" priority="-1" numLanes="3" speed="27.78">
<lane index="0" acceleration="1"/>
<lane index="1" changeRight="authority"/>
<lane index="2"/>
</edge>
<edge id="E2" from="J2" to="J3" priority="-1" numLanes="2" speed="27.78"/>
<edge id="E3" from="J4" to="J1" priority="-1" numLanes="1" speed="27.78"/>
</edges>
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:30:06 by Eclipse SUMO netedit Version 1.21.0
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="/localdata1/debug/16036/net3.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</neteditConfiguration>
-->

<nodes version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
<location netOffset="0.00,0.00" convBoundary="-86.96,-35.51,85.33,-9.42" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<node id="J0" x="-85.69" y="-9.42" type="dead_end"/>
<node id="J1" x="-25.18" y="-10.14" type="priority"/>
<node id="J2" x="37.50" y="-9.60" type="priority"/>
<node id="J3" x="85.33" y="-9.60" type="dead_end"/>
<node id="J4" x="-86.96" y="-35.51" type="dead_end"/>
</nodes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:31:08 by Eclipse SUMO netconvert Version v1_22_0+0027-a8e364b3506
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
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<node-files value="input_plain.nod.xml"/>
<edge-files value="input_plain.edg.xml"/>
</input>
<output>
<write-license value="true"/>
<output-file value="net.net.xml"/>
</output>
<junctions>
<no-internal-links value="true"/>
<no-turnarounds value="true"/>
</junctions>
<report>
<xml-validation value="never"/>
</report>
</netconvertConfiguration>
-->

<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="86.96,35.51" convBoundary="0.00,0.00,172.29,26.09" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id="E0" from="J0" to="J1" priority="-1">
<lane id="E0_0" index="0" speed="27.78" length="49.71" shape="1.21,21.29 45.15,20.77"/>
<lane id="E0_1" index="1" speed="27.78" length="49.71" shape="1.25,24.49 45.19,23.97"/>
</edge>
<edge id="E1" from="J1" to="J2" priority="-1">
<lane id="E1_0" index="0" speed="27.78" length="81.99" acceleration="1" shape="48.28,17.25 120.52,17.88"/>
<lane id="E1_1" index="1" speed="27.78" length="81.99" shape="48.25,20.45 120.49,21.08" changeRight="authority"/>
<lane id="E1_2" index="2" speed="27.78" length="81.99" shape="48.22,23.65 120.46,24.28"/>
</edge>
<edge id="E2" from="J2" to="J3" priority="-1">
<lane id="E2_0" index="0" speed="27.78" length="47.83" shape="128.48,21.11 172.29,21.11"/>
<lane id="E2_1" index="1" speed="27.78" length="47.83" shape="128.48,24.31 172.29,24.31"/>
</edge>
<edge id="E3" from="J4" to="J1" priority="-1">
<lane id="E3_0" index="0" speed="27.78" length="50.40" shape="0.61,-1.48 44.51,16.55"/>
</edge>

<junction id="J0" type="dead_end" x="1.27" y="26.09" incLanes="" intLanes="" shape="1.27,26.09 1.19,19.69"/>
<junction id="J1" type="priority" x="61.78" y="25.37" incLanes="E3_0 E0_0 E0_1" intLanes="" shape="48.21,25.25 48.29,15.65 47.08,15.63 46.66,15.59 46.25,15.49 45.76,15.32 45.12,15.07 43.90,18.03 45.25,18.65 45.58,18.87 45.66,19.03 45.52,19.13 45.13,19.17 45.21,25.57 46.32,25.47 46.71,25.40 47.10,25.32 47.57,25.27">
<request index="0" response="000" foes="000"/>
<request index="1" response="000" foes="000"/>
<request index="2" response="000" foes="000"/>
</junction>
<junction id="J2" type="priority" x="124.46" y="25.91" incLanes="E1_0 E1_1 E1_2" intLanes="" shape="128.48,25.91 128.48,19.51 125.46,18.68 124.50,17.91 123.54,17.13 122.31,16.53 120.53,16.28 120.45,25.88">
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="J3" type="dead_end" x="172.29" y="25.91" incLanes="E2_0 E2_1" intLanes="" shape="172.29,19.51 172.29,25.91"/>
<junction id="J4" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="-0.00,-0.00 1.22,-2.96"/>

<connection from="E0" to="E1" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from="E0" to="E1" fromLane="1" toLane="2" dir="s" state="M"/>
<connection from="E1" to="E2" fromLane="1" toLane="0" dir="s" state="M"/>
<connection from="E1" to="E2" fromLane="2" toLane="1" dir="s" state="M"/>
<connection from="E3" to="E1" fromLane="0" toLane="0" dir="s" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Success.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:35:46 by Eclipse SUMO netedit Version v1_22_0+0027-a8e364b3506
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="net2.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</neteditConfiguration>
-->

<edges version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
<edge id="E4" from="J5" to="J6" priority="-1" numLanes="2" speed="13.89"/>
<edge id="E5" from="J6" to="J7" priority="-1" numLanes="3" speed="13.89">
<lane index="0" changeLeft="authority"/>
<lane index="1" changeRight="authority"/>
<lane index="2"/>
</edge>
<edge id="E6" from="J7" to="J8" priority="-1" numLanes="3" speed="13.89"/>
<edge id="E7" from="J8" to="J9" priority="-1" numLanes="2" speed="13.89"/>
<edge id="E8" from="J10" to="J6" priority="-1" numLanes="1" speed="13.89"/>
</edges>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:35:46 by Eclipse SUMO netedit Version v1_22_0+0027-a8e364b3506
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="net2.net.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</neteditConfiguration>
-->

<nodes version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
<location netOffset="0.00,0.00" convBoundary="-79.74,-80.84,118.76,-55.20" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<node id="J10" x="-79.74" y="-80.84" type="dead_end"/>
<node id="J5" x="-78.90" y="-55.62" type="dead_end"/>
<node id="J6" x="-37.90" y="-55.76" type="priority"/>
<node id="J7" x="37.33" y="-55.20" type="priority"/>
<node id="J8" x="79.88" y="-55.20" type="priority"/>
<node id="J9" x="118.76" y="-55.34" type="dead_end"/>
</nodes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:36:05 by Eclipse SUMO netconvert Version v1_22_0+0027-a8e364b3506
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
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<node-files value="input_plain.nod.xml"/>
<edge-files value="input_plain.edg.xml"/>
</input>
<output>
<write-license value="true"/>
<output-file value="net.net.xml"/>
</output>
<junctions>
<no-internal-links value="true"/>
<no-turnarounds value="true"/>
</junctions>
<report>
<xml-validation value="never"/>
</report>
</netconvertConfiguration>
-->

<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="79.74,80.84" convBoundary="0.00,0.00,198.50,25.64" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id="E4" from="J5" to="J6" priority="-1">
<lane id="E4_0" index="0" speed="13.89" length="36.21" shape="0.82,20.42 29.73,20.32"/>
<lane id="E4_1" index="1" speed="13.89" length="36.21" shape="0.83,23.62 29.74,23.52"/>
</edge>
<edge id="E5" from="J6" to="J7" priority="-1">
<lane id="E5_0" index="0" speed="13.89" length="91.20" shape="33.41,17.02 116.96,17.64" changeLeft="authority"/>
<lane id="E5_1" index="1" speed="13.89" length="91.20" shape="33.39,20.22 116.94,20.84" changeRight="authority"/>
<lane id="E5_2" index="2" speed="13.89" length="91.20" shape="33.37,23.42 116.92,24.04"/>
</edge>
<edge id="E6" from="J7" to="J8" priority="-1">
<lane id="E6_0" index="0" speed="13.89" length="42.55" shape="117.24,17.64 155.61,17.64"/>
<lane id="E6_1" index="1" speed="13.89" length="42.55" shape="117.24,20.84 155.61,20.84"/>
<lane id="E6_2" index="2" speed="13.89" length="42.55" shape="117.24,24.04 155.61,24.04"/>
</edge>
<edge id="E7" from="J8" to="J9" priority="-1">
<lane id="E7_0" index="0" speed="13.89" length="38.88" shape="163.61,20.83 198.48,20.70"/>
<lane id="E7_1" index="1" speed="13.89" length="38.88" shape="163.62,24.03 198.49,23.90"/>
</edge>
<edge id="E8" from="J10" to="J6" priority="-1">
<lane id="E8_0" index="0" speed="13.89" length="35.86" shape="0.82,-1.37 29.82,16.01"/>
</edge>

<junction id="J10" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00 1.65,-2.74"/>
<junction id="J5" type="dead_end" x="0.84" y="25.22" incLanes="" intLanes="" shape="0.84,25.22 0.82,18.82"/>
<junction id="J6" type="priority" x="41.84" y="25.08" incLanes="E8_0 E4_0 E4_1" intLanes="" shape="33.35,25.02 33.43,15.42 32.34,15.37 31.95,15.30 31.59,15.17 31.18,14.95 30.64,14.63 28.99,17.38 30.07,18.12 30.29,18.38 30.31,18.57 30.12,18.68 29.72,18.72 29.75,25.12">
<request index="0" response="000" foes="000"/>
<request index="1" response="000" foes="000"/>
<request index="2" response="000" foes="000"/>
</junction>
<junction id="J7" type="priority" x="117.07" y="25.64" incLanes="E5_0 E5_1 E5_2" intLanes="" shape="117.24,25.64 117.24,16.04 116.97,16.04 116.90,25.64">
<request index="0" response="000" foes="000"/>
<request index="1" response="000" foes="000"/>
<request index="2" response="000" foes="000"/>
</junction>
<junction id="J8" type="priority" x="159.62" y="25.64" incLanes="E6_0 E6_1 E6_2" intLanes="" shape="163.63,25.63 163.61,19.23 160.58,18.41 158.64,16.87 157.40,16.28 155.61,16.04 155.61,25.64">
<request index="0" response="00" foes="00"/>
<request index="1" response="00" foes="00"/>
</junction>
<junction id="J9" type="dead_end" x="198.50" y="25.50" incLanes="E7_0 E7_1" intLanes="" shape="198.48,19.10 198.50,25.50"/>

<connection from="E4" to="E5" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from="E4" to="E5" fromLane="1" toLane="2" dir="s" state="M"/>
<connection from="E5" to="E6" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="E5" to="E6" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from="E5" to="E6" fromLane="2" toLane="2" dir="s" state="M"/>
<connection from="E6" to="E7" fromLane="1" toLane="0" dir="s" state="M"/>
<connection from="E6" to="E7" fromLane="2" toLane="1" dir="s" state="M"/>
<connection from="E8" to="E5" fromLane="0" toLane="0" dir="s" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Success.
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,10 @@ verge_left2

# test for #15943
turn_lane_bike

# test for #16127
accel_prohibits_change

# two consecutive edges with acceleration lane
accel_prohibits_change2
ramps
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-05 12:37:41 by Eclipse SUMO netedit Version v1_22_0+0027-a8e364b3506
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<node-files value="/localdata1/debug/16036/input_plain.nod.xml"/>
<edge-files value="/localdata1/debug/16036/input_plain.edg.xml"/>
<connection-files value="/localdata1/debug/16036/input_plain.con.xml"/>
<tllogic-files value="/localdata1/debug/16036/input_plain.tll.xml"/>
</input>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</neteditConfiguration>
-->

<connections version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/connections_file.xsd">
<connection from="E0" to="E1" fromLane="0" toLane="1"/>
<connection from="E0" to="E1" fromLane="1" toLane="2"/>

<connection from="E1" to="E2" fromLane="1" toLane="0"/>
<connection from="E1" to="E2" fromLane="2" toLane="1"/>

<connection from="E3" to="E1" fromLane="0" toLane="0"/>

</connections>
Loading

0 comments on commit 3429e9c

Please sign in to comment.