Skip to content

Commit

Permalink
added test refs #21, #16208
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Feb 21, 2025
1 parent ab9166c commit f4c782b
Show file tree
Hide file tree
Showing 11 changed files with 358 additions and 0 deletions.
Empty file.
1 change: 1 addition & 0 deletions tests/sumo/rail/tram_road/no_signals/errors.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.
10 changes: 10 additions & 0 deletions tests/sumo/rail/tram_road/no_signals/input_routes.rou.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- generated on 2019-01-15 10:11:11.417125 by $Id$ via randomTrips.py
options:
-->
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="tram" vClass="tram"/>
<trip id="v0" type="tram" depart="0" departSpeed="max" from="1a" to="3a"/>
<trip id="v1" type="tram" depart="0" departSpeed="max" from="1b" to="3a"/>
<trip id="v2" type="tram" depart="0" departSpeed="max" from="1b" to="3a"/>
</routes>
100 changes: 100 additions & 0 deletions tests/sumo/rail/tram_road/no_signals/net.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-21 11:22:57 by Eclipse SUMO netedit Version v1_22_0+0429-ab9166c1536
<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="-100.00,-900.00" convBoundary="1600.00,100.00,1900.00,200.00" origBoundary="100.00,900.00,4800.00,1000.00" projParameter="!"/>

<type id="railway.rail" priority="15" numLanes="1" speed="44.44" allow="rail rail_electric" oneway="1"/>

<edge id=":J1_0" function="internal">
<lane id=":J1_0_0" index="0" allow="passenger tram" speed="13.89" length="0.10" shape="1700.00,98.40 1700.00,98.40"/>
</edge>
<edge id=":J2_0" function="internal">
<lane id=":J2_0_0" index="0" allow="passenger tram" speed="13.89" length="7.84" shape="1793.82,98.40 1801.66,98.40"/>
</edge>
<edge id=":J2_1" function="internal">
<lane id=":J2_1_0" index="0" allow="passenger tram" speed="9.11" length="2.52" shape="1795.43,102.30 1797.29,100.60"/>
</edge>
<edge id=":J2_2" function="internal">
<lane id=":J2_2_0" index="0" allow="passenger tram" speed="9.11" length="4.97" shape="1797.29,100.60 1798.94,99.38 1800.40,98.64 1801.66,98.40"/>
</edge>
<edge id=":J5_0" function="internal">
<lane id=":J5_0_0" index="0" allow="passenger tram" speed="4.20" length="1.26" shape="1698.67,198.40 1698.99,198.37 1699.29,198.28 1699.56,198.14 1699.81,197.93"/>
</edge>

<edge id="1a" from="J0" to="J1" priority="-1">
<lane id="1a_0" index="0" allow="passenger tram" speed="13.89" length="100.00" shape="1600.00,98.40 1700.00,98.40"/>
</edge>
<edge id="1b" from="J4" to="J5" priority="-1">
<lane id="1b_0" index="0" allow="passenger tram" speed="13.89" length="98.67" shape="1600.00,198.40 1698.67,198.40"/>
</edge>
<edge id="2a" from="J1" to="J2" priority="-1">
<lane id="2a_0" index="0" allow="passenger tram" speed="13.89" length="93.82" shape="1700.00,98.40 1793.82,98.40"/>
</edge>
<edge id="2b" from="J5" to="J2" priority="-1">
<lane id="2b_0" index="0" allow="passenger tram" speed="13.89" length="135.24" shape="1699.81,197.93 1795.43,102.30"/>
</edge>
<edge id="3a" from="J2" to="J3" priority="-1">
<lane id="3a_0" index="0" allow="passenger tram" speed="13.89" length="98.34" shape="1801.66,98.40 1900.00,98.40"/>
</edge>

<junction id="J0" type="dead_end" x="1600.00" y="100.00" incLanes="" intLanes="" shape="1600.00,100.00 1600.00,96.80"/>
<junction id="J1" type="priority" x="1700.00" y="100.00" incLanes="1a_0" intLanes=":J1_0_0" shape="1700.00,100.00 1700.00,96.80 1700.00,100.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="J2" type="priority" x="1800.00" y="100.00" incLanes="2a_0 2b_0" intLanes=":J2_0_0 :J2_2_0" shape="1801.66,100.00 1801.66,96.80 1793.82,96.80 1793.82,100.00 1794.61,100.13 1794.77,100.29 1794.77,100.52 1794.61,100.81 1794.30,101.17 1796.57,103.43 1798.66,101.53 1799.56,100.86 1800.35,100.38 1801.06,100.10">
<request index="0" response="00" foes="10" cont="0"/>
<request index="1" response="01" foes="01" cont="1"/>
</junction>
<junction id="J3" type="dead_end" x="1900.00" y="100.00" incLanes="3a_0" intLanes="" shape="1900.00,96.80 1900.00,100.00"/>
<junction id="J4" type="dead_end" x="1600.00" y="200.00" incLanes="" intLanes="" shape="1600.00,200.00 1600.00,196.80"/>
<junction id="J5" type="priority" x="1700.00" y="200.00" incLanes="1b_0" intLanes=":J5_0_0" shape="1700.94,199.06 1698.67,196.80 1698.67,200.00 1699.52,199.90 1699.90,199.77 1700.27,199.58 1700.61,199.35">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<junction id=":J2_2_0" type="internal" x="1797.29" y="100.60" incLanes=":J2_1_0 2a_0" intLanes=":J2_0_0"/>

<connection from="1a" to="2a" fromLane="0" toLane="0" via=":J1_0_0" dir="s" state="M"/>
<connection from="1b" to="2b" fromLane="0" toLane="0" via=":J5_0_0" dir="r" state="M"/>
<connection from="2a" to="3a" fromLane="0" toLane="0" via=":J2_0_0" dir="s" state="M"/>
<connection from="2b" to="3a" fromLane="0" toLane="0" via=":J2_1_0" dir="l" state="m"/>

<connection from=":J1_0" to="2a" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":J2_0" to="3a" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":J2_1" to="3a" fromLane="0" toLane="0" via=":J2_2_0" dir="l" state="m"/>
<connection from=":J2_2" to="3a" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":J5_0" to="2b" fromLane="0" toLane="0" dir="r" state="M"/>

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

<!-- generated on 2025-02-21 11:23:15 by Eclipse SUMO sumo Version v1_22_0+0429-ab9166c1536
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
<sumoConfiguration 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>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
</sumoConfiguration>
-->

<railsignal-block-output>
<departJunction id="J0">
<driveWay id="J0.d0" vehicle="v0" edges="1a 2a 3a">
<forward lanes="1a_0 :J1_0_0 2a_0 :J2_0_0 3a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J4.d0"/>
</driveWay>
</departJunction>
<departJunction id="J4">
<driveWay id="J4.d0" vehicle="v1" edges="1b 2b 3a">
<forward lanes="1b_0 :J5_0_0 2b_0 :J2_1_0 :J2_2_0 3a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0 J4.d0"/>
</driveWay>
</departJunction>
</railsignal-block-output>
87 changes: 87 additions & 0 deletions tests/sumo/rail/tram_road/no_signals/railsignalblocks.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-20 22:47:58 by Eclipse SUMO sumo Version v1_22_0+0408-1e09e33461d
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
<sumoConfiguration 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>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
<meso-junction-control value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<railsignal-block-output>
<railSignal id="J1">
<link linkIndex="0" from="1a_0" to="2a_0">
<driveWay id="J1.0" vehicle="v0" edges="2a 3a">
<forward lanes="2a_0 3a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals="J5_0"/>
<foes driveWays="J1.0 J5.0"/>
</driveWay>
</link>
</railSignal>
<railSignal id="J5">
<link linkIndex="0" from="1b_0" to="2b_0">
<driveWay id="J5.0" vehicle="v1" edges="2b 3a">
<forward lanes="2b_0 3a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals="J1_0"/>
<foes driveWays="J1.0 J5.0"/>
</driveWay>
</link>
</railSignal>
<departJunction id="J0">
<driveWay id="J0.d0" vehicle="v0" edges="1a">
<forward lanes="1a_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J0.d0"/>
</driveWay>
</departJunction>
<departJunction id="J4">
<driveWay id="J4.d0" vehicle="v1" edges="1b">
<forward lanes="1b_0"/>
<bidi lanes=""/>
<flank lanes=""/>
<conflictLinks signals=""/>
<foes driveWays="J4.d0"/>
</driveWay>
</departJunction>
</railsignal-block-output>
45 changes: 45 additions & 0 deletions tests/sumo/rail/tram_road/no_signals/tripinfos.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-21 11:23:15 by Eclipse SUMO sumo Version v1_22_0+0429-ab9166c1536
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
<sumoConfiguration 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>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
</sumoConfiguration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="v0" depart="0.00" departLane="1a_0" departPos="22.10" departSpeed="13.89" departDelay="0.00" arrival="21.00" arrivalLane="3a_0" arrivalPos="98.34" arrivalSpeed="13.89" duration="21.00" routeLength="278.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_v0 routing_v0" vType="tram" speedFactor="1.00" vaporized=""/>
<tripinfo id="v1" depart="21.00" departLane="1b_0" departPos="22.10" departSpeed="13.89" departDelay="21.00" arrival="56.00" arrivalLane="3a_0" arrivalPos="98.34" arrivalSpeed="13.89" duration="35.00" routeLength="318.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="11.70" rerouteNo="1" devices="tripinfo_v1 routing_v1" vType="tram" speedFactor="1.00" vaporized=""/>
<tripinfo id="v2" depart="56.00" departLane="1b_0" departPos="22.10" departSpeed="13.89" departDelay="56.00" arrival="91.00" arrivalLane="3a_0" arrivalPos="98.34" arrivalSpeed="13.89" duration="35.00" routeLength="318.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="11.70" rerouteNo="1" devices="tripinfo_v2 routing_v2" vType="tram" speedFactor="1.00" vaporized=""/>
</tripinfos>
49 changes: 49 additions & 0 deletions tests/sumo/rail/tram_road/no_signals/tripinfos.sumo.meso
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2025-02-20 22:47:58 by Eclipse SUMO sumo Version v1_22_0+0408-1e09e33461d
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
<sumoConfiguration 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>
<time-to-teleport.railsignal-deadlock value="200"/>
<default.speeddev value="0"/>
</processing>
<report>
<xml-validation value="never"/>
<duration-log.disable value="true"/>
<no-step-log value="true"/>
</report>
<mesoscopic>
<mesosim value="true"/>
<meso-junction-control value="true"/>
</mesoscopic>
</sumoConfiguration>
-->

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<tripinfo id="v0" depart="0.00" departLane="1a_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="22.00" arrivalLane="3a_0" arrivalPos="98.34" arrivalSpeed="13.89" duration="22.00" routeLength="292.16" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="1" devices="tripinfo_v0 routing_v0" vType="tram" speedFactor="1.00" vaporized=""/>
<tripinfo id="v1" depart="0.00" departLane="1b_0" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="39.00" arrivalLane="3a_0" arrivalPos="98.34" arrivalSpeed="13.89" duration="39.00" routeLength="332.25" waitingTime="15.00" waitingCount="0" stopTime="0.00" timeLoss="15.00" rerouteNo="1" devices="tripinfo_v1 routing_v1" vType="tram" speedFactor="1.00" vaporized=""/>
</tripinfos>
3 changes: 3 additions & 0 deletions tests/sumo/rail/tram_road/testsuite.sumo
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
merge

# do not perform insertion checks when there are no tram signals in the network
no_signals

0 comments on commit f4c782b

Please sign in to comment.