Skip to content

Commit

Permalink
added tests refs #3861
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Mar 1, 2018
1 parent 9faacd4 commit 74d1a25
Show file tree
Hide file tree
Showing 14 changed files with 257 additions and 0 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<routes>
<vType id="slow" maxSpeed="2"/>
<vType id="fast"/>
<route id="r0" edges="SC CW"/>
<route id="r1" edges="SC CE"/>
<vehicle id="leader" type="slow" route="r0" depart="0"/>
<vehicle id="follower" type="fast" route="r1" depart="1"/>
</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu 01 Mar 2018 11:04:49 AM CET by Netedit Version v0_32_0+0634-29c4da1
<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/sumo/tests/sumo/junction_model/internal_lanes/parallel_siblings/net.net.xml"/>
</input>
<output>
<output-file value="/scr1/sumo/tests/sumo/junction_model/internal_lanes/parallel_siblings/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="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="35.56" shape="101.65,76.75 103.06,86.20 107.28,92.95 114.31,97.00 124.15,98.35"/>
</edge>
<edge id=":C_1" function="internal">
<lane id=":C_1_0" index="0" speed="13.89" length="46.51" width="2.00" shape="101.65,76.75 103.15,123.25"/>
<lane id=":C_1_1" index="1" speed="13.89" length="46.51" width="2.00" shape="101.65,76.75 101.05,123.25"/>
</edge>
<edge id=":C_3" function="internal">
<lane id=":C_3_0" index="0" speed="13.89" length="37.53" shape="101.65,76.75 100.30,87.64 96.25,95.43 89.50,100.09 80.05,101.65"/>
</edge>

<edge id="CE" from="C" to="E" priority="2">
<lane id="CE_0" index="0" speed="13.89" length="75.85" shape="124.15,98.35 200.00,98.35"/>
</edge>
<edge id="CN" from="C" to="N" priority="2">
<lane id="CN_0" index="0" speed="13.89" length="76.75" width="2.00" shape="103.15,123.25 103.15,200.00"/>
<lane id="CN_1" index="1" speed="13.89" length="76.75" width="2.00" shape="101.05,123.25 101.05,200.00"/>
</edge>
<edge id="CW" from="C" to="W" priority="2">
<lane id="CW_0" index="0" speed="13.89" length="80.05" shape="80.05,101.65 0.00,101.65"/>
</edge>
<edge id="SC" from="S" to="C" priority="2">
<lane id="SC_0" index="0" speed="13.89" length="76.75" shape="101.65,0.00 101.65,76.75"/>
</edge>

<junction id="C" type="priority" x="100.00" y="100.00" incLanes="SC_0" intLanes=":C_0_0 :C_1_0 :C_1_1 :C_3_0" shape="100.05,123.25 104.15,123.25 124.15,99.95 124.15,96.75 103.25,76.75 100.05,76.75 80.05,100.05 80.05,103.25" radius="20.00">
<request index="0" response="0000" foes="0000" cont="0"/>
<request index="1" response="0000" foes="0000" cont="0"/>
<request index="2" response="0000" foes="0000" cont="0"/>
<request index="3" response="0000" foes="0000" cont="0"/>
</junction>
<junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="CE_0" intLanes="" shape="200.00,96.75 200.00,99.95"/>
<junction id="N" type="dead_end" x="100.00" y="200.00" incLanes="CN_0 CN_1" intLanes="" shape="104.15,200.00 100.05,200.00"/>
<junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="" intLanes="" shape="100.05,0.00 103.25,0.00"/>
<junction id="W" type="dead_end" x="0.00" y="100.00" incLanes="CW_0" intLanes="" shape="0.00,103.25 0.00,100.05"/>

<connection from="SC" to="CE" fromLane="0" toLane="0" via=":C_0_0" dir="r" state="M"/>
<connection from="SC" to="CN" fromLane="0" toLane="0" via=":C_1_0" dir="s" state="M"/>
<connection from="SC" to="CN" fromLane="0" toLane="1" via=":C_1_1" dir="s" state="M"/>
<connection from="SC" to="CW" fromLane="0" toLane="0" via=":C_3_0" dir="l" state="M"/>

<connection from=":C_0" to="CE" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":C_1" to="CN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_1" to="CN" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_3" to="CW" fromLane="0" toLane="0" dir="l" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-n net.net.xml -r input_routes.rou.xml
--no-step-log
--tripinfo-output tripinfos.xml
--collision.check-junctions

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 11:21:48 2018 by SUMO Version v0_32_0+0634-29c4da1
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/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<tripinfo-output value="tripinfos.xml"/>
</output>
<processing>
<collision.check-junctions value="true"/>
</processing>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="follower" depart="6.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="5.00" arrival="83.00" arrivalLane="CE_0" arrivalPos="75.85" arrivalSpeed="13.35" duration="77.00" routeLength="183.06" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="63.30" rerouteNo="0" devices="tripinfo_follower" vType="fast" speedFactor="1.00" vaporized=""/>
<tripinfo id="leader" depart="0.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="126.00" arrivalLane="CW_0" arrivalPos="80.05" arrivalSpeed="1.43" duration="126.00" routeLength="189.23" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="31.37" rerouteNo="0" devices="tripinfo_leader" vType="slow" speedFactor="1.00" vaporized=""/>
</tripinfos>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<routes>
<vType id="slow" maxSpeed="2"/>
<vType id="fast"/>
<route id="r0" edges="SC CN"/>
<vehicle id="leader" type="slow" route="r0" depart="0" arrivalLane="0"/>
<vehicle id="follower" type="fast" route="r0" depart="1" arrivalLane="1"/>
</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu 01 Mar 2018 11:04:49 AM CET by Netedit Version v0_32_0+0634-29c4da1
<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/sumo/tests/sumo/junction_model/internal_lanes/parallel_siblings/net.net.xml"/>
</input>
<output>
<output-file value="/scr1/sumo/tests/sumo/junction_model/internal_lanes/parallel_siblings/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="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="35.56" shape="101.65,76.75 103.06,86.20 107.28,92.95 114.31,97.00 124.15,98.35"/>
</edge>
<edge id=":C_1" function="internal">
<lane id=":C_1_0" index="0" speed="13.89" length="46.51" width="2.00" shape="101.65,76.75 103.15,123.25"/>
<lane id=":C_1_1" index="1" speed="13.89" length="46.51" width="2.00" shape="101.65,76.75 101.05,123.25"/>
</edge>
<edge id=":C_3" function="internal">
<lane id=":C_3_0" index="0" speed="13.89" length="37.53" shape="101.65,76.75 100.30,87.64 96.25,95.43 89.50,100.09 80.05,101.65"/>
</edge>

<edge id="CE" from="C" to="E" priority="2">
<lane id="CE_0" index="0" speed="13.89" length="75.85" shape="124.15,98.35 200.00,98.35"/>
</edge>
<edge id="CN" from="C" to="N" priority="2">
<lane id="CN_0" index="0" speed="13.89" length="76.75" width="2.00" shape="103.15,123.25 103.15,200.00"/>
<lane id="CN_1" index="1" speed="13.89" length="76.75" width="2.00" shape="101.05,123.25 101.05,200.00"/>
</edge>
<edge id="CW" from="C" to="W" priority="2">
<lane id="CW_0" index="0" speed="13.89" length="80.05" shape="80.05,101.65 0.00,101.65"/>
</edge>
<edge id="SC" from="S" to="C" priority="2">
<lane id="SC_0" index="0" speed="13.89" length="76.75" shape="101.65,0.00 101.65,76.75"/>
</edge>

<junction id="C" type="priority" x="100.00" y="100.00" incLanes="SC_0" intLanes=":C_0_0 :C_1_0 :C_1_1 :C_3_0" shape="100.05,123.25 104.15,123.25 124.15,99.95 124.15,96.75 103.25,76.75 100.05,76.75 80.05,100.05 80.05,103.25" radius="20.00">
<request index="0" response="0000" foes="0000" cont="0"/>
<request index="1" response="0000" foes="0000" cont="0"/>
<request index="2" response="0000" foes="0000" cont="0"/>
<request index="3" response="0000" foes="0000" cont="0"/>
</junction>
<junction id="E" type="dead_end" x="200.00" y="100.00" incLanes="CE_0" intLanes="" shape="200.00,96.75 200.00,99.95"/>
<junction id="N" type="dead_end" x="100.00" y="200.00" incLanes="CN_0 CN_1" intLanes="" shape="104.15,200.00 100.05,200.00"/>
<junction id="S" type="dead_end" x="100.00" y="0.00" incLanes="" intLanes="" shape="100.05,0.00 103.25,0.00"/>
<junction id="W" type="dead_end" x="0.00" y="100.00" incLanes="CW_0" intLanes="" shape="0.00,103.25 0.00,100.05"/>

<connection from="SC" to="CE" fromLane="0" toLane="0" via=":C_0_0" dir="r" state="M"/>
<connection from="SC" to="CN" fromLane="0" toLane="0" via=":C_1_0" dir="s" state="M"/>
<connection from="SC" to="CN" fromLane="0" toLane="1" via=":C_1_1" dir="s" state="M"/>
<connection from="SC" to="CW" fromLane="0" toLane="0" via=":C_3_0" dir="l" state="M"/>

<connection from=":C_0" to="CE" fromLane="0" toLane="0" dir="r" state="M"/>
<connection from=":C_1" to="CN" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":C_1" to="CN" fromLane="1" toLane="1" dir="s" state="M"/>
<connection from=":C_3" to="CW" fromLane="0" toLane="0" dir="l" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-n net.net.xml -r input_routes.rou.xml
--no-step-log
--tripinfo-output tripinfos.xml
--collision.check-junctions

Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Thu Mar 1 11:21:48 2018 by SUMO Version v0_32_0+0634-29c4da1
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/sumoConfiguration.xsd">
<input>
<net-file value="net.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<tripinfo-output value="tripinfos.xml"/>
</output>
<processing>
<collision.check-junctions value="true"/>
</processing>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="follower" depart="6.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="5.00" arrival="88.00" arrivalLane="CN_1" arrivalPos="76.75" arrivalSpeed="13.29" duration="82.00" routeLength="194.91" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="67.07" rerouteNo="0" devices="tripinfo_follower" vType="fast" speedFactor="1.00" vaporized=""/>
<tripinfo id="leader" depart="0.00" departLane="SC_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="126.00" arrivalLane="CN_0" arrivalPos="76.75" arrivalSpeed="1.88" duration="126.00" routeLength="194.91" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="28.13" rerouteNo="0" devices="tripinfo_leader" vType="slow" speedFactor="1.00" vaporized=""/>
</tripinfos>
5 changes: 5 additions & 0 deletions tests/sumo/junction_model/internal_lanes/testsuite.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# two connections from the same lane that diverge (they should not block each other after diverging far enough)
diverging_siblings

# two connections from the same lane that have common geometry over most of their length (they should block each other and induce car-following behavior)
parallel_siblings
3 changes: 3 additions & 0 deletions tests/sumo/junction_model/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ timegapMinor

# Tests for the stopOffset
stopOffset

# tests for the proper behavior on internal lanes
internal_lanes

0 comments on commit 74d1a25

Please sign in to comment.