Skip to content

Commit

Permalink
added test refs #14446, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Mar 1, 2024
1 parent 1d32c06 commit 6f8e371
Show file tree
Hide file tree
Showing 10 changed files with 2,491 additions and 0 deletions.
Empty file.
2,300 changes: 2,300 additions & 0 deletions tests/sumo/extended/stops/arrival/premature_slowdown_rail/fcd.sumo

Large diffs are not rendered by default.

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

<!-- generated on 2024-02-28 18:15:12 by Eclipse SUMO netedit Version 1.19.0
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<busStop id="bs_0" lane="E0_0" startPos="140.26" endPos="240.26"/>
<busStop id="bs_1" lane="E0_0" startPos="7000.00" endPos="7100.00"/>
<busStop id="bs_2" lane="E0_0" startPos="12900.00" endPos="13000.50"/>
</additional>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-28 18:10:18 by Eclipse SUMO netedit Version 1.19.0
-->

<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" carFollowModel="Rail" trainType="RB425" speedFactorPremature="0.5"/>
<!-- Vehicles, persons and containers (sorted by depart) -->
<trip id="t_0" type="train" depart="0.00" from="E1" to="E2">
<stop busStop="bs_0" duration="20" arrival="90" until="120" />
<stop busStop="bs_1" duration="20" arrival="390" until="420" />
<stop busStop="bs_2" duration="20" arrival="690" until="720" />
</trip>
</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-02-28 18:19:35 by Eclipse SUMO netedit Version 1.19.0
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<sumocfg-file value="/Users/philipritzer/Git/sumo-experiments/dynamics.sumocfg"/>
<additional-files value="/Users/philipritzer/Git/sumo-experiments/dynamics.add.xml"/>
<route-files value="/Users/philipritzer/Git/sumo-experiments/dynamics.rou.xml"/>
<sumo-net-file value="/Users/philipritzer/Git/sumo-experiments/dynamics.net.xml"/>
</input>
<output>
<output-file value="/Users/philipritzer/Git/sumo-experiments/dynamics.net.xml"/>
</output>
<processing>
<offset.disable-normalization value="true"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
</junctions>
<netedit>
<new-network value="false"/>
</netedit>
</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="-316.35,-51.47,1350.24,-47.26" origBoundary="10000000000.00,10000000000.00,-10000000000.00,-10000000000.00" projParameter="!"/>

<edge id=":J0_0" function="internal">
<lane id=":J0_0_0" index="0" allow="rail" speed="33.00" length="0.28" shape="-160.73,-50.03 -160.45,-50.03"/>
</edge>
<edge id=":J1_0" function="internal">
<lane id=":J1_0_0" index="0" allow="rail" speed="33.00" length="0.29" shape="1201.96,-48.86 1202.26,-48.86"/>
</edge>

<edge id="E0" from="J0" to="J1" priority="-1" length="13370.00">
<lane id="E0_0" index="0" allow="rail" speed="33.00" length="13370.00" shape="-160.45,-50.03 1201.96,-48.86"/>
</edge>
<edge id="E1" from="J2" to="J0" priority="-1">
<lane id="E1_0" index="0" allow="rail" speed="33.00" length="155.61" shape="-316.32,-53.07 -160.73,-50.03"/>
</edge>
<edge id="E2" from="J1" to="J3" priority="-1">
<lane id="E2_0" index="0" allow="rail" speed="33.00" length="147.98" shape="1202.26,-48.86 1350.22,-50.32"/>
</edge>

<junction id="J0" type="priority" x="-160.61" y="-48.43" incLanes="E1_0" intLanes=":J0_0_0" shape="-160.45,-48.43 -160.45,-51.63 -160.70,-51.63 -160.76,-48.43">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="J1" type="priority" x="1202.12" y="-47.26" incLanes="E0_0" intLanes=":J1_0_0" shape="1202.27,-47.26 1202.24,-50.46 1201.96,-50.46 1201.96,-47.26">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="J2" type="dead_end" x="-316.35" y="-51.47" incLanes="" intLanes="" shape="-316.35,-51.47 -316.29,-54.67"/>
<junction id="J3" type="dead_end" x="1350.24" y="-48.72" incLanes="E2_0" intLanes="" shape="1350.21,-51.92 1350.24,-48.72"/>

<connection from="E0" to="E2" fromLane="0" toLane="0" via=":J1_0_0" dir="s" state="M"/>
<connection from="E1" to="E0" fromLane="0" toLane="0" via=":J0_0_0" dir="s" state="M"/>

<connection from=":J0_0" to="E0" fromLane="0" toLane="0" dir="s" state="M"/>
<connection from=":J1_0" to="E2" fromLane="0" toLane="0" dir="s" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--no-step-log --no-duration-log --net-file=net.net.xml
-a input_additional.add.xml
--routes=input_routes.rou.xml --stop-output stopinfos.xml
--fcd-output fcd.xml
--fcd-output.attributes speed
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-01 09:41:29 by Eclipse SUMO sumo Version v1_19_0+1115-a7a54a029ff
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"/>
<additional-files value="input_additional.add.xml"/>
</input>
<output>
<write-license value="true"/>
<fcd-output value="fcd.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="t_0" type="train" lane="E0_0" pos="240.26" parking="0" started="37.00" ended="120.00" delay="0.00" arrivalDelay="-53.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="bs_0"/>
<stopinfo id="t_0" type="train" lane="E0_0" pos="7100.00" parking="0" started="390.00" ended="420.00" delay="0.00" arrivalDelay="0.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="bs_1"/>
<stopinfo id="t_0" type="train" lane="E0_0" pos="13000.50" parking="0" started="690.00" ended="720.00" delay="0.00" arrivalDelay="0.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0" busStop="bs_2"/>
</stops>
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2023-03-22 17:17:46 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
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="net2.net.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<write-license value="true"/>
<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>
<mesoscopic>
<mesosim value="true"/>
</mesoscopic>
</configuration>
-->

<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
<stopinfo id="veh0" type="DEFAULT_VEHTYPE" edge="SC" pos="0.00" parking="0" started="0.00" ended="17.00" arrivalDelay="-20.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
</stops>
3 changes: 3 additions & 0 deletions tests/sumo/extended/stops/arrival/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ premature_useStarted

# vehicle arrives ahead of time
premature_useStarted_later

# rail vehicle should have smooth trajectory
premature_slowdown_rail

0 comments on commit 6f8e371

Please sign in to comment.