Skip to content

Commit

Permalink
added test refs #7578, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Oct 8, 2024
1 parent 401b571 commit 9f0eaa8
Show file tree
Hide file tree
Showing 8 changed files with 276 additions and 0 deletions.
4 changes: 4 additions & 0 deletions tests/sumo/rail/siding/circle_3veh/errors.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Warning: Teleporting vehicle 't2'; waited too long (yield), lane='c_0', time=343.00.
Warning: Teleporting vehicle 't0'; waited too long (yield), lane='a_0', time=357.00.
Warning: Vehicle 't2' ends teleporting on edge 'a', time=357.00.
Warning: Vehicle 't0' ends teleporting on edge 'b', time=363.00.
38 changes: 38 additions & 0 deletions tests/sumo/rail/siding/circle_3veh/input_routes.rou.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri 21 Aug 2020 02:28:17 PM CEST by Eclipse SUMO netedit Version v1_6_0+1707-2370e97800
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<new value="true"/>
</input>
<output>
<output-file value="/home/kobo/dlr/debug/7435/net.net.xml"/>
</output>
<processing>
<offset.disable-normalization value="true"/>
</processing>
<junctions>
<no-internal-links value="true"/>
</junctions>
<netedit>
<route-files value="/home/kobo/dlr/debug/7435/input_routes.rou.xml"/>
</netedit>
<report>
<aggregate-warnings value="5"/>
</report>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="train" length="50.00" vClass="rail"/>
<trip id="t0" type="train" depart="0.00" from="a" to="c"/>
<trip id="t1" type="train" depart="0.00" from="b" to="a"/>
<trip id="t2" type="train" depart="0.00" from="c" to="b"/>
</routes>
77 changes: 77 additions & 0 deletions tests/sumo/rail/siding/circle_3veh/net.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-10-08 08:25:25 by Eclipse SUMO netedit Version v1_20_0+2246-02b4422aa12
<neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumo-net-file value="net.net.xml"/>
</input>
<output>
<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"/>
<lefthand value="0"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.50"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</neteditConfiguration>
-->

<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="0.00,0.00" convBoundary="400.00,-200.00,700.00,100.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":A_0" function="internal">
<lane id=":A_0_0" index="0" allow="rail" speed="6.63" length="1.26" shape="699.53,-100.47 699.74,-100.22 699.88,-99.95 699.97,-99.66 700.00,-99.34"/>
</edge>
<edge id=":B_0" function="internal">
<lane id=":B_0_0" index="0" allow="rail" speed="6.63" length="1.26" shape="500.66,100.00 500.34,99.97 500.05,99.88 499.78,99.74 499.53,99.53"/>
</edge>
<edge id=":C_0" function="internal">
<lane id=":C_0_0" index="0" allow="rail" speed="6.69" length="1.28" shape="400.00,-99.34 400.01,-99.71 400.07,-99.97 400.21,-100.20 400.47,-100.47"/>
</edge>

<edge id="a" from="C" to="A" priority="-1" spreadType="center" shape="400.00,-100.00 500.00,-200.00 600.00,-200.00 700.00,-100.00">
<lane id="a_0" index="0" allow="rail" speed="13.89" length="381.52" shape="400.47,-100.47 500.00,-200.00 600.00,-200.00 699.53,-100.47"/>
</edge>
<edge id="b" from="A" to="B" priority="-1" spreadType="center" shape="700.00,-100.00 700.00,0.00 600.00,100.00 500.00,100.00">
<lane id="b_0" index="0" allow="rail" speed="13.89" length="340.10" shape="700.00,-99.34 700.00,0.00 600.00,100.00 500.66,100.00"/>
</edge>
<edge id="c" from="B" to="C" priority="-1" spreadType="center" shape="500.00,100.00 400.00,0.00 400.00,-100.00">
<lane id="c_0" index="0" allow="rail" speed="13.89" length="240.10" shape="499.53,99.53 400.00,0.00 400.00,-99.34"/>
</edge>

<junction id="A" type="rail_signal" x="700.00" y="-100.00" incLanes="a_0" intLanes=":A_0_0" shape="698.40,-99.34 701.60,-99.34 701.55,-100.28 701.46,-100.60 701.29,-100.90 701.03,-101.22 700.66,-101.60">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="B" type="rail_signal" x="500.00" y="100.00" incLanes="b_0" intLanes=":B_0_0" shape="500.66,101.60 500.66,98.40 498.40,100.66 499.10,101.29 499.40,101.46 499.72,101.55 500.13,101.59">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="C" type="rail_signal" x="400.00" y="-100.00" incLanes="c_0" intLanes=":C_0_0" shape="398.40,-99.34 401.60,-99.34 399.34,-101.60 398.82,-100.93 398.63,-100.57 398.50,-100.18 398.43,-99.77">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="a" to="b" fromLane="0" toLane="0" via=":A_0_0" tl="A" linkIndex="0" dir="l" state="O"/>
<connection from="b" to="c" fromLane="0" toLane="0" via=":B_0_0" tl="B" linkIndex="0" dir="l" state="O"/>
<connection from="c" to="a" fromLane="0" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="l" state="O"/>

<connection from=":A_0" to="b" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":B_0" to="c" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":C_0" to="a" fromLane="0" toLane="0" dir="l" state="M"/>

</net>
2 changes: 2 additions & 0 deletions tests/sumo/rail/siding/circle_3veh/options.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--no-step-log --no-duration-log --net-file=net.net.xml -r=input_routes.rou.xml
--tripinfo-output tripinfos.xml
Empty file.
108 changes: 108 additions & 0 deletions tests/sumo/rail/siding/circle_3veh/railsignalblocks.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-10-08 08:28:01 by Eclipse SUMO sumo Version v1_20_0+0623-4d64fbde829
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/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"/>
<railsignal-block-output value="railsignal_blocks.xml"/>
</output>
<processing>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<railsignal-block-output>
<railSignal id="A">
<link linkIndex="0" from="a_0" to=":A_0_0">
<driveWay id="A.0" vehicle="t0" edges="b">
<forward lanes=":A_0_0 b_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="A.0 A.d1"/>
</driveWay>
</link>
</railSignal>
<railSignal id="B">
<link linkIndex="0" from="b_0" to=":B_0_0">
<driveWay id="B.0" vehicle="t0" edges="c">
<forward lanes=":B_0_0 c_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="B.0 B.1 B.d2"/>
</driveWay>
<driveWay id="B.1" vehicle="t2" edges="c">
<forward lanes=":B_0_0 c_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="B.0 B.1 B.d2"/>
</driveWay>
</link>
</railSignal>
<railSignal id="C">
<link linkIndex="0" from="c_0" to=":C_0_0">
<driveWay id="C.0" vehicle="t0" edges="a">
<forward lanes=":C_0_0 a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="C.0 C.d0"/>
</driveWay>
</link>
</railSignal>
<departJunction id="C">
<driveWay id="C.d0" vehicle="t0" edges="a">
<forward lanes="a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals="C_0"/>
<foes driveWays="C.0 C.d0"/>
</driveWay>
</departJunction>
<departJunction id="A">
<driveWay id="A.d1" vehicle="t1" edges="b">
<forward lanes="b_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals="A_0"/>
<foes driveWays="A.0 A.d1"/>
</driveWay>
</departJunction>
<departJunction id="B">
<driveWay id="B.d2" vehicle="t2" edges="c">
<forward lanes="c_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals="B_0"/>
<foes driveWays="B.0 B.1 B.d2"/>
</driveWay>
</departJunction>
</railsignal-block-output>
44 changes: 44 additions & 0 deletions tests/sumo/rail/siding/circle_3veh/tripinfos.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-10-08 08:28:01 by Eclipse SUMO sumo Version v1_20_0+0623-4d64fbde829
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/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"/>
<railsignal-block-output value="railsignal_blocks.xml"/>
</output>
<processing>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<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="t2" depart="0.00" departLane="c_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="419.00" arrivalLane="b_0" arrivalPos="340.10" arrivalSpeed="12.20" duration="419.00" routeLength="912.88" waitingTime="301.00" waitingCount="1" stopTime="0.00" timeLoss="342.77" rerouteNo="1" devices="tripinfo_t2 routing_t2" vType="train" speedFactor="1.00" vaporized=""/>
<tripinfo id="t1" depart="0.00" departLane="b_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="426.00" arrivalLane="a_0" arrivalPos="381.52" arrivalSpeed="13.89" duration="426.00" routeLength="914.16" waitingTime="291.00" waitingCount="1" stopTime="0.00" timeLoss="360.04" rerouteNo="1" devices="tripinfo_t1 routing_t1" vType="train" speedFactor="1.00" vaporized=""/>
<tripinfo id="t0" depart="0.00" departLane="a_0" departPos="50.10" departSpeed="0.00" departDelay="0.00" arrival="439.00" arrivalLane="c_0" arrivalPos="240.10" arrivalSpeed="11.00" duration="439.00" routeLength="912.88" waitingTime="307.00" waitingCount="2" stopTime="0.00" timeLoss="370.52" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train" speedFactor="1.00" vaporized=""/>
</tripinfos>
3 changes: 3 additions & 0 deletions tests/sumo/rail/siding/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ loop_4veh3

# deadlock
triangle_6veh

# deadlock
circle_3veh

0 comments on commit 9f0eaa8

Please sign in to comment.