added tests refs #21, #13570

eclipse-sumo · Dec 20, 2024 · ba65e57 · ba65e57
1 parent c613fb6
commit ba65e57
Show file tree

Hide file tree

Showing 16 changed files with 307 additions and 0 deletions.
diff --git a/tests/netconvert/function/opposites/different_lengths_nofix/errors.netconvert b/tests/netconvert/function/opposites/different_lengths_nofix/errors.netconvert
diff --git a/tests/netconvert/function/opposites/different_lengths_nofix/input_net.net.xml b/tests/netconvert/function/opposites/different_lengths_nofix/input_net.net.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 05 Jul 2017 09:23:52 AM CEST by Netedit Version dev-SVN-r25085
+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/netconvertConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="/scr1/sumoID/sumo/tests/netconvert/function/opposites/different_lengths/input_net.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="/scr1/sumoID/sumo/tests/netconvert/function/opposites/different_lengths/input_net.net.xml"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+        <lefthand value="false"/>
+        <junctions.corner-detail value="0"/>
+        <rectangular-lane-cut value="false"/>
+        <walkingareas value="false"/>
+    </processing>
+
+</configuration>
+-->
+
+<net version="0.27" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="100.00,100.00" convBoundary="100.00,0.00,200.00,100.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id="EC" from="E" to="S" priority="2" shape="200.00,100.00 100.00,100.00 100.00,0.00">
+        <lane id="EC_0" index="0" speed="13.89" length="206.60" shape="200.00,104.95 95.05,104.95 95.05,0.00"/>
+        <lane id="EC_1" index="1" speed="13.89" length="206.60" shape="200.00,101.65 98.35,101.65 98.35,0.00"/>
+    </edge>
+    <edge id="SC" from="S" to="E" priority="2" shape="100.00,0.00 100.00,100.00 200.00,100.00">
+        <lane id="SC_0" index="0" speed="13.89" length="193.40" shape="104.95,0.00 104.95,95.05 200.00,95.05"/>
+        <lane id="SC_1" index="1" speed="13.89" length="193.40" shape="101.65,0.00 101.65,98.35 200.00,98.35"/>
+    </edge>
+
+    <junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="SC_0 SC_1" intLanes="" shape="200.00,100.05 200.00,93.45 200.00,99.95"/>
+    <junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="EC_0 EC_1" intLanes="" shape="100.05,-0.00 93.45,0.00 99.95,-0.00"/>
+
+</net>
diff --git a/tests/netconvert/function/opposites/different_lengths_nofix/net.netconvert b/tests/netconvert/function/opposites/different_lengths_nofix/net.netconvert
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-02-29 13:56:10 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>
+        <sumo-net-file value="input_net.net.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <output-file value="net.net.xml"/>
+    </output>
+
+    <processing>
+        <geometry.min-radius.fix.railways value="false"/>
+        <geometry.max-grade.fix value="false"/>
+        <offset.disable-normalization value="true"/>
+        <opposites.guess value="true"/>
+        <lefthand value="0"/>
+    </processing>
+
+    <junctions>
+        <no-internal-links value="true"/>
+        <no-turnarounds value="true"/>
+        <junctions.corner-detail value="0"/>
+        <junctions.limit-turn-speed value="-1.00"/>
+        <rectangular-lane-cut value="0"/>
+    </junctions>
+
+    <pedestrian>
+        <walkingareas value="0"/>
+    </pedestrian>
+
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
+</configuration>
+-->
+
+<net version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="100.00,100.00" convBoundary="100.00,0.00,200.00,100.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id="EC" from="E" to="S" priority="2" shape="200.00,100.00 100.00,100.00 100.00,0.00">
+        <lane id="EC_0" index="0" speed="13.89" length="200.00" shape="200.00,104.80 95.20,104.80 95.20,0.00"/>
+        <lane id="EC_1" index="1" speed="13.89" length="200.00" shape="200.00,101.60 98.40,101.60 98.40,0.00">
+            <neigh lane="SC_1"/>
+        </lane>
+    </edge>
+    <edge id="SC" from="S" to="E" priority="2" shape="100.00,0.00 100.00,100.00 200.00,100.00">
+        <lane id="SC_0" index="0" speed="13.89" length="200.00" shape="104.80,-0.00 104.80,95.20 200.00,95.20"/>
+        <lane id="SC_1" index="1" speed="13.89" length="200.00" shape="101.60,-0.00 101.60,98.40 200.00,98.40">
+            <neigh lane="EC_1"/>
+        </lane>
+    </edge>
+
+    <junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="SC_0 SC_1" intLanes="" shape="200.00,100.00 200.00,93.60 200.00,100.00"/>
+    <junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="EC_0 EC_1" intLanes="" shape="100.00,0.00 93.60,0.00 100.00,0.00"/>
+
+</net>
diff --git a/tests/netconvert/function/opposites/different_lengths_nofix/options.netconvert b/tests/netconvert/function/opposites/different_lengths_nofix/options.netconvert
@@ -0,0 +1,2 @@
+-s input_net.net.xml --opposites.guess --output net.net.xml
+--opposites.guess.fix-lengths false
diff --git a/tests/netconvert/function/opposites/different_lengths_nofix/output.netconvert b/tests/netconvert/function/opposites/different_lengths_nofix/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/function/opposites/different_loadedLengths/errors.netconvert b/tests/netconvert/function/opposites/different_loadedLengths/errors.netconvert
@@ -0,0 +1 @@
+Warning: Averaging edge lengths for lane 'SC_1' (length 190.00) and edge 'EC' (length 210.00).
diff --git a/tests/netconvert/function/opposites/different_loadedLengths/input_net.net.xml b/tests/netconvert/function/opposites/different_loadedLengths/input_net.net.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 05 Jul 2017 09:23:52 AM CEST by Netedit Version dev-SVN-r25085
+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/netconvertConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="/scr1/sumoID/sumo/tests/netconvert/function/opposites/different_lengths/input_net.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="/scr1/sumoID/sumo/tests/netconvert/function/opposites/different_lengths/input_net.net.xml"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+        <lefthand value="false"/>
+        <junctions.corner-detail value="0"/>
+        <rectangular-lane-cut value="false"/>
+        <walkingareas value="false"/>
+    </processing>
+
+</configuration>
+-->
+
+<net version="0.27" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="100.00,100.00" convBoundary="100.00,0.00,200.00,100.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id="EC" from="E" to="S" priority="2" length="210" shape="200.00,100.00 100.00,100.00 100.00,0.00">
+        <lane id="EC_0" index="0" speed="13.89" length="206.60" shape="200.00,104.95 95.05,104.95 95.05,0.00"/>
+        <lane id="EC_1" index="1" speed="13.89" length="206.60" shape="200.00,101.65 98.35,101.65 98.35,0.00"/>
+    </edge>
+    <edge id="SC" from="S" to="E" priority="2" length="190" shape="100.00,0.00 100.00,100.00 200.00,100.00">
+        <lane id="SC_0" index="0" speed="13.89" length="193.40" shape="104.95,0.00 104.95,95.05 200.00,95.05"/>
+        <lane id="SC_1" index="1" speed="13.89" length="193.40" shape="101.65,0.00 101.65,98.35 200.00,98.35"/>
+    </edge>
+
+    <junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="SC_0 SC_1" intLanes="" shape="200.00,100.05 200.00,93.45 200.00,99.95"/>
+    <junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="EC_0 EC_1" intLanes="" shape="100.05,-0.00 93.45,0.00 99.95,-0.00"/>
+
+</net>
diff --git a/tests/netconvert/function/opposites/different_loadedLengths/net.netconvert b/tests/netconvert/function/opposites/different_loadedLengths/net.netconvert
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-12-20 22:01:46 by Eclipse SUMO netconvert Version v1_21_0+1575-a9c9568afea
+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>
+        <sumo-net-file value="input_net.net.xml"/>
+    </input>
+
+    <output>
+        <write-license value="true"/>
+        <output-file value="net.net.xml"/>
+    </output>
+
+    <processing>
+        <geometry.min-radius.fix.railways value="false"/>
+        <geometry.max-grade.fix value="false"/>
+        <offset.disable-normalization value="true"/>
+        <opposites.guess value="true"/>
+        <lefthand value="0"/>
+    </processing>
+
+    <junctions>
+        <no-internal-links value="true"/>
+        <no-turnarounds value="true"/>
+        <junctions.corner-detail value="0"/>
+        <junctions.limit-turn-speed value="-1.00"/>
+        <rectangular-lane-cut value="0"/>
+    </junctions>
+
+    <pedestrian>
+        <walkingareas value="0"/>
+    </pedestrian>
+
+    <report>
+        <xml-validation value="never"/>
+    </report>
+
+</netconvertConfiguration>
+-->
+
+<net version="1.20" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="100.00,100.00" convBoundary="100.00,0.00,200.00,100.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id="EC" from="E" to="S" priority="2" length="200.00" shape="200.00,100.00 100.00,100.00 100.00,0.00">
+        <lane id="EC_0" index="0" speed="13.89" length="200.00" shape="200.00,104.80 95.20,104.80 95.20,0.00"/>
+        <lane id="EC_1" index="1" speed="13.89" length="200.00" shape="200.00,101.60 98.40,101.60 98.40,0.00">
+            <neigh lane="SC_1"/>
+        </lane>
+    </edge>
+    <edge id="SC" from="S" to="E" priority="2" length="200.00" shape="100.00,0.00 100.00,100.00 200.00,100.00">
+        <lane id="SC_0" index="0" speed="13.89" length="200.00" shape="104.80,-0.00 104.80,95.20 200.00,95.20"/>
+        <lane id="SC_1" index="1" speed="13.89" length="200.00" shape="101.60,-0.00 101.60,98.40 200.00,98.40">
+            <neigh lane="EC_1"/>
+        </lane>
+    </edge>
+
+    <junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="SC_0 SC_1" intLanes="" shape="200.00,100.00 200.00,93.60 200.00,100.00"/>
+    <junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="EC_0 EC_1" intLanes="" shape="100.00,0.00 93.60,0.00 100.00,0.00"/>
+
+</net>
diff --git a/tests/netconvert/function/opposites/different_loadedLengths/options.netconvert b/tests/netconvert/function/opposites/different_loadedLengths/options.netconvert
@@ -0,0 +1 @@
+-s input_net.net.xml --opposites.guess --output net.net.xml
diff --git a/tests/netconvert/function/opposites/different_loadedLengths/output.netconvert b/tests/netconvert/function/opposites/different_loadedLengths/output.netconvert
@@ -0,0 +1 @@
+Success.
diff --git a/tests/netconvert/function/opposites/different_loadedLengths_nofix/errors.netconvert b/tests/netconvert/function/opposites/different_loadedLengths_nofix/errors.netconvert
@@ -0,0 +1,4 @@
+Error: Opposite lane 'SC_1' (length 190.00) differs in length from edge 'EC' (length 210.00). Set --opposites.guess.fix-lengths to fix this.
+Warning: Adapting missing opposite lane 'SC_1' for edge 'EC'.
+Error: Opposite lane 'EC_1' (length 210.00) differs in length from edge 'SC' (length 190.00). Set --opposites.guess.fix-lengths to fix this.
+Quitting (on error).
diff --git a/tests/netconvert/function/opposites/different_loadedLengths_nofix/exitcode.netconvert b/tests/netconvert/function/opposites/different_loadedLengths_nofix/exitcode.netconvert
@@ -0,0 +1 @@
+1
diff --git a/tests/netconvert/function/opposites/different_loadedLengths_nofix/input_net.net.xml b/tests/netconvert/function/opposites/different_loadedLengths_nofix/input_net.net.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on Wed 05 Jul 2017 09:23:52 AM CEST by Netedit Version dev-SVN-r25085
+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/netconvertConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="/scr1/sumoID/sumo/tests/netconvert/function/opposites/different_lengths/input_net.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="/scr1/sumoID/sumo/tests/netconvert/function/opposites/different_lengths/input_net.net.xml"/>
+    </output>
+
+    <processing>
+        <no-turnarounds value="true"/>
+        <offset.disable-normalization value="true"/>
+        <lefthand value="false"/>
+        <junctions.corner-detail value="0"/>
+        <rectangular-lane-cut value="false"/>
+        <walkingareas value="false"/>
+    </processing>
+
+</configuration>
+-->
+
+<net version="0.27" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="100.00,100.00" convBoundary="100.00,0.00,200.00,100.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id="EC" from="E" to="S" priority="2" length="210" shape="200.00,100.00 100.00,100.00 100.00,0.00">
+        <lane id="EC_0" index="0" speed="13.89" length="206.60" shape="200.00,104.95 95.05,104.95 95.05,0.00"/>
+        <lane id="EC_1" index="1" speed="13.89" length="206.60" shape="200.00,101.65 98.35,101.65 98.35,0.00"/>
+    </edge>
+    <edge id="SC" from="S" to="E" priority="2" length="190" shape="100.00,0.00 100.00,100.00 200.00,100.00">
+        <lane id="SC_0" index="0" speed="13.89" length="193.40" shape="104.95,0.00 104.95,95.05 200.00,95.05"/>
+        <lane id="SC_1" index="1" speed="13.89" length="193.40" shape="101.65,0.00 101.65,98.35 200.00,98.35"/>
+    </edge>
+
+    <junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="SC_0 SC_1" intLanes="" shape="200.00,100.05 200.00,93.45 200.00,99.95"/>
+    <junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="EC_0 EC_1" intLanes="" shape="100.05,-0.00 93.45,0.00 99.95,-0.00"/>
+
+</net>
diff --git a/tests/netconvert/function/opposites/different_loadedLengths_nofix/options.netconvert b/tests/netconvert/function/opposites/different_loadedLengths_nofix/options.netconvert
@@ -0,0 +1,2 @@
+-s input_net.net.xml --opposites.guess --output net.net.xml
+--opposites.guess.fix-lengths false
diff --git a/tests/netconvert/function/opposites/different_loadedLengths_nofix/output.netconvert b/tests/netconvert/function/opposites/different_loadedLengths_nofix/output.netconvert
diff --git a/tests/netconvert/function/opposites/testsuite.netconvert b/tests/netconvert/function/opposites/testsuite.netconvert
@@ -37,6 +37,15 @@ different_lengths
 # guess opposites returns edges with different length but their length is adjusted automatically
 different_lengths_fix
 
+# guess opposites returns edges with different length
+different_lengths_nofix
+
+# guess opposites returns edges with different length
+different_loadedLengths
+
+# guess opposites returns edges with different length
+different_loadedLengths_nofix
+
 # load network with invalid opposites
 load_invalid
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-s input_net.net.xml --opposites.guess --output net.net.xml
		--opposites.guess.fix-lengths false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Warning: Averaging edge lengths for lane 'SC_1' (length 190.00) and edge 'EC' (length 210.00).