Skip to content

Commit

Permalink
added test refs #14620, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Mar 28, 2024
1 parent 37b32cb commit 3c4e98e
Show file tree
Hide file tree
Showing 6 changed files with 226 additions and 0 deletions.
3 changes: 3 additions & 0 deletions tests/sumo/cf_model/IDM/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ ticket11564

# right of way violation due to imprecise stopping on minor link
ticket13369

# emergency braking at yellow
ticket14620
2 changes: 2 additions & 0 deletions tests/sumo/cf_model/IDM/ticket14620/errors.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Warning: Unused states in tlLogic 'C', program '0' in phase 0 after tl-index 18
Warning: Vehicle 'v_0' performs emergency braking on lane 'SC_1' with decel=9.00, wished=4.50, severity=1.00, time=33.00.
12 changes: 12 additions & 0 deletions tests/sumo/cf_model/IDM/ticket14620/input_routes.rou.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-28 12:02:00 by Eclipse SUMO netedit Version v1_19_0+1574-4eb0781fd01
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Vehicles, persons and containers (sorted by depart) -->
<vType id="t0" carFollowModel="IDM"/>
<vehicle id="v_0" type="t0" depart="30.00" departPos="-32" departSpeed="max" speedFactor="0.8" departLane="1">
<route edges="SC CW"/>
</vehicle>
</routes>
205 changes: 205 additions & 0 deletions tests/sumo/cf_model/IDM/ticket14620/net2.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-28 12:05:11 by Eclipse SUMO netedit Version v1_19_0+1574-4eb0781fd01
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumocfg-file value="/localdata1/debug/14620/test.sumocfg"/>
<additional-files value=""/>
<route-files value="/localdata1/debug/14620/input_routes.rou.xml"/>
<sumo-net-file value="/localdata1/debug/14620/net2.net.xml"/>
</input>
<output>
<output-file value="/localdata1/debug/14620/net2.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-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>
<netedit>
<ignore.routeelements value="false"/>
</netedit>
</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,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" speed="13.89" length="9.03" shape="95.20,110.40 94.85,107.95 93.80,106.20 92.05,105.15 89.60,104.80"/>
</edge>
<edge id=":C_1" function="internal">
<lane id=":C_1_0" index="0" speed="13.89" length="20.80" shape="95.20,110.40 95.20,89.60"/>
<lane id=":C_1_1" index="1" speed="13.89" length="20.80" shape="98.40,110.40 98.40,89.60"/>
</edge>
<edge id=":C_3" function="internal">
<lane id=":C_3_0" index="0" speed="13.89" length="5.01" shape="98.40,110.40 99.11,105.44"/>
</edge>
<edge id=":C_16" function="internal">
<lane id=":C_16_0" index="0" speed="13.89" length="14.34" shape="99.11,105.44 99.15,105.15 101.40,101.40 105.15,99.15 110.40,98.40"/>
</edge>
<edge id=":C_4" function="internal">
<lane id=":C_4_0" index="0" speed="13.89" length="9.03" shape="110.40,104.80 107.95,105.15 106.20,106.20 105.15,107.95 104.80,110.40"/>
</edge>
<edge id=":C_5" function="internal">
<lane id=":C_5_0" index="0" speed="13.89" length="20.80" shape="110.40,104.80 89.60,104.80"/>
<lane id=":C_5_1" index="1" speed="13.89" length="20.80" shape="110.40,101.60 89.60,101.60"/>
</edge>
<edge id=":C_7" function="internal">
<lane id=":C_7_0" index="0" speed="13.89" length="5.01" shape="110.40,101.60 105.44,100.89"/>
</edge>
<edge id=":C_17" function="internal">
<lane id=":C_17_0" index="0" speed="13.89" length="14.34" shape="105.44,100.89 105.15,100.85 101.40,98.60 99.15,94.85 98.40,89.60"/>
</edge>
<edge id=":C_8" function="internal">
<lane id=":C_8_0" index="0" speed="13.89" length="9.03" shape="104.80,89.60 105.15,92.05 106.20,93.80 107.95,94.85 110.40,95.20"/>
</edge>
<edge id=":C_9" function="internal">
<lane id=":C_9_0" index="0" speed="13.89" length="20.80" shape="104.80,89.60 104.80,110.40"/>
<lane id=":C_9_1" index="1" speed="13.89" length="20.80" shape="101.60,89.60 101.60,110.40"/>
</edge>
<edge id=":C_11" function="internal">
<lane id=":C_11_0" index="0" speed="13.89" length="5.01" shape="101.60,89.60 100.89,94.56"/>
</edge>
<edge id=":C_18" function="internal">
<lane id=":C_18_0" index="0" speed="13.89" length="14.34" shape="100.89,94.56 100.85,94.85 98.60,98.60 94.85,100.85 89.60,101.60"/>
</edge>
<edge id=":C_12" function="internal">
<lane id=":C_12_0" index="0" speed="13.89" length="9.03" shape="89.60,95.20 92.05,94.85 93.80,93.80 94.85,92.05 95.20,89.60"/>
</edge>
<edge id=":C_13" function="internal">
<lane id=":C_13_0" index="0" speed="13.89" length="20.80" shape="89.60,95.20 110.40,95.20"/>
<lane id=":C_13_1" index="1" speed="13.89" length="20.80" shape="89.60,98.40 110.40,98.40"/>
</edge>
<edge id=":C_15" function="internal">
<lane id=":C_15_0" index="0" speed="13.89" length="5.01" shape="89.60,98.40 94.56,99.11"/>
</edge>
<edge id=":C_19" function="internal">
<lane id=":C_19_0" index="0" speed="13.89" length="14.34" shape="94.56,99.11 94.85,99.15 98.60,101.40 100.85,105.15 101.60,110.40"/>
</edge>

<edge id="CE" from="C" to="E" priority="2">
<lane id="CE_0" index="0" speed="13.89" length="89.60" shape="110.40,95.20 200.00,95.20"/>
<lane id="CE_1" index="1" speed="13.89" length="89.60" shape="110.40,98.40 200.00,98.40"/>
</edge>
<edge id="CN" from="C" to="N" priority="2">
<lane id="CN_0" index="0" speed="13.89" length="89.60" shape="104.80,110.40 104.80,200.00"/>
<lane id="CN_1" index="1" speed="13.89" length="89.60" shape="101.60,110.40 101.60,200.00"/>
</edge>
<edge id="CS" from="C" to="S" priority="2">
<lane id="CS_0" index="0" speed="13.89" length="89.60" shape="95.20,89.60 95.20,0.00"/>
<lane id="CS_1" index="1" speed="13.89" length="89.60" shape="98.40,89.60 98.40,0.00"/>
</edge>
<edge id="CW" from="C" to="W" priority="2">
<lane id="CW_0" index="0" speed="13.89" length="89.60" shape="89.60,104.80 0.00,104.80"/>
<lane id="CW_1" index="1" speed="13.89" length="89.60" shape="89.60,101.60 0.00,101.60"/>
</edge>
<edge id="EC" from="E" to="C" priority="2">
<lane id="EC_0" index="0" speed="13.89" length="89.60" shape="200.00,104.80 110.40,104.80"/>
<lane id="EC_1" index="1" speed="13.89" length="89.60" shape="200.00,101.60 110.40,101.60"/>
</edge>
<edge id="NC" from="N" to="C" priority="2">
<lane id="NC_0" index="0" speed="13.89" length="89.60" shape="95.20,200.00 95.20,110.40"/>
<lane id="NC_1" index="1" speed="13.89" length="89.60" shape="98.40,200.00 98.40,110.40"/>
</edge>
<edge id="SC" from="S" to="C" priority="2">
<lane id="SC_0" index="0" speed="13.89" length="89.60" shape="104.80,0.00 104.80,89.60"/>
<lane id="SC_1" index="1" speed="13.89" length="89.60" shape="101.60,0.00 101.60,89.60"/>
</edge>
<edge id="WC" from="W" to="C" priority="2">
<lane id="WC_0" index="0" speed="13.89" length="89.60" shape="0.00,95.20 89.60,95.20"/>
<lane id="WC_1" index="1" speed="13.89" length="89.60" shape="0.00,98.40 89.60,98.40"/>
</edge>

<tlLogic id="C" type="static" programID="0" offset="0">
<phase duration="33" state="GGGggrrrrrGGGggrrrrr"/>
<phase duration="3" state="yyyygrrrrryyyygrrrrr"/>
<phase duration="33" state="rrrrrGGGggrrrrrGGGgg"/>
<phase duration="3" state="rrrrryyyygrrrrryyyyg"/>
</tlLogic>

<junction id="C" type="traffic_light" x="100.00" y="100.00" incLanes="NC_0 NC_1 EC_0 EC_1 SC_0 SC_1 WC_0 WC_1" intLanes=":C_0_0 :C_1_0 :C_1_1 :C_16_0 :C_4_0 :C_5_0 :C_5_1 :C_17_0 :C_8_0 :C_9_0 :C_9_1 :C_18_0 :C_12_0 :C_13_0 :C_13_1 :C_19_0" shape="93.60,110.40 106.40,110.40 110.40,106.40 110.40,93.60 106.40,89.60 93.60,89.60 89.60,93.60 89.60,106.40">
<request index="0" response="0000000000000000" foes="0000000001100000" cont="0"/>
<request index="1" response="1000000010000000" foes="1111100011100000" cont="0"/>
<request index="2" response="1000000010000000" foes="1111100011100000" cont="0"/>
<request index="3" response="1000011010000000" foes="1110011011100000" cont="1"/>
<request index="4" response="0000011000000000" foes="0000011000000000" cont="0"/>
<request index="5" response="0000111000001111" foes="1000111000001111" cont="0"/>
<request index="6" response="0000111000001111" foes="1000111000001111" cont="0"/>
<request index="7" response="0110111000001110" foes="0110111000001110" cont="1"/>
<request index="8" response="0000000000000000" foes="0110000000000000" cont="0"/>
<request index="9" response="1000000010000000" foes="1110000011111000" cont="0"/>
<request index="10" response="1000000010000000" foes="1110000011111000" cont="0"/>
<request index="11" response="1000000010000110" foes="1110000011100110" cont="1"/>
<request index="12" response="0000000000000110" foes="0000000000000110" cont="0"/>
<request index="13" response="0000111100001110" foes="0000111110001110" cont="0"/>
<request index="14" response="0000111100001110" foes="0000111110001110" cont="0"/>
<request index="15" response="0000111001101110" foes="0000111001101110" cont="1"/>
</junction>
<junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="CE_0 CE_1" intLanes="" shape="200.00,100.00 200.00,93.60 200.00,100.00"/>
<junction id="N" type="dead_end" x="100.00" y="200.00" incLanes="CN_0 CN_1" intLanes="" shape="100.00,200.00 106.40,200.00 100.00,200.00"/>
<junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="CS_0 CS_1" intLanes="" shape="100.00,0.00 93.60,0.00 100.00,0.00"/>
<junction id="W" type="dead_end" x="0.00" y="100.00" incLanes="CW_0 CW_1" intLanes="" shape="0.00,100.00 0.00,106.40 0.00,100.00"/>

<junction id=":C_16_0" type="internal" x="99.11" y="105.44" incLanes=":C_3_0 SC_0 SC_1" intLanes=":C_5_0 :C_5_1 :C_7_0 :C_8_0 :C_9_0 :C_9_1 :C_13_0 :C_13_1 :C_15_0"/>
<junction id=":C_17_0" type="internal" x="105.44" y="100.89" incLanes=":C_7_0 WC_0 WC_1" intLanes=":C_1_0 :C_1_1 :C_3_0 :C_9_0 :C_9_1 :C_11_0 :C_12_0 :C_13_0 :C_13_1"/>
<junction id=":C_18_0" type="internal" x="100.89" y="94.56" incLanes=":C_11_0 NC_0 NC_1" intLanes=":C_0_0 :C_1_0 :C_1_1 :C_5_0 :C_5_1 :C_7_0 :C_13_0 :C_13_1 :C_15_0"/>
<junction id=":C_19_0" type="internal" x="94.56" y="99.11" incLanes=":C_15_0 EC_0 EC_1" intLanes=":C_1_0 :C_1_1 :C_3_0 :C_4_0 :C_5_0 :C_5_1 :C_9_0 :C_9_1 :C_11_0"/>

<connection from="EC" to="CN" fromLane="0" toLane="0" via=":C_4_0" tl="C" linkIndex="5" dir="r" state="o"/>
<connection from="EC" to="CW" fromLane="0" toLane="0" via=":C_5_0" tl="C" linkIndex="6" dir="s" state="o"/>
<connection from="EC" to="CW" fromLane="1" toLane="1" via=":C_5_1" tl="C" linkIndex="7" dir="s" state="o"/>
<connection from="EC" to="CS" fromLane="1" toLane="1" via=":C_7_0" tl="C" linkIndex="8" dir="l" state="o"/>
<connection from="NC" to="CW" fromLane="0" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="r" state="O"/>
<connection from="NC" to="CS" fromLane="0" toLane="0" via=":C_1_0" tl="C" linkIndex="1" dir="s" state="O"/>
<connection from="NC" to="CS" fromLane="1" toLane="1" via=":C_1_1" tl="C" linkIndex="2" dir="s" state="O"/>
<connection from="NC" to="CE" fromLane="1" toLane="1" via=":C_3_0" tl="C" linkIndex="3" dir="l" state="o"/>
<connection from="SC" to="CE" fromLane="0" toLane="0" via=":C_8_0" tl="C" linkIndex="10" dir="r" state="O"/>
<connection from="SC" to="CN" fromLane="0" toLane="0" via=":C_9_0" tl="C" linkIndex="11" dir="s" state="O"/>
<connection from="SC" to="CN" fromLane="1" toLane="1" via=":C_9_1" tl="C" linkIndex="12" dir="s" state="O"/>
<connection from="SC" to="CW" fromLane="1" toLane="1" via=":C_11_0" tl="C" linkIndex="13" dir="l" state="o"/>
<connection from="WC" to="CS" fromLane="0" toLane="0" via=":C_12_0" tl="C" linkIndex="15" dir="r" state="o"/>
<connection from="WC" to="CE" fromLane="0" toLane="0" via=":C_13_0" tl="C" linkIndex="16" dir="s" state="o"/>
<connection from="WC" to="CE" fromLane="1" toLane="1" via=":C_13_1" tl="C" linkIndex="17" dir="s" state="o"/>
<connection from="WC" to="CN" fromLane="1" toLane="1" via=":C_15_0" tl="C" linkIndex="18" dir="l" state="o"/>

<connection from=":C_0" to="CW" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":C_1" to="CS" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_1" to="CS" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_3" to="CE" fromLane="0" toLane="1" via=":C_16_0" dir="l" state="m"/>
<connection from=":C_16" to="CE" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":C_4" to="CN" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":C_5" to="CW" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_5" to="CW" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_7" to="CS" fromLane="0" toLane="1" via=":C_17_0" dir="l" state="m"/>
<connection from=":C_17" to="CS" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":C_8" to="CE" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":C_9" to="CN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_9" to="CN" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_11" to="CW" fromLane="0" toLane="1" via=":C_18_0" dir="l" state="m"/>
<connection from=":C_18" to="CW" fromLane="0" toLane="1" dir="l" state="M"/>
<connection from=":C_12" to="CS" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":C_13" to="CE" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_13" to="CE" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_15" to="CN" fromLane="0" toLane="1" via=":C_19_0" dir="l" state="m"/>
<connection from=":C_19" to="CN" fromLane="0" toLane="1" dir="l" state="M"/>

</net>
4 changes: 4 additions & 0 deletions tests/sumo/cf_model/IDM/ticket14620/options.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-n net2.net.xml
-r input_routes.rou.xml
--no-step-log
--step-length 0.25
Empty file.

0 comments on commit 3c4e98e

Please sign in to comment.