Skip to content

Commit

Permalink
added test refs #14692, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Apr 10, 2024
1 parent e4432a3 commit 37c72b3
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 0 deletions.
1 change: 1 addition & 0 deletions tests/sumo/tls/actuated/right_turn_crossing_usable/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Warning: At actuated tlLogic 'C', actuated phase 5 has no controlling detector.
205 changes: 205 additions & 0 deletions tests/sumo/tls/actuated/right_turn_crossing_usable/net.net.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-10 16:36:36 by Eclipse SUMO netedit Version v1_19_0+1757-6a0074595dd
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="net3.net.xml"/>
</input>
<output>
<output-file value="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="0"/>
</processing>
<junctions>
<no-internal-links value="false"/>
<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>
</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="0.00,0.00,100.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="10.23" shape="96.80,110.80 96.14,107.48 94.15,105.10 90.84,103.68 90.70,103.66"/>
</edge>
<edge id=":C_1" function="internal">
<lane id=":C_1_0" index="0" allow="passenger" speed="13.89" length="21.91" shape="100.00,110.80 99.50,104.23 98.40,99.66 97.30,95.26 96.80,89.20"/>
</edge>
<edge id=":C_6" function="internal">
<lane id=":C_6_0" index="0" allow="passenger" speed="13.89" length="4.52" shape="90.70,103.66 86.20,103.20"/>
</edge>
<edge id=":C_2" function="internal">
<lane id=":C_2_0" index="0" allow="passenger" speed="13.89" length="21.60" shape="103.20,89.20 103.20,110.80"/>
</edge>
<edge id=":C_3" function="internal">
<lane id=":C_3_0" index="0" allow="passenger" speed="13.89" length="3.23" shape="100.00,89.20 99.55,92.40"/>
</edge>
<edge id=":C_7" function="internal">
<lane id=":C_7_0" index="0" allow="passenger" speed="13.89" length="19.19" shape="99.55,92.40 99.14,95.33 96.55,99.70 92.24,102.33 86.20,103.20"/>
</edge>
<edge id=":C_4" function="internal">
<lane id=":C_4_0" index="0" allow="passenger" speed="13.89" length="9.83" shape="86.20,96.80 90.84,96.33 94.15,94.90 95.15,93.70"/>
</edge>
<edge id=":C_5" function="internal">
<lane id=":C_5_0" index="0" allow="passenger" speed="13.89" length="18.03" shape="86.20,100.00 93.64,100.67 98.95,102.70 102.14,106.07 102.19,106.30"/>
</edge>
<edge id=":C_8" function="internal">
<lane id=":C_8_0" index="0" allow="passenger" speed="13.89" length="4.92" shape="95.15,93.70 96.14,92.53 96.80,89.20"/>
</edge>
<edge id=":C_9" function="internal">
<lane id=":C_9_0" index="0" allow="passenger" speed="13.89" length="4.61" shape="102.19,106.30 103.20,110.80"/>
</edge>
<edge id=":C_c0" function="crossing" crossingEdges="CN NC">
<lane id=":C_c0_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.50" shape="104.80,108.55 95.20,108.55" outlineShape="104.90,110.80 95.10,110.80 95.20,106.30 104.80,106.30 104.80,110.80"/>
</edge>
<edge id=":C_c1" function="crossing" crossingEdges="CS SC">
<lane id=":C_c1_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.50" shape="95.20,91.45 104.80,91.45" outlineShape="95.10,89.20 104.90,89.20 104.80,93.70 95.20,93.70 95.20,89.20"/>
</edge>
<edge id=":C_c2" function="crossing" crossingEdges="CW WC">
<lane id=":C_c2_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.50" shape="88.45,104.80 88.45,95.20" outlineShape="86.20,104.90 86.20,95.10 90.70,95.20 90.70,104.80 86.20,104.80"/>
</edge>
<edge id=":C_w0" function="walkingarea">
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="2.78" length="6.13" width="4.50" shape="90.70,104.80 86.20,104.80 92.20,110.80 95.20,110.80 95.20,106.30"/>
</edge>
<edge id=":C_w1" function="walkingarea">
<lane id=":C_w1_0" index="0" allow="pedestrian" speed="2.78" length="13.82" width="4.50" shape="104.80,106.30 104.80,110.80 107.80,110.80 107.80,89.20 104.80,89.20 104.80,93.70"/>
</edge>
<edge id=":C_w2" function="walkingarea">
<lane id=":C_w2_0" index="0" allow="pedestrian" speed="2.78" length="6.13" width="4.50" shape="95.20,93.70 95.20,89.20 92.20,89.20 86.20,95.20 90.70,95.20"/>
</edge>
<edge id=":N_0" function="internal">
<lane id=":N_0_0" index="0" allow="passenger" speed="13.89" length="4.67" shape="103.20,200.00 102.40,201.20 101.60,201.60 100.80,201.20 100.00,200.00"/>
</edge>
<edge id=":N_w0" function="walkingarea">
<lane id=":N_w0_0" index="0" allow="pedestrian" speed="2.78" length="12.60" width="3.00" shape="95.20,200.00 92.20,200.00 107.80,200.00 104.80,200.00"/>
</edge>
<edge id=":S_0" function="internal">
<lane id=":S_0_0" index="0" allow="passenger" speed="13.89" length="4.67" shape="96.80,0.00 97.60,-1.20 98.40,-1.60 99.20,-1.20 100.00,0.00"/>
</edge>
<edge id=":S_w0" function="walkingarea">
<lane id=":S_w0_0" index="0" allow="pedestrian" speed="2.78" length="12.60" width="3.00" shape="104.80,0.00 107.80,0.00 92.20,0.00 95.20,0.00"/>
</edge>
<edge id=":W_0" function="internal">
<lane id=":W_0_0" index="0" allow="passenger" speed="13.89" length="4.67" shape="0.00,103.20 -1.20,102.40 -1.60,101.60 -1.20,100.80 0.00,100.00"/>
</edge>

<edge id="CN" from="C" to="N" priority="2" spreadType="roadCenter">
<lane id="CN_0" index="0" allow="pedestrian" speed="13.89" length="89.20" width="3.00" shape="106.30,110.80 106.30,200.00"/>
<lane id="CN_1" index="1" allow="passenger" speed="13.89" length="89.20" shape="103.20,110.80 103.20,200.00"/>
</edge>
<edge id="CS" from="C" to="S" priority="2" spreadType="roadCenter">
<lane id="CS_0" index="0" allow="pedestrian" speed="13.89" length="89.20" width="3.00" shape="93.70,89.20 93.70,0.00"/>
<lane id="CS_1" index="1" allow="passenger" speed="13.89" length="89.20" shape="96.80,89.20 96.80,0.00"/>
</edge>
<edge id="CW" from="C" to="W" priority="3" spreadType="roadCenter">
<lane id="CW_0" index="0" allow="passenger" speed="13.89" length="86.20" shape="86.20,103.20 0.00,103.20"/>
</edge>
<edge id="NC" from="N" to="C" priority="2" spreadType="roadCenter">
<lane id="NC_0" index="0" allow="pedestrian" speed="13.89" length="89.20" width="3.00" shape="93.70,200.00 93.70,110.80"/>
<lane id="NC_1" index="1" allow="passenger" speed="13.89" length="89.20" shape="96.80,200.00 96.80,110.80"/>
<lane id="NC_2" index="2" allow="passenger" speed="13.89" length="89.20" shape="100.00,200.00 100.00,110.80"/>
</edge>
<edge id="SC" from="S" to="C" priority="2" spreadType="roadCenter">
<lane id="SC_0" index="0" allow="pedestrian" speed="13.89" length="89.20" width="3.00" shape="106.30,0.00 106.30,89.20"/>
<lane id="SC_1" index="1" allow="passenger" speed="13.89" length="89.20" shape="103.20,0.00 103.20,89.20"/>
<lane id="SC_2" index="2" allow="passenger" speed="13.89" length="89.20" shape="100.00,0.00 100.00,89.20"/>
</edge>
<edge id="WC" from="W" to="C" priority="3" spreadType="roadCenter">
<lane id="WC_0" index="0" allow="passenger" speed="13.89" length="86.20" shape="0.00,96.80 86.20,96.80"/>
<lane id="WC_1" index="1" allow="passenger" speed="13.89" length="86.20" shape="0.00,100.00 86.20,100.00"/>
</edge>

<tlLogic id="C" type="actuated" programID="0" offset="0">
<phase duration="33" state="gGGgrrrrG" minDur="5" maxDur="50"/>
<phase duration="5" state="gGGgrrrrr"/>
<phase duration="3" state="yyGgrrrrr"/>
<phase duration="6" state="rrGGrrrrr" minDur="5" maxDur="50"/>
<phase duration="3" state="rryyrrrrr"/>
<phase duration="32" state="rrrrggGGr" minDur="5" maxDur="50"/>
<phase duration="5" state="rrrrggrrr"/>
<phase duration="3" state="rrrryyrrr"/>
</tlLogic>

<junction id="C" type="traffic_light" x="100.00" y="100.00" incLanes="NC_0 NC_1 NC_2 SC_0 SC_1 SC_2 WC_0 WC_1 :C_w1_0 :C_w2_0 :C_w0_0" intLanes=":C_6_0 :C_1_0 :C_2_0 :C_7_0 :C_8_0 :C_9_0 :C_c0_0 :C_c1_0 :C_c2_0" shape="92.20,110.80 107.80,110.80 107.80,89.20 92.20,89.20 86.20,95.20 86.20,104.80" radius="6.00">
<request index="0" response="101000000" foes="101001000" cont="1"/>
<request index="1" response="011110000" foes="011111000" cont="0"/>
<request index="2" response="011100000" foes="011100000" cont="0"/>
<request index="3" response="110100011" foes="110100011" cont="1"/>
<request index="4" response="110000010" foes="110000010" cont="1"/>
<request index="5" response="101001110" foes="101001110" cont="1"/>
<request index="6" response="000000000" foes="000100111" cont="0"/>
<request index="7" response="000000000" foes="000011110" cont="0"/>
<request index="8" response="000000000" foes="000111001" cont="0"/>
</junction>
<junction id="N" type="priority" x="100.00" y="200.00" incLanes="CN_0 CN_1" intLanes=":N_0_0" shape="101.60,200.00 107.80,200.00 101.60,200.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="S" type="priority" x="100.00" y="0.00" incLanes="CS_0 CS_1" intLanes=":S_0_0" shape="98.40,0.00 92.20,0.00 98.40,0.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="W" type="priority" x="0.00" y="100.00" incLanes="CW_0" intLanes=":W_0_0" shape="0.00,101.60 0.00,104.80 0.00,101.60">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<junction id=":C_6_0" type="internal" x="90.70" y="103.66" incLanes=":C_0_0" intLanes=":C_3_0 :C_c0_0 :C_c2_0"/>
<junction id=":C_7_0" type="internal" x="99.55" y="92.40" incLanes=":C_3_0 NC_1 NC_2" intLanes=":C_0_0 :C_1_0 :C_5_0 :C_c1_0 :C_c2_0"/>
<junction id=":C_8_0" type="internal" x="95.15" y="93.70" incLanes=":C_4_0" intLanes=":C_1_0 :C_c1_0 :C_c2_0"/>
<junction id=":C_9_0" type="internal" x="102.19" y="106.30" incLanes=":C_5_0" intLanes=":C_1_0 :C_2_0 :C_3_0 :C_c0_0 :C_c2_0"/>

<connection from="CN" to="NC" fromLane="1" toLane="2" via=":N_0_0" dir="t" state="M"/>
<connection from="CS" to="SC" fromLane="1" toLane="2" via=":S_0_0" dir="t" state="M"/>
<connection from="CW" to="WC" fromLane="0" toLane="1" via=":W_0_0" dir="t" state="M"/>
<connection from="NC" to="CW" fromLane="1" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="r" state="o"/>
<connection from="NC" to="CS" fromLane="2" toLane="1" via=":C_1_0" tl="C" linkIndex="1" dir="s" state="o"/>
<connection from="SC" to="CN" fromLane="1" toLane="1" via=":C_2_0" tl="C" linkIndex="2" dir="s" state="o"/>
<connection from="SC" to="CW" fromLane="2" toLane="0" via=":C_3_0" tl="C" linkIndex="3" dir="l" state="o"/>
<connection from="WC" to="CS" fromLane="0" toLane="1" via=":C_4_0" tl="C" linkIndex="4" dir="r" state="o"/>
<connection from="WC" to="CN" fromLane="1" toLane="1" via=":C_5_0" tl="C" linkIndex="5" dir="l" state="o"/>

<connection from=":C_0" to="CW" fromLane="0" toLane="0" via=":C_6_0" dir="r" state="m"/>
<connection from=":C_6" to="CW" fromLane="0" toLane="0" dir="r" state="m"/>
<connection from=":C_1" to="CS" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":C_2" to="CN" fromLane="0" toLane="1" dir="s" state="M"/>
<connection from=":C_3" to="CW" fromLane="0" toLane="0" via=":C_7_0" dir="l" state="m"/>
<connection from=":C_7" to="CW" fromLane="0" toLane="0" dir="l" state="m"/>
<connection from=":C_4" to="CS" fromLane="0" toLane="1" via=":C_8_0" dir="r" state="m"/>
<connection from=":C_8" to="CS" fromLane="0" toLane="1" dir="r" state="m"/>
<connection from=":C_5" to="CN" fromLane="0" toLane="1" via=":C_9_0" dir="l" state="m"/>
<connection from=":C_9" to="CN" fromLane="0" toLane="1" dir="l" state="m"/>
<connection from=":N_0" to="NC" fromLane="0" toLane="2" dir="t" state="M"/>
<connection from=":S_0" to="SC" fromLane="0" toLane="2" 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" dir="s" state="M"/>
<connection from=":C_c1" to=":C_w1" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_c2" to=":C_w2" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_w0" to=":C_c2" fromLane="0" toLane="0" tl="C" linkIndex="8" dir="s" state="M"/>
<connection from="NC" to=":C_w0" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_w1" to=":C_c0" fromLane="0" toLane="0" tl="C" linkIndex="6" dir="s" state="M"/>
<connection from=":C_w1" to="CN" fromLane="0" toLane="0" 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="7" dir="s" state="M"/>
<connection from=":C_w2" to="CS" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":N_w0" to="NC" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="CN" to=":N_w0" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":S_w0" to="SC" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from="CS" to=":S_w0" fromLane="0" toLane="0" dir="s" state="M"/>
</net>
1 change: 1 addition & 0 deletions tests/sumo/tls/actuated/right_turn_crossing_usable/options.sumo
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--no-step-log --no-duration-log --net-file=net.net.xml
Empty file added tests/sumo/tls/actuated/right_turn_crossing_usable/output.sumo
View file
Empty file.
3 changes: 3 additions & 0 deletions tests/sumo/tls/actuated/testsuite.sumo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ maxDur_missing

# network contains a static traffic light, load actuated as additional program (new default)
minDur0

# test for #14692
right_turn_crossing_usable

0 comments on commit 37c72b3

Please sign in to comment.