added test refs #14836, #21

eclipse-sumo · May 7, 2024 · 022d6a7 · 022d6a7
1 parent 74c7c6a
commit 022d6a7
Show file tree

Hide file tree

Showing 7 changed files with 224 additions and 0 deletions.
diff --git a/tests/netconvert/function/ramps/both_ramp_split_threshold/errors.netconvert b/tests/netconvert/function/ramps/both_ramp_split_threshold/errors.netconvert
diff --git a/tests/netconvert/function/ramps/both_ramp_split_threshold/input_plain.edg.xml b/tests/netconvert/function/ramps/both_ramp_split_threshold/input_plain.edg.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-05-07 11:47:02 by Eclipse SUMO netedit Version v1_20_0+0005-bced07fda02
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net.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-internal-links value="true"/>
+        <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>
+
+</configuration>
+-->
+
+<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="off" from="2" to="2a" priority="-1" numLanes="1" speed="30.00" spreadType="center"/>
+    <edge id="on" from="4a" to="4" priority="-1" numLanes="1" speed="30.00" spreadType="center"/>
+    <edge id="s1" from="5" to="4" priority="-1" numLanes="2" speed="30.00" spreadType="center"/>
+    <edge id="s2" from="4" to="3" priority="-1" numLanes="2" speed="30.00" spreadType="center"/>
+    <edge id="s3" from="3" to="2" priority="-1" numLanes="3" speed="30.00" spreadType="center"/>
+    <edge id="s4" from="2" to="1" priority="-1" numLanes="3" speed="30.00" spreadType="center"/>
+</edges>
diff --git a/tests/netconvert/function/ramps/both_ramp_split_threshold/input_plain.nod.xml b/tests/netconvert/function/ramps/both_ramp_split_threshold/input_plain.nod.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-05-07 11:47:02 by Eclipse SUMO netedit Version v1_20_0+0005-bced07fda02
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net.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-internal-links value="true"/>
+        <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>
+
+</configuration>
+-->
+
+<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="1000.00,0.00" convBoundary="400.00,0.00,1600.00,100.00" origBoundary="-1000.00,0.00,1000.00,100.00" projParameter="!"/>
+
+    <node id="1" x="400.00" y="0.00" type="dead_end"/>
+    <node id="2" x="900.00" y="0.00" type="priority"/>
+    <node id="2a" x="600.00" y="100.00" type="dead_end"/>
+    <node id="3" x="1000.00" y="0.00" type="priority"/>
+    <node id="4" x="1100.00" y="0.00" type="priority"/>
+    <node id="4a" x="1400.00" y="100.00" type="dead_end"/>
+    <node id="5" x="1600.00" y="0.00" type="dead_end"/>
+</nodes>
diff --git a/tests/netconvert/function/ramps/both_ramp_split_threshold/net.netconvert b/tests/netconvert/function/ramps/both_ramp_split_threshold/net.netconvert
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-02-29 13:56:09 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+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
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+
+    <input>
+        <node-files value="input_nodes.nod.xml"/>
+        <edge-files value="input_edges.edg.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <output-file value="net.net.xml"/>
+    </output>
+
+    <ramp_guessing>
+        <ramps.guess value="true"/>
+    </ramp_guessing>
+
+    <junctions>
+        <no-internal-links value="true"/>
+    </junctions>
+
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
+</configuration>
+-->
+
+<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="1000.00,0.00" convBoundary="0.00,0.00,2000.00,100.00" origBoundary="-1000.00,0.00,1000.00,100.00" projParameter="!"/>
+
+    <edge id="off" from="2" to="2a" priority="-1" shape="500.00,9.60 200.00,100.00">
+        <lane id="off_0" index="0" speed="30.00" length="321.70" shape="498.57,11.70 200.46,101.53"/>
+    </edge>
+    <edge id="on" from="4a" to="4" priority="-1" shape="1800.00,100.00 1500.00,9.60">
+        <lane id="on_0" index="0" speed="30.00" length="321.70" shape="1799.54,101.53 1501.43,11.70"/>
+    </edge>
+    <edge id="s1" from="5" to="4" priority="-1">
+        <lane id="s1_0" index="0" speed="30.00" length="500.00" shape="2000.00,8.00 1501.50,8.00"/>
+        <lane id="s1_1" index="1" speed="30.00" length="500.00" shape="2000.00,4.80 1501.50,4.80"/>
+        <lane id="s1_2" index="2" speed="30.00" length="500.00" shape="2000.00,1.60 1501.50,1.60"/>
+    </edge>
+    <edge id="s2" from="s2-AddedOnRampNode" to="3" priority="-1">
+        <lane id="s2_0" index="0" speed="30.00" length="400.00" shape="1396.00,8.00 1000.00,8.00"/>
+        <lane id="s2_1" index="1" speed="30.00" length="400.00" shape="1396.00,4.80 1000.00,4.80"/>
+        <lane id="s2_2" index="2" speed="30.00" length="400.00" shape="1396.00,1.60 1000.00,1.60"/>
+    </edge>
+    <edge id="s2-AddedOnRampEdge" from="4" to="s2-AddedOnRampNode" priority="-1">
+        <lane id="s2-AddedOnRampEdge_0" index="0" speed="30.00" length="100.00" acceleration="1" shape="1498.03,11.20 1404.00,11.20"/>
+        <lane id="s2-AddedOnRampEdge_1" index="1" speed="30.00" length="100.00" shape="1498.03,8.00 1404.00,8.00"/>
+        <lane id="s2-AddedOnRampEdge_2" index="2" speed="30.00" length="100.00" shape="1498.03,4.80 1404.00,4.80"/>
+        <lane id="s2-AddedOnRampEdge_3" index="3" speed="30.00" length="100.00" shape="1498.03,1.60 1404.00,1.60"/>
+    </edge>
+    <edge id="s3" from="3" to="s3-AddedOffRampNode" priority="-1">
+        <lane id="s3_0" index="0" speed="30.00" length="400.00" shape="1000.00,8.00 604.00,8.00"/>
+        <lane id="s3_1" index="1" speed="30.00" length="400.00" shape="1000.00,4.80 604.00,4.80"/>
+        <lane id="s3_2" index="2" speed="30.00" length="400.00" shape="1000.00,1.60 604.00,1.60"/>
+    </edge>
+    <edge id="s3-AddedOffRampEdge" from="s3-AddedOffRampNode" to="2" priority="-1">
+        <lane id="s3-AddedOffRampEdge_0" index="0" speed="30.00" length="100.00" shape="596.00,11.20 501.97,11.20"/>
+        <lane id="s3-AddedOffRampEdge_1" index="1" speed="30.00" length="100.00" shape="596.00,8.00 501.97,8.00"/>
+        <lane id="s3-AddedOffRampEdge_2" index="2" speed="30.00" length="100.00" shape="596.00,4.80 501.97,4.80"/>
+        <lane id="s3-AddedOffRampEdge_3" index="3" speed="30.00" length="100.00" shape="596.00,1.60 501.97,1.60"/>
+    </edge>
+    <edge id="s4" from="2" to="1" priority="-1">
+        <lane id="s4_0" index="0" speed="30.00" length="500.00" shape="498.50,8.00 0.00,8.00"/>
+        <lane id="s4_1" index="1" speed="30.00" length="500.00" shape="498.50,4.80 0.00,4.80"/>
+        <lane id="s4_2" index="2" speed="30.00" length="500.00" shape="498.50,1.60 0.00,1.60"/>
+    </edge>
+
+    <junction id="1" type="dead_end" x="0.00" y="0.00" incLanes="s4_0 s4_1 s4_2" intLanes="" shape="0.00,9.60 0.00,0.00"/>
+    <junction id="2" type="priority" x="500.00" y="0.00" incLanes="s3-AddedOffRampEdge_0 s3-AddedOffRampEdge_1 s3-AddedOffRampEdge_2 s3-AddedOffRampEdge_3" intLanes="" shape="501.97,12.80 501.97,0.00 498.50,0.00 498.50,9.60 498.11,10.17 499.04,13.23 500.10,12.93 500.48,12.86 500.87,12.82 501.34,12.80">
+        <request index="0" response="0000" foes="0000"/>
+        <request index="1" response="0000" foes="0000"/>
+        <request index="2" response="0000" foes="0000"/>
+        <request index="3" response="0000" foes="0000"/>
+    </junction>
+    <junction id="2a" type="dead_end" x="200.00" y="100.00" incLanes="off_0" intLanes="" shape="200.92,103.06 200.00,100.00"/>
+    <junction id="3" type="priority" x="1000.00" y="0.00" incLanes="s2_0 s2_1 s2_2" intLanes="" shape="1000.00,9.60 1000.00,0.00 1000.00,9.60">
+        <request index="0" response="000" foes="000"/>
+        <request index="1" response="000" foes="000"/>
+        <request index="2" response="000" foes="000"/>
+    </junction>
+    <junction id="4" type="priority" x="1500.00" y="0.00" incLanes="on_0 s1_0 s1_1 s1_2" intLanes="" shape="1500.96,13.23 1501.89,10.17 1501.50,9.60 1501.50,0.00 1498.03,0.00 1498.03,12.80 1499.13,12.82 1499.52,12.86 1499.90,12.93 1500.36,13.05">
+        <request index="0" response="0000" foes="0000"/>
+        <request index="1" response="0000" foes="0000"/>
+        <request index="2" response="0000" foes="0000"/>
+        <request index="3" response="0000" foes="0000"/>
+    </junction>
+    <junction id="4a" type="dead_end" x="1800.00" y="100.00" incLanes="" intLanes="" shape="1800.00,100.00 1799.08,103.06"/>
+    <junction id="5" type="dead_end" x="2000.00" y="0.00" incLanes="" intLanes="" shape="2000.00,0.00 2000.00,9.60"/>
+    <junction id="s2-AddedOnRampNode" type="priority" x="1400.00" y="0.00" incLanes="s2-AddedOnRampEdge_0 s2-AddedOnRampEdge_1 s2-AddedOnRampEdge_2 s2-AddedOnRampEdge_3" intLanes="" shape="1404.00,12.80 1404.00,0.00 1396.00,0.00 1396.00,9.60 1399.03,10.43 1400.97,11.97 1402.21,12.56">
+        <request index="0" response="000" foes="000"/>
+        <request index="1" response="000" foes="000"/>
+        <request index="2" response="000" foes="000"/>
+    </junction>
+    <junction id="s3-AddedOffRampNode" type="priority" x="600.00" y="0.00" incLanes="s3_0 s3_1 s3_2" intLanes="" shape="604.00,9.60 604.00,0.00 596.00,0.00 596.00,12.80 599.03,11.97 600.97,10.43 602.21,9.84">
+        <request index="0" response="0000" foes="0000"/>
+        <request index="1" response="0000" foes="0000"/>
+        <request index="2" response="0000" foes="0000"/>
+        <request index="3" response="0000" foes="0000"/>
+    </junction>
+
+    <connection from="on" to="s2-AddedOnRampEdge" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="s1" to="s2-AddedOnRampEdge" fromLane="0" toLane="1" dir="s" state="M"/>
+    <connection from="s1" to="s2-AddedOnRampEdge" fromLane="1" toLane="2" dir="s" state="M"/>
+    <connection from="s1" to="s2-AddedOnRampEdge" fromLane="2" toLane="3" dir="s" state="M"/>
+    <connection from="s2" to="s3" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="s2" to="s3" fromLane="1" toLane="1" dir="s" state="M"/>
+    <connection from="s2" to="s3" fromLane="2" toLane="2" dir="s" state="M"/>
+    <connection from="s2-AddedOnRampEdge" to="s2" fromLane="1" toLane="0" dir="s" state="M"/>
+    <connection from="s2-AddedOnRampEdge" to="s2" fromLane="2" toLane="1" dir="s" state="M"/>
+    <connection from="s2-AddedOnRampEdge" to="s2" fromLane="3" toLane="2" dir="s" state="M"/>
+    <connection from="s3" to="s3-AddedOffRampEdge" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="s3" to="s3-AddedOffRampEdge" fromLane="0" toLane="1" dir="s" state="M"/>
+    <connection from="s3" to="s3-AddedOffRampEdge" fromLane="1" toLane="2" dir="s" state="M"/>
+    <connection from="s3" to="s3-AddedOffRampEdge" fromLane="2" toLane="3" dir="s" state="M"/>
+    <connection from="s3-AddedOffRampEdge" to="off" fromLane="0" toLane="0" dir="R" state="M"/>
+    <connection from="s3-AddedOffRampEdge" to="s4" fromLane="1" toLane="0" dir="s" state="M"/>
+    <connection from="s3-AddedOffRampEdge" to="s4" fromLane="2" toLane="1" dir="s" state="M"/>
+    <connection from="s3-AddedOffRampEdge" to="s4" fromLane="3" toLane="2" dir="s" state="M"/>
+
+</net>
diff --git a/tests/netconvert/function/ramps/both_ramp_split_threshold/options.netconvert b/tests/netconvert/function/ramps/both_ramp_split_threshold/options.netconvert
@@ -0,0 +1,3 @@
+--no-internal-links --ramps.guess --edge-files=input_plain.edg.xml
+--node-files=input_plain.nod.xml --output=net.net.xml 
+
diff --git a/tests/netconvert/function/ramps/both_ramp_split_threshold/output.netconvert b/tests/netconvert/function/ramps/both_ramp_split_threshold/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/function/ramps/testsuite.netconvert b/tests/netconvert/function/ramps/testsuite.netconvert
@@ -34,6 +34,9 @@ both_near_explicite
 # network with both ramps, guessing enabled but the default ids cannot be used
 both_ramp_id_clash
 
+# edge length is the same as the desired ramp length
+both_ramp_split_threshold
+
 # real_world1: bs
 real_world1
 no_ramps_for_railways