added test refs #14839, #21

eclipse-sumo · May 7, 2024 · dbf34f2 · dbf34f2
1 parent 4b2440c
commit dbf34f2
Show file tree

Hide file tree

Showing 7 changed files with 210 additions and 0 deletions.
diff --git a/tests/netconvert/function/ramps/both_ramp_overlap/errors.netconvert b/tests/netconvert/function/ramps/both_ramp_overlap/errors.netconvert
diff --git a/tests/netconvert/function/ramps/both_ramp_overlap/input_plain.edg.xml b/tests/netconvert/function/ramps/both_ramp_overlap/input_plain.edg.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-05-07 15:24:36 by Eclipse SUMO netedit Version v1_20_0+0009-62f9f363b7d
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="raw.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_overlap/input_plain.nod.xml b/tests/netconvert/function/ramps/both_ramp_overlap/input_plain.nod.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-05-07 15:24:36 by Eclipse SUMO netedit Version v1_20_0+0009-62f9f363b7d
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="raw.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="600.00,0.00" convBoundary="40.24,0.00,1150.00,100.00" origBoundary="-1000.00,0.00,1000.00,100.00" projParameter="!"/>
+
+    <node id="1" x="40.24" y="0.00" type="dead_end"/>
+    <node id="2" x="540.24" y="0.00" type="priority"/>
+    <node id="2a" x="240.24" y="100.00" type="dead_end"/>
+    <node id="3" x="600.00" y="0.00" type="priority"/>
+    <node id="4" x="650.00" y="0.00" type="priority"/>
+    <node id="4a" x="950.00" y="100.00" type="dead_end"/>
+    <node id="5" x="1150.00" y="0.00" type="dead_end"/>
+</nodes>
diff --git a/tests/netconvert/function/ramps/both_ramp_overlap/net.netconvert b/tests/netconvert/function/ramps/both_ramp_overlap/net.netconvert
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-05-07 15:25:43 by Eclipse SUMO netconvert Version v1_20_0+0009-62f9f363b7d
+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_plain.nod.xml"/>
+        <edge-files value="input_plain.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="559.76,0.00" convBoundary="0.00,0.00,1109.76,100.00" origBoundary="-1000.00,0.00,1000.00,100.00" projParameter="!"/>
+
+    <edge id="off" from="2" to="2a" priority="-1" spreadType="center" shape="500.00,6.40 200.00,100.00">
+        <lane id="off_0" index="0" speed="30.00" length="319.64" shape="498.34,6.92 200.00,100.00"/>
+    </edge>
+    <edge id="on" from="4a" to="4" priority="-1" spreadType="center" shape="909.76,100.00 609.76,4.80">
+        <lane id="on_0" index="0" speed="30.00" length="318.58" shape="909.76,100.00 611.43,5.33"/>
+    </edge>
+    <edge id="s1" from="5" to="4" priority="-1" spreadType="center">
+        <lane id="s1_0" index="0" speed="30.00" length="500.00" shape="1109.76,1.60 611.51,1.60"/>
+        <lane id="s1_1" index="1" speed="30.00" length="500.00" shape="1109.76,-1.60 611.51,-1.60"/>
+    </edge>
+    <edge id="s2" from="4" to="s2-AddedOffRampNode" priority="-1" spreadType="center" shape="609.76,1.60 600.00,1.60">
+        <lane id="s2_0" index="0" speed="30.00" length="10.38" shape="608.01,4.80 604.00,4.80"/>
+        <lane id="s2_1" index="1" speed="30.00" length="10.38" shape="608.01,1.60 604.00,1.60"/>
+        <lane id="s2_2" index="2" speed="30.00" length="10.38" shape="608.01,-1.60 604.00,-1.60"/>
+    </edge>
+    <edge id="s2-AddedOffRampEdge" from="s2-AddedOffRampNode" to="3" priority="-1" spreadType="center" shape="600.00,3.20 559.76,3.20">
+        <lane id="s2-AddedOffRampEdge_0" index="0" speed="30.00" length="43.75" shape="596.00,8.00 559.76,8.00"/>
+        <lane id="s2-AddedOffRampEdge_1" index="1" speed="30.00" length="43.75" shape="596.00,4.80 559.76,4.80"/>
+        <lane id="s2-AddedOffRampEdge_2" index="2" speed="30.00" length="43.75" shape="596.00,1.60 559.76,1.60"/>
+        <lane id="s2-AddedOffRampEdge_3" index="3" speed="30.00" length="43.75" shape="596.00,-1.60 559.76,-1.60"/>
+    </edge>
+    <edge id="s3" from="3" to="2" priority="-1" spreadType="center" shape="559.76,1.60 500.00,1.60">
+        <lane id="s3_0" index="0" speed="30.00" length="61.98" shape="559.76,6.40 501.74,6.40"/>
+        <lane id="s3_1" index="1" speed="30.00" length="61.98" shape="559.76,3.20 501.74,3.20"/>
+        <lane id="s3_2" index="2" speed="30.00" length="61.98" shape="559.76,-0.00 501.74,-0.00"/>
+        <lane id="s3_3" index="3" speed="30.00" length="61.98" shape="559.76,-3.20 501.74,-3.20"/>
+    </edge>
+    <edge id="s4" from="2" to="1" priority="-1" spreadType="center">
+        <lane id="s4_0" index="0" speed="30.00" length="500.00" shape="498.26,3.20 0.00,3.20"/>
+        <lane id="s4_1" index="1" speed="30.00" length="500.00" shape="498.26,-0.00 0.00,-0.00"/>
+        <lane id="s4_2" index="2" speed="30.00" length="500.00" shape="498.26,-3.20 0.00,-3.20"/>
+    </edge>
+
+    <junction id="1" type="dead_end" x="0.00" y="0.00" incLanes="s4_0 s4_1 s4_2" intLanes="" shape="0.00,4.80 0.00,-4.80"/>
+    <junction id="2" type="priority" x="500.00" y="0.00" incLanes="s3_0 s3_1 s3_2 s3_3" intLanes="" shape="501.74,8.00 501.74,-4.80 498.26,-4.80 498.26,4.80 497.86,5.39 498.81,8.45 499.87,8.13 500.25,8.06 500.64,8.02 501.11,8.00">
+        <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.48,101.53 199.52,98.47"/>
+    <junction id="3" type="priority" x="559.76" y="0.00" incLanes="s2-AddedOffRampEdge_0 s2-AddedOffRampEdge_1 s2-AddedOffRampEdge_2 s2-AddedOffRampEdge_3" intLanes="" shape="559.76,9.60 559.76,-4.80 559.76,8.00">
+        <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="4" type="priority" x="609.76" y="0.00" incLanes="on_0 s1_0 s1_1" intLanes="" shape="610.94,6.85 611.91,3.80 611.51,3.20 611.51,-3.20 608.01,-3.20 608.01,6.40 609.12,6.42 609.50,6.46 609.88,6.54 610.34,6.66">
+        <request index="0" response="000" foes="000"/>
+        <request index="1" response="000" foes="000"/>
+        <request index="2" response="000" foes="000"/>
+    </junction>
+    <junction id="4a" type="dead_end" x="909.76" y="100.00" incLanes="" intLanes="" shape="910.24,98.47 909.28,101.53"/>
+    <junction id="5" type="dead_end" x="1109.76" y="0.00" incLanes="" intLanes="" shape="1109.76,-3.20 1109.76,3.20"/>
+    <junction id="s2-AddedOffRampNode" type="priority" x="600.00" y="1.60" incLanes="s2_0 s2_1 s2_2" intLanes="" shape="604.00,6.40 604.00,-3.20 596.00,-3.20 596.00,9.60 599.03,8.77 600.97,7.23 602.21,6.64">
+        <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" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="s1" to="s2" fromLane="0" toLane="1" dir="s" state="M"/>
+    <connection from="s1" to="s2" fromLane="1" toLane="2" dir="s" state="M"/>
+    <connection from="s2" to="s2-AddedOffRampEdge" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="s2" to="s2-AddedOffRampEdge" fromLane="0" toLane="1" dir="s" state="M"/>
+    <connection from="s2" to="s2-AddedOffRampEdge" fromLane="1" toLane="2" dir="s" state="M"/>
+    <connection from="s2" to="s2-AddedOffRampEdge" fromLane="2" toLane="3" dir="s" state="M"/>
+    <connection from="s2-AddedOffRampEdge" to="s3" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="s2-AddedOffRampEdge" to="s3" fromLane="1" toLane="1" dir="s" state="M"/>
+    <connection from="s2-AddedOffRampEdge" to="s3" fromLane="2" toLane="2" dir="s" state="M"/>
+    <connection from="s2-AddedOffRampEdge" to="s3" fromLane="3" toLane="3" dir="s" state="M"/>
+    <connection from="s3" to="off" fromLane="0" toLane="0" dir="R" state="M"/>
+    <connection from="s3" to="s4" fromLane="1" toLane="0" dir="s" state="M"/>
+    <connection from="s3" to="s4" fromLane="2" toLane="1" dir="s" state="M"/>
+    <connection from="s3" to="s4" fromLane="3" toLane="2" dir="s" state="M"/>
+
+</net>
diff --git a/tests/netconvert/function/ramps/both_ramp_overlap/options.netconvert b/tests/netconvert/function/ramps/both_ramp_overlap/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_overlap/output.netconvert b/tests/netconvert/function/ramps/both_ramp_overlap/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/function/ramps/testsuite.netconvert b/tests/netconvert/function/ramps/testsuite.netconvert
@@ -37,6 +37,9 @@ both_ramp_id_clash
 # edge length is the same as the desired ramp length
 both_ramp_split_threshold
 
+# two ramps are build and they overlap
+both_ramp_overlap
+
 # real_world1: bs
 real_world1
 no_ramps_for_railways