Skip to content

Commit

Permalink
added test refs #14343, #21
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Mar 16, 2024
1 parent be8d8fd commit 023309a
Show file tree
Hide file tree
Showing 12 changed files with 247 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-16 12:46:55 by Eclipse SUMO duarouter Version v1_19_0+1343-d992b78d66d
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/duarouterConfiguration.xsd">
<input>
<net-file value="input_net.net.xml"/>
<additional-files value="input_additional.add.xml,input_additional2.add.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<output-file value="routes.rou.xml"/>
<write-license value="true"/>
</output>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<person id="public" depart="4.00">
<stop busStop="bs_2" duration="0.00"/>
<personTrip from="c" to="b" modes="public" departPos="36.28" arrivalPos="40.28" busStop="bs_1" walkFactor="0.75" costs="1196.00"/>
</person>
</routes>
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<edges xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
<edge from="1" id="b" to="2">
<lane index="0" speed="9.90"/>
</edge>
<edge from="2" id="c" to="4">
<lane index="0" speed="23.90"/>
</edge>
<edge from="2" id="d" to="3">
<lane index="0" speed="25.90"/>
</edge>
<edge from="4" id="e" to="5">
<lane index="0" speed="13.90"/>
</edge>
<edge from="5" id="f" to="3">
<lane index="0" speed="13.90"/>
</edge>
<edge from="3" id="g" to="7">
<lane index="0" speed="13.90"/>
</edge>
<edge from="7" id="h" to="6">
<lane index="0" speed="13.90"/>
</edge>
</edges>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<nodes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
<node id="1" x="250.0" y="0.0" />
<node id="2" x="150.0" y="0.0" />
<node id="3" x="50.0" y="0.0" />
<node id="4" x="150.0" y="100.0" />
<node id="5" x="50.0" y="100.0" />
<node id="6" x="150.0" y="-100.0" />
<node id="7" x="50.0" y="-100.0" />

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

<!-- generated on 2024-03-15 16:15:46 by Eclipse SUMO netedit Version v1_19_0+1328-b3d883f94db
-->

<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="a_0" startPos="29.82" endPos="39.82"/>
<busStop id="bs_1" lane="b_0" startPos="35.28" endPos="45.28"/>
<busStop id="bs_2" lane="c_0" startPos="31.28" endPos="41.28"/>
<busStop id="bs_3" lane="d_0" startPos="34.73" endPos="44.73"/>
</additional>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?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">
<flow id="v0" begin="0" period="1000" number="2" line="line0">
<route edges="a b c d"/>
<stop busStop="bs_0" until="100"/>
<stop busStop="bs_1" until="200"/>
<stop busStop="bs_2" until="300"/>
<stop busStop="bs_3" until="400"/>
<stop busStop="bs_0" until="500"/>
</flow>

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

<!-- generated on 2024-03-15 16:19:11 by Eclipse SUMO netedit Version v1_19_0+1328-b3d883f94db
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<additional-files value="/localdata1/debug/_person_personTrip_early_pt/input_additional.add.xml"/>
<sumo-net-file value="input_net.net.xml"/>
</input>
<output>
<output-file value="input_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="0"/>
<junctions.limit-turn-speed value="-1.00"/>
<rectangular-lane-cut value="0"/>
</junctions>
<pedestrian>
<walkingareas value="0"/>
</pedestrian>
</configuration>
-->

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

<location netOffset="-50.00,100.00" convBoundary="0.00,100.00,100.00,200.00" origBoundary="50.00,-100.00,250.00,100.00" projParameter="!"/>

<edge id=":2_0" function="internal">
<lane id=":2_0_0" index="0" disallow="pedestrian" speed="24.90" length="2.58" shape="100.00,98.40 100.70,98.50 101.20,98.80 101.50,99.30 101.60,100.00"/>
</edge>
<edge id=":3_0" function="internal">
<lane id=":3_0_0" index="0" disallow="pedestrian" speed="19.90" length="2.58" shape="-1.60,100.00 -1.50,99.30 -1.20,98.80 -0.70,98.50 0.00,98.40"/>
</edge>
<edge id=":4_0" function="internal">
<lane id=":4_0_0" index="0" disallow="pedestrian" speed="18.90" length="2.58" shape="101.60,200.00 101.50,200.70 101.20,201.20 100.70,201.50 100.00,201.60"/>
</edge>
<edge id=":5_0" function="internal">
<lane id=":5_0_0" index="0" disallow="pedestrian" speed="13.90" length="2.58" shape="0.00,201.60 -0.70,201.50 -1.20,201.20 -1.50,200.70 -1.60,200.00"/>
</edge>

<edge id="a" from="3" to="2" priority="-1">
<lane id="a_0" index="0" disallow="pedestrian" speed="25.90" length="100.00" shape="0.00,98.40 100.00,98.40"/>
</edge>
<edge id="b" from="2" to="4" priority="-1">
<lane id="b_0" index="0" disallow="pedestrian" speed="23.90" length="100.00" shape="101.60,100.00 101.60,200.00"/>
</edge>
<edge id="c" from="4" to="5" priority="-1">
<lane id="c_0" index="0" disallow="pedestrian" speed="13.90" length="100.00" shape="100.00,201.60 0.00,201.60"/>
</edge>
<edge id="d" from="5" to="3" priority="-1">
<lane id="d_0" index="0" disallow="pedestrian" speed="13.90" length="100.00" shape="-1.60,200.00 -1.60,100.00"/>
</edge>

<junction id="2" type="priority" x="100.00" y="100.00" incLanes="a_0" intLanes=":2_0_0" shape="100.00,100.00 103.20,100.00 100.00,96.80">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="3" type="priority" x="0.00" y="100.00" incLanes="d_0" intLanes=":3_0_0" shape="-3.20,100.00 0.00,100.00 0.00,96.80">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="4" type="priority" x="100.00" y="200.00" incLanes="b_0" intLanes=":4_0_0" shape="103.20,200.00 100.00,200.00 100.00,203.20">
<request index="0" response="0" foes="0" cont="0"/>
</junction>
<junction id="5" type="priority" x="0.00" y="200.00" incLanes="c_0" intLanes=":5_0_0" shape="0.00,203.20 0.00,200.00 -3.20,200.00">
<request index="0" response="0" foes="0" cont="0"/>
</junction>

<connection from="a" to="b" fromLane="0" toLane="0" via=":2_0_0" dir="l" state="M"/>
<connection from="b" to="c" fromLane="0" toLane="0" via=":4_0_0" dir="l" state="M"/>
<connection from="c" to="d" fromLane="0" toLane="0" via=":5_0_0" dir="l" state="M"/>
<connection from="d" to="a" fromLane="0" toLane="0" via=":3_0_0" dir="l" state="M"/>

<connection from=":2_0" to="b" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":3_0" to="a" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":4_0" to="c" fromLane="0" toLane="0" dir="l" state="M"/>
<connection from=":5_0" to="d" fromLane="0" toLane="0" dir="l" state="M"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">

<person id="public" depart="4">
<stop busStop="bs_2" duration="0"/>
<personTrip busStop="bs_1" modes="public"/>
</person>

</routes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
--net-file=input_net.net.xml
--additional input_additional.add.xml,input_additional2.add.xml
--route-files=input_routes.rou.xml -o routes.rou.xml
--write-costs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Success.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-16 12:47:22 by Eclipse SUMO duarouter Version v1_19_0+1343-d992b78d66d
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/duarouterConfiguration.xsd">
<input>
<net-file value="input_net.net.xml"/>
<additional-files value="input_additional.add.xml,input_additional2.add.xml"/>
<route-files value="input_routes.rou.xml"/>
</input>
<output>
<output-file value="routes.rou.xml"/>
<write-license value="true"/>
<write-costs value="true"/>
</output>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<person id="public" depart="4.00">
<stop busStop="bs_2" duration="0.00"/>
<ride cost="1196.00" busStop="bs_1" lines="line0" intended="v0" depart="300.00"/>
</person>
</routes>
5 changes: 5 additions & 0 deletions tests/duarouter/person/personTrip/testsuite.duarouter
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,9 @@ pt_looped_disconnected
#
# the passenger must switch between two trains running on the same line
pt_looped_need_transfer

# test for #14343
#
# the passenger must switch between two trains running on the same line
pt_looped_need_transfer2
errors

0 comments on commit 023309a

Please sign in to comment.