added test refs #4813

eclipse-sumo · Nov 19, 2018 · 6628181 · 6628181
1 parent 89e8810
commit 6628181
Show file tree

Hide file tree

Showing 13 changed files with 886 additions and 0 deletions.
diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/errors.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/errors.netconvert
diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/input_net.net.xml b/tests/netconvert/import/SUMO/checkLaneFoes/input_net.net.xml
diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/net.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/net.netconvert
diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/options.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/options.netconvert
@@ -0,0 +1 @@
+ --sumo-net-file input_net.net.xml --output=net.net.xml
diff --git a/tests/netconvert/import/SUMO/checkLaneFoes/output.netconvert b/tests/netconvert/import/SUMO/checkLaneFoes/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/import/SUMO/testsuite.netconvert b/tests/netconvert/import/SUMO/testsuite.netconvert
@@ -92,3 +92,7 @@ limit-turn-speed
 
 # re-import limited speed on junctions based on radius and overwrite with a new limit argument
 limit-turn-speed_overwrite
+
+# import check-lane-foes options from .net.xml
+# 
+checkLaneFoes
diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/errors.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/errors.netconvert
diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.edg.xml b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.edg.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 29 Jan 2014 03:30:12 PM CET by Netedit Version dev-SVN-r15523
+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
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netedit.exeConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net4a.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="net4a.net.xml"/>
+        <plain-output-prefix value="/scr1/erdm_ja/sip-svn-trunk/projects/colombo/prototype4/plain4a"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+    </processing>
+
+</configuration>
+-->
+
+<edges version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
+    <edge id="CE" from="C" to="E" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="CN" from="C" to="N" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="CS" from="C" to="S" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="CW" from="C" to="W" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="EC" from="E" to="C" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="NC" from="N" to="C" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="SC" from="S" to="C" priority="2" numLanes="2" speed="13.89"/>
+    <edge id="WC" from="W" to="C" priority="2" numLanes="2" speed="13.89"/>
+</edges>
diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.nod.xml b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/input_plain.nod.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 29 Jan 2014 03:30:12 PM CET by Netedit Version dev-SVN-r15523
+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
+SPDX-License-Identifier: EPL-2.0
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netedit.exeConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net4a.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="net4a.net.xml"/>
+        <plain-output-prefix value="/scr1/erdm_ja/sip-svn-trunk/projects/colombo/prototype4/plain4a"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+    </processing>
+
+</configuration>
+-->
+
+<nodes version="0.13" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
+    <location netOffset="100.00,100.00" convBoundary="0.00,0.00,200.00,200.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <node id="C" x="100.00" y="100.00" type="traffic_light" tl="C"/>
+    <node id="E" x="200.00" y="100.00" type="priority"/>
+    <node id="N" x="100.00" y="200.00" type="dead_end"/>
+    <node id="S" x="100.00" y="0.00" type="priority"/>
+    <node id="W" x="0.00" y="100.00" type="dead_end"/>
+</nodes>
diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/net.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/net.netconvert
diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/options.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/options.netconvert
@@ -0,0 +1,2 @@
+ --edge-files=input_plain.edg.xml --node-files=input_plain.nod.xml --output=net.net.xml
+ --check-lane-foes.all
diff --git a/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/output.netconvert b/tests/netconvert/import/XML/junctionLogic/checkLaneFoes/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/import/XML/junctionLogic/testsuite.netconvert b/tests/netconvert/import/XML/junctionLogic/testsuite.netconvert
@@ -6,3 +6,6 @@ parallel_bike_path
 
 # as above but with fewer edges
 parallel_bike_path2
+
+# do not declare foes when the target lanes are conflict-free even though the edgse are in conflict
+checkLaneFoes