Skip to content

Commit

Permalink
added test refs #9521
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Nov 11, 2021
1 parent f6b3cc8 commit cd051bb
Show file tree
Hide file tree
Showing 6 changed files with 299 additions and 0 deletions.
Empty file added tests/netconvert/function/tls_programs/group-signals_crossings/errors.netconvert
View file
Empty file.
143 changes: 143 additions & 0 deletions tests/netconvert/function/tls_programs/group-signals_crossings/input_net.net.xml
View file
@@ -0,0 +1,143 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2021-11-11 08:41:14 by Eclipse SUMO netedit Version v1_10_0+2141-4b85b4f
<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_net3.net.xml"/>
</input>
<output>
<output-file value="input_net3.net.xml"/>
</output>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<no-turnarounds value="true"/>
<junctions.corner-detail value="0"/>
<junctions.limit-turn-speed value="-1"/>
<junctions.small-radius value="0"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="true"/>
</pedestrian>
<report>
<aggregate-warnings value="5"/>
</report>
</configuration>
-->

<net version="1.9" walkingareas="true" 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="0.00,0.00,200.00,200.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":C_0" function="internal">
<lane id=":C_0_0" index="0" allow="passenger" speed="13.89" length="4.00" shape="104.00,107.80 100.00,107.80"/>
<lane id=":C_0_1" index="1" allow="passenger" speed="13.89" length="4.00" shape="104.00,104.60 100.00,104.60"/>
</edge>
<edge id=":C_2" function="internal">
<lane id=":C_2_0" index="0" allow="passenger" speed="13.89" length="4.00" shape="100.00,92.20 104.00,92.20"/>
<lane id=":C_2_1" index="1" allow="passenger" speed="13.89" length="4.00" shape="100.00,95.40 104.00,95.40"/>
</edge>
<edge id=":C_c1" function="crossing" crossingEdges="EC">
<lane id=":C_c1_0" index="0" allow="pedestrian" speed="1.00" length="6.40" width="4.00" shape="102.00,103.00 102.00,109.40"/>
</edge>
<edge id=":C_c2" function="crossing" crossingEdges="CE">
<lane id=":C_c2_0" index="0" allow="pedestrian" speed="1.00" length="6.40" width="4.00" shape="102.00,90.60 102.00,97.00"/>
</edge>
<edge id=":C_w0" function="walkingarea">
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="1.00" length="0.10" width="4.00" shape="100.00,109.40 104.00,109.40 100.00,109.40"/>
</edge>
<edge id=":C_w1" function="walkingarea">
<lane id=":C_w1_0" index="0" allow="pedestrian" speed="1.00" length="0.10" width="4.00" shape="100.00,90.60 104.00,90.60 100.00,90.60"/>
</edge>
<edge id=":C_w2" function="walkingarea">
<lane id=":C_w2_0" index="0" allow="pedestrian" speed="1.00" length="6.00" width="4.00" shape="100.00,97.00 104.00,97.00 104.00,103.00 100.00,103.00"/>
</edge>
<edge id=":E_0" function="internal">
<lane id=":E_0_0" index="0" allow="passenger" speed="13.89" length="13.44" shape="200.00,95.40 203.45,97.70 204.60,100.00 203.45,102.30 200.00,104.60"/>
</edge>
<edge id=":W_0" function="internal">
<lane id=":W_0_0" index="0" allow="passenger" speed="13.89" length="13.44" shape="0.00,104.60 -3.45,102.30 -4.60,100.00 -3.45,97.70 0.00,95.40"/>
</edge>

<edge id="CE" from="C" to="E" priority="3" shape="100.00,97.00 200.00,97.00">
<lane id="CE_0" index="0" allow="passenger" speed="13.89" length="96.00" shape="104.00,92.20 200.00,92.20"/>
<lane id="CE_1" index="1" allow="passenger" speed="13.89" length="96.00" shape="104.00,95.40 200.00,95.40"/>
</edge>
<edge id="CN" from="C" to="N" priority="2">
<lane id="CN_0" index="0" allow="pedestrian" speed="13.89" length="90.60" width="4.00" shape="102.00,109.40 102.00,200.00"/>
</edge>
<edge id="CW" from="C" to="W" priority="3" shape="100.00,103.00 0.00,103.00">
<lane id="CW_0" index="0" allow="passenger" speed="13.89" length="100.00" shape="100.00,107.80 0.00,107.80"/>
<lane id="CW_1" index="1" allow="passenger" speed="13.89" length="100.00" shape="100.00,104.60 0.00,104.60"/>
</edge>
<edge id="EC" from="E" to="C" priority="3" shape="200.00,103.00 100.00,103.00">
<lane id="EC_0" index="0" allow="passenger" speed="13.89" length="96.00" shape="200.00,107.80 104.00,107.80"/>
<lane id="EC_1" index="1" allow="passenger" speed="13.89" length="96.00" shape="200.00,104.60 104.00,104.60"/>
</edge>
<edge id="SC" from="S" to="C" priority="2">
<lane id="SC_0" index="0" allow="pedestrian" speed="13.89" length="90.60" width="4.00" shape="102.00,0.00 102.00,90.60"/>
</edge>
<edge id="WC" from="W" to="C" priority="3" shape="0.00,97.00 100.00,97.00">
<lane id="WC_0" index="0" allow="passenger" speed="13.89" length="100.00" shape="0.00,92.20 100.00,92.20"/>
<lane id="WC_1" index="1" allow="passenger" speed="13.89" length="100.00" shape="0.00,95.40 100.00,95.40"/>
</edge>

<tlLogic id="C" type="static" programID="0" offset="0">
<phase duration="77" state="GGGGrrrr"/>
<phase duration="3" state="yyyyrrrr"/>
<phase duration="5" state="rrrrGGGG"/>
<phase duration="5" state="rrrrGrrG"/>
<phase duration="5" state="rrrrrrrr"/>
</tlLogic>

<junction id="C" type="traffic_light" x="100.00" y="100.00" incLanes="EC_0 EC_1 SC_0 WC_0 WC_1 :C_w2_0 :C_w1_0" intLanes=":C_0_0 :C_0_1 :C_2_0 :C_2_1 :C_c1_0 :C_c2_0" shape="100.00,109.40 104.00,109.40 104.00,90.60 100.00,90.60" radius="5.00">
<request index="0" response="010000" foes="010000" cont="0"/>
<request index="1" response="010000" foes="010000" cont="0"/>
<request index="2" response="100000" foes="100000" cont="0"/>
<request index="3" response="100000" foes="100000" cont="0"/>
<request index="4" response="000000" foes="000011" cont="0"/>
<request index="5" response="000000" foes="001100" cont="0"/>
</junction>
<junction id="E" type="priority" x="200.00" y="100.00" incLanes="CE_0 CE_1" intLanes=":E_0_0" shape="200.00,103.00 200.00,90.60 200.00,97.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="N" type="dead_end" x="100.00" y="200.00" incLanes="CN_0" intLanes="" shape="104.00,200.00 100.00,200.00"/>
<junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="" intLanes="" shape="100.00,0.00 104.00,0.00"/>
<junction id="W" type="priority" x="0.00" y="100.00" incLanes="CW_0 CW_1" intLanes=":W_0_0" shape="0.00,97.00 0.00,109.40 0.00,103.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="CE" to="EC" fromLane="1" toLane="1" via=":E_0_0" dir="t" state="M"/>
<connection from="CW" to="WC" fromLane="1" toLane="1" via=":W_0_0" dir="t" state="M"/>
<connection from="EC" to="CW" fromLane="0" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="s" state="o"/>
<connection from="EC" to="CW" fromLane="1" toLane="1" via=":C_0_1" tl="C" linkIndex="1" dir="s" state="o"/>
<connection from="WC" to="CE" fromLane="0" toLane="0" via=":C_2_0" tl="C" linkIndex="2" dir="s" state="o"/>
<connection from="WC" to="CE" fromLane="1" toLane="1" via=":C_2_1" tl="C" linkIndex="3" dir="s" state="o"/>

<connection from=":C_0" to="CW" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_0" to="CW" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_2" to="CE" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_2" to="CE" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":E_0" to="EC" fromLane="0" toLane="1" dir="t" state="M"/>
<connection from=":W_0" to="WC" fromLane="0" toLane="1" dir="t" state="M"/>

<connection from=":C_c1" to=":C_w0" fromLane="0" toLane="0" tl="C" linkIndex="5" dir="s" state="M"/>
<connection from=":C_c2" to=":C_w2" fromLane="0" toLane="0" tl="C" linkIndex="7" dir="s" state="M"/>
<connection from=":C_w0" to="CN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_w1" to=":C_c2" fromLane="0" toLane="0" tl="C" linkIndex="6" dir="s" state="M"/>
<connection from="SC" to=":C_w1" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_w2" to=":C_c1" fromLane="0" toLane="0" tl="C" linkIndex="4" dir="s" state="M"/>
</net>
151 changes: 151 additions & 0 deletions tests/netconvert/function/tls_programs/group-signals_crossings/net.netconvert
View file
@@ -0,0 +1,151 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2021-11-11 09:05:15 by Eclipse SUMO netconvert Version v1_10_0+2141-4b85b4f
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="input_net.net.xml"/>
</input>
<output>
<write-license value="true"/>
</output>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<tls_building>
<tls.group-signals value="true"/>
</tls_building>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="0"/>
<junctions.limit-turn-speed value="-1"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="true"/>
</pedestrian>
<report>
<xml-validation value="never"/>
<aggregate-warnings value="5"/>
</report>
</configuration>
-->

<net version="1.9" walkingareas="true" 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="0.00,0.00,200.00,200.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":C_0" function="internal">
<lane id=":C_0_0" index="0" allow="passenger" speed="13.89" length="7.00" shape="105.50,107.80 98.50,107.80"/>
<lane id=":C_0_1" index="1" allow="passenger" speed="13.89" length="7.00" shape="105.50,104.60 98.50,104.60"/>
</edge>
<edge id=":C_2" function="internal">
<lane id=":C_2_0" index="0" allow="passenger" speed="13.89" length="7.00" shape="98.50,92.20 105.50,92.20"/>
<lane id=":C_2_1" index="1" allow="passenger" speed="13.89" length="7.00" shape="98.50,95.40 105.50,95.40"/>
</edge>
<edge id=":C_c0" function="crossing" crossingEdges="EC">
<lane id=":C_c0_0" index="0" allow="pedestrian" speed="1.00" length="6.40" width="4.00" shape="103.50,103.00 103.50,109.40"/>
</edge>
<edge id=":C_c1" function="crossing" crossingEdges="CE">
<lane id=":C_c1_0" index="0" allow="pedestrian" speed="1.00" length="6.40" width="4.00" shape="103.50,90.60 103.50,97.00"/>
</edge>
<edge id=":C_w0" function="walkingarea">
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="1.00" length="2.12" width="4.00" shape="100.00,110.90 104.00,110.90 105.50,109.40 101.50,109.40"/>
</edge>
<edge id=":C_w1" function="walkingarea">
<lane id=":C_w1_0" index="0" allow="pedestrian" speed="1.00" length="2.12" width="4.00" shape="101.50,90.60 105.50,90.60 104.00,89.10 100.00,89.10"/>
</edge>
<edge id=":C_w2" function="walkingarea">
<lane id=":C_w2_0" index="0" allow="pedestrian" speed="1.00" length="6.00" width="4.00" shape="101.50,97.00 105.50,97.00 105.50,103.00 101.50,103.00"/>
</edge>
<edge id=":E_0" function="internal">
<lane id=":E_0_0" index="0" allow="passenger" speed="13.89" length="13.44" shape="200.00,95.40 203.45,97.70 204.60,100.00 203.45,102.30 200.00,104.60"/>
</edge>
<edge id=":W_0" function="internal">
<lane id=":W_0_0" index="0" allow="passenger" speed="13.89" length="13.44" shape="0.00,104.60 -3.45,102.30 -4.60,100.00 -3.45,97.70 0.00,95.40"/>
</edge>

<edge id="CE" from="C" to="E" priority="3" shape="100.00,97.00 200.00,97.00">
<lane id="CE_0" index="0" allow="passenger" speed="13.89" length="94.50" shape="105.50,92.20 200.00,92.20"/>
<lane id="CE_1" index="1" allow="passenger" speed="13.89" length="94.50" shape="105.50,95.40 200.00,95.40"/>
</edge>
<edge id="CN" from="C" to="N" priority="2">
<lane id="CN_0" index="0" allow="pedestrian" speed="13.89" length="89.10" width="4.00" shape="102.00,110.90 102.00,200.00"/>
</edge>
<edge id="CW" from="C" to="W" priority="3" shape="100.00,103.00 0.00,103.00">
<lane id="CW_0" index="0" allow="passenger" speed="13.89" length="98.50" shape="98.50,107.80 0.00,107.80"/>
<lane id="CW_1" index="1" allow="passenger" speed="13.89" length="98.50" shape="98.50,104.60 0.00,104.60"/>
</edge>
<edge id="EC" from="E" to="C" priority="3" shape="200.00,103.00 100.00,103.00">
<lane id="EC_0" index="0" allow="passenger" speed="13.89" length="94.50" shape="200.00,107.80 105.50,107.80"/>
<lane id="EC_1" index="1" allow="passenger" speed="13.89" length="94.50" shape="200.00,104.60 105.50,104.60"/>
</edge>
<edge id="SC" from="S" to="C" priority="2">
<lane id="SC_0" index="0" allow="pedestrian" speed="13.89" length="89.10" width="4.00" shape="102.00,0.00 102.00,89.10"/>
</edge>
<edge id="WC" from="W" to="C" priority="3" shape="0.00,97.00 100.00,97.00">
<lane id="WC_0" index="0" allow="passenger" speed="13.89" length="98.50" shape="0.00,92.20 98.50,92.20"/>
<lane id="WC_1" index="1" allow="passenger" speed="13.89" length="98.50" shape="0.00,95.40 98.50,95.40"/>
</edge>

<tlLogic id="C" type="static" programID="0" offset="0">
<phase duration="77" state="GGrrrr"/>
<phase duration="3" state="yyrrrr"/>
<phase duration="5" state="rrGGGG"/>
<phase duration="5" state="rrGrrG"/>
<phase duration="5" state="rrrrrr"/>
</tlLogic>

<junction id="C" type="traffic_light" x="100.00" y="100.00" incLanes="EC_0 EC_1 SC_0 WC_0 WC_1 :C_w2_0 :C_w1_0" intLanes=":C_0_0 :C_0_1 :C_2_0 :C_2_1 :C_c0_0 :C_c1_0" shape="100.00,110.90 104.00,110.90 105.50,109.40 105.50,90.60 104.00,89.10 100.00,89.10 98.50,90.60 98.50,109.40" radius="5.00">
<request index="0" response="010000" foes="010000" cont="0"/>
<request index="1" response="010000" foes="010000" cont="0"/>
<request index="2" response="100000" foes="100000" cont="0"/>
<request index="3" response="100000" foes="100000" cont="0"/>
<request index="4" response="000000" foes="000011" cont="0"/>
<request index="5" response="000000" foes="001100" cont="0"/>
</junction>
<junction id="E" type="priority" x="200.00" y="100.00" incLanes="CE_0 CE_1" intLanes=":E_0_0" shape="200.00,103.00 200.00,90.60 200.00,97.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="N" type="dead_end" x="100.00" y="200.00" incLanes="CN_0" intLanes="" shape="104.00,200.00 100.00,200.00"/>
<junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="" intLanes="" shape="100.00,0.00 104.00,0.00"/>
<junction id="W" type="priority" x="0.00" y="100.00" incLanes="CW_0 CW_1" intLanes=":W_0_0" shape="0.00,97.00 0.00,109.40 0.00,103.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="CE" to="EC" fromLane="1" toLane="1" via=":E_0_0" dir="t" state="M"/>
<connection from="CW" to="WC" fromLane="1" toLane="1" via=":W_0_0" dir="t" state="M"/>
<connection from="EC" to="CW" fromLane="0" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="s" state="o"/>
<connection from="EC" to="CW" fromLane="1" toLane="1" via=":C_0_1" tl="C" linkIndex="0" dir="s" state="o"/>
<connection from="WC" to="CE" fromLane="0" toLane="0" via=":C_2_0" tl="C" linkIndex="1" dir="s" state="o"/>
<connection from="WC" to="CE" fromLane="1" toLane="1" via=":C_2_1" tl="C" linkIndex="1" dir="s" state="o"/>

<connection from=":C_0" to="CW" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_0" to="CW" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_2" to="CE" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_2" to="CE" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":E_0" to="EC" fromLane="0" toLane="1" dir="t" state="M"/>
<connection from=":W_0" to="WC" fromLane="0" toLane="1" dir="t" state="M"/>

<connection from=":C_c0" to=":C_w0" fromLane="0" toLane="0" tl="C" linkIndex="5" dir="s" state="M"/>
<connection from=":C_c1" to=":C_w2" fromLane="0" toLane="0" tl="C" linkIndex="7" dir="s" state="M"/>
<connection from=":C_w0" to="CN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_w1" to=":C_c1" fromLane="0" toLane="0" tl="C" linkIndex="6" dir="s" state="M"/>
<connection from="SC" to=":C_w1" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_w2" to=":C_c0" fromLane="0" toLane="0" tl="C" linkIndex="4" dir="s" state="M"/>
</net>
1 change: 1 addition & 0 deletions tests/netconvert/function/tls_programs/group-signals_crossings/options.netconvert
View file
@@ -0,0 +1 @@
-s input_net.net.xml --tls.group-signals
1 change: 1 addition & 0 deletions tests/netconvert/function/tls_programs/group-signals_crossings/output.netconvert
View file
@@ -0,0 +1 @@
Success.
3 changes: 3 additions & 0 deletions tests/netconvert/function/tls_programs/testsuite.netconvert
View file
Expand Up @@ -46,5 +46,8 @@ group-signals
# create tls program with signal groups
group-signals2

# create tls program with signal groups
group-signals_crossings

# set distinct tls index for every connection
ungroup-signals

0 comments on commit cd051bb

Please sign in to comment.