Skip to content

Commit

Permalink
added test refs #14359, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Feb 18, 2024
1 parent 88c0bd5 commit ba81457
Show file tree
Hide file tree
Showing 10 changed files with 213 additions and 0 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.
Warning: Vehicle 't1' aborted waiting for a train from which to split.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>


<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="train" vClass="rail" length="300"/>
<vType id="splitTrain" vClass="rail" length="250"/>
<trip id="t0" type="train" depart="0.00" from="b" to="c">
<stop edge="b" endPos="-100" duration="6.00" split="t1"/>
</trip>
<trip id="t1" type="splitTrain" depart="split" from="b" to="e"/>
</routes>
70 changes: 70 additions & 0 deletions tests/sumo/rail/portion_working/split_longTrain/net.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-06-22 11:58:05 by Eclipse SUMO netedit Version v1_17_0+1183-c47f408
<configuration 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>
</configuration>
-->

<net version="1.16" 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="-100.00,-100.00,600.00,0.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>

<edge id=":gneJ2_0" function="internal">
<lane id=":gneJ2_0_0" index="0" allow="rail" speed="13.89" length="10.19" shape="398.12,0.00 401.05,-0.26 402.96,-1.01 404.77,-2.18 407.40,-3.70"/>
</edge>
<edge id=":gneJ2_1" function="internal">
<lane id=":gneJ2_1_0" index="0" allow="rail" speed="13.89" length="10.16" shape="398.12,0.00 408.28,0.00"/>
</edge>

<edge id="b" from="gneJ0" to="gneJ2" priority="-1" spreadType="center" shape="-100.00,0.00 100.00,0.00 400.00,0.00">
<lane id="b_0" index="0" allow="rail" speed="13.89" length="498.12" shape="-100.00,0.00 100.00,0.00 398.12,0.00"/>
</edge>
<edge id="c" from="gneJ2" to="gneJ3" priority="-1" spreadType="center">
<lane id="c_0" index="0" allow="rail" speed="13.89" length="191.72" shape="408.28,0.00 600.00,0.00"/>
</edge>
<edge id="e" from="gneJ2" to="gneJ5" priority="-1" spreadType="center">
<lane id="e_0" index="0" allow="rail" speed="13.89" length="215.33" shape="407.40,-3.70 600.00,-100.00"/>
</edge>

<junction id="gneJ0" type="dead_end" x="-100.00" y="0.00" incLanes="" intLanes="" shape="-100.00,1.60 -100.00,-1.60"/>
<junction id="gneJ2" type="priority" x="400.00" y="0.00" incLanes="b_0" intLanes=":gneJ2_0_0 :gneJ2_1_0" shape="408.28,1.60 408.28,-1.60 408.12,-2.27 406.69,-5.13 404.94,-4.15 403.66,-3.30 402.59,-2.59 401.48,-2.06 400.08,-1.72 398.12,-1.60 398.12,1.60">
<request index="0" response="00" foes="00" cont="0"/>
<request index="1" response="00" foes="00" cont="0"/>
</junction>
<junction id="gneJ3" type="dead_end" x="600.00" y="0.00" incLanes="c_0" intLanes="" shape="600.00,-1.60 600.00,1.60"/>
<junction id="gneJ5" type="dead_end" x="600.00" y="-100.00" incLanes="e_0" intLanes="" shape="599.28,-101.43 600.72,-98.57"/>

<connection from="b" to="e" fromLane="0" toLane="0" via=":gneJ2_0_0" dir="R" state="M"/>
<connection from="b" to="c" fromLane="0" toLane="0" via=":gneJ2_1_0" dir="s" state="M"/>

<connection from=":gneJ2_0" to="e" fromLane="0" toLane="0" dir="R" state="M"/>
<connection from=":gneJ2_1" to="c" fromLane="0" toLane="0" dir="s" state="M"/>

</net>
3 changes: 3 additions & 0 deletions tests/sumo/rail/portion_working/split_longTrain/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
--stop-output stopinfos.xml
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on Fri Dec 13 09:46:40 2019 by Eclipse SUMO Version v1_4_0+0075-5616062
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"/>
<additional-files value="input_additional.add.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-block-output>
43 changes: 43 additions & 0 deletions tests/sumo/rail/portion_working/split_longTrain/stopinfos.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-18 21:12:35 by Eclipse SUMO sumo Version v1_19_0+0863-05598b3
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"/>
<stop-output value="stopinfos.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>
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="t0" type="train@t0" lane="b_0" pos="398.12" parking="0" started="31.00" ended="37.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" split="t1"/>
</stops>
44 changes: 44 additions & 0 deletions tests/sumo/rail/portion_working/split_longTrain/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-02-18 21:12:35 by Eclipse SUMO sumo Version v1_19_0+0863-05598b3
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"/>
<stop-output value="stopinfos.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="t0" depart="0.00" departLane="b_0" departPos="300.10" departSpeed="0.00" departDelay="0.00" arrival="85.00" arrivalLane="c_0" arrivalPos="191.72" arrivalSpeed="12.25" duration="85.00" routeLength="399.90" waitingTime="0.00" waitingCount="0" stopTime="6.00" timeLoss="49.90" rerouteNo="1" devices="tripinfo_t0 routing_t0" vType="train@t0" speedFactor="1.00" vaporized=""/>
<tripinfo id="t1" depart="71.00" departLane="b_0" departPos="498.12" departSpeed="0.00" departDelay="0.00" arrival="113.00" arrivalLane="e_0" arrivalPos="215.33" arrivalSpeed="10.50" duration="42.00" routeLength="225.52" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="25.75" rerouteNo="0" devices="tripinfo_t1 routing_t1" vType="splitTrain" speedFactor="1.00" vaporized=""/>
</tripinfos>
3 changes: 3 additions & 0 deletions tests/sumo/rail/portion_working/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ split
# split a train into two parts without specifing the departPos of the train that is created by splitting
split_departPosDefault

# split a train into a long rear part and a short front part
split_longTrain

# join two train parts into a single train
join

Expand Down

0 comments on commit ba81457

Please sign in to comment.