Skip to content

Commit

Permalink
adding jupedsim test #14198 #21
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Jan 17, 2024
1 parent 6fee326 commit 62809d8
Show file tree
Hide file tree
Showing 8 changed files with 789 additions and 0 deletions.
52 changes: 52 additions & 0 deletions tests/sumo/pedestrian_model/jupedsim/rerouter/aggregated.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-01-17 15:04:06 by Eclipse SUMO sumo Version v1_19_0+0636-6fee326660e
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"/>
</output>
<time>
<end value="2000"/>
</time>
<processing>
<ignore-route-errors value="true"/>
<default.speeddev value="0"/>
<pedestrian.model value="jupedsim"/>
</processing>
<report>
<xml-validation value="never"/>
<no-step-log value="true"/>
</report>
</configuration>
-->

<meandata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/meandata_file.xsd">
<interval begin="0.00" end="2000.00" id="ed0">
<edge id="E0" arrived="0" entered="0"/>
<edge id="E1" arrived="0" entered="0"/>
<edge id="E2" arrived="0" entered="178"/>
<edge id="E3" arrived="0" entered="22"/>
<edge id="E4" arrived="400" entered="400"/>
</interval>
</meandata>
622 changes: 622 additions & 0 deletions tests/sumo/pedestrian_model/jupedsim/rerouter/errors.sumo

Large diffs are not rendered by default.

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

<!-- generated on 2024-01-16 15:00:55 by Eclipse SUMO netedit Version v1_19_0+0632-d91e66721b8
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<trainStop id="ts_0" lane="E0_0" startPos="248.23" endPos="358.23">
<access lane="E1_0" pos="doors"/>
</trainStop>

<rerouter id="rerouter" edges="E1" pos="160" optional="1">
<interval begin="0" end="86400">
<viaProbReroute id="E3" probability="1"/>
</interval>
</rerouter>

<rerouter id="rerouter2" edges="E1" pos="120" optional="1">
<interval begin="0" end="86400">
<viaProbReroute id="E2" probability="1"/>
</interval>
</rerouter>

<edgeData id="ed0" file="aggregated.xml" writeAttributes="entered arrived" detectPersons="walk"/>

<!-- JuPedSim elements -->
<poly id="jps.walkable_area_0" type="jupedsim.walkable_area" color="179,217,255" fill="1" layer="1.00" shape="-62.960000,-79.480000 -62.960000,61.750000 253.690000,61.750000 253.690000,-79.480000 -62.960000,-79.480000"/>
</additional>
21 changes: 21 additions & 0 deletions tests/sumo/pedestrian_model/jupedsim/rerouter/input_routes.rou.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-01-16 15:01:09 by Eclipse SUMO netedit Version v1_19_0+0632-d91e66721b8
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="v_0" type="DEFAULT_RAILTYPE" depart="0.00">
<route edges="E0"/>
<stop busStop="ts_0" duration="20" until="51.0"/>
</vehicle>
<personFlow id="pS5_4" begin="triggered" number="200">
<ride from="E0" trainStop="ts_0" lines="v_0"/>
<walk to="E1">
<param key="rerouter" value="nearest"/>
<param key="pushParam" value="1"/>
</walk>
<walk to="E4"/>
</personFlow>

</routes>
61 changes: 61 additions & 0 deletions tests/sumo/pedestrian_model/jupedsim/rerouter/net.net.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-01-16 15:00:51 by Eclipse SUMO netedit Version v1_19_0+0632-d91e66721b8
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
<input>
<additional-files value="/home/behr_mi/sumo/tests/_extended_rerouter_person_optional/additional.add.xml"/>
<sumo-net-file value="/home/behr_mi/sumo/tests/_extended_rerouter_person_optional/net.net.xml"/>
</input>
<output>
<output-file value="/home/behr_mi/sumo/tests/_extended_rerouter_person_optional/net.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="-196.70,-62.29,224.40,67.26" origBoundary="10000000000.00,10000000000.00,-10000000000.00,-10000000000.00" projParameter="!"/>

<edge id="E0" from="J0" to="J1" priority="-1" spreadType="center">
<lane id="E0_0" index="0" allow="tram rail_urban rail rail_electric rail_fast" speed="13.89" length="394.07" shape="-196.70,67.26 197.37,65.56"/>
</edge>
<edge id="E1" from="J2" to="J3" priority="-1">
<lane id="E1_0" index="0" speed="13.89" length="203.61" shape="-9.36,59.27 194.25,58.73"/>
</edge>
<edge id="E2" from="J4" to="J5" priority="-1">
<lane id="E2_0" index="0" speed="13.89" length="5.00" shape="-43.54,-7.19 -38.54,-7.19"/>
</edge>
<edge id="E3" from="J6" to="J7" priority="-1">
<lane id="E3_0" index="0" speed="13.89" length="5.00" shape="219.40,-7.01 224.40,-7.01"/>
</edge>
<edge id="E4" from="J8" to="J9" priority="-1">
<lane id="E4_0" index="0" speed="13.89" length="5.00" shape="90.96,-63.89 95.96,-63.89"/>
</edge>

<junction id="J0" type="dead_end" x="-196.70" y="67.26" incLanes="" intLanes="" shape="-196.69,68.86 -196.71,65.66"/>
<junction id="J1" type="dead_end" x="197.37" y="65.56" incLanes="E0_0" intLanes="" shape="197.36,63.96 197.37,67.16"/>
<junction id="J2" type="dead_end" x="-9.36" y="60.87" incLanes="" intLanes="" shape="-9.36,60.87 -9.37,57.67"/>
<junction id="J3" type="dead_end" x="194.25" y="60.33" incLanes="E1_0" intLanes="" shape="194.24,57.13 194.25,60.33"/>
<junction id="J4" type="dead_end" x="-43.54" y="-5.59" incLanes="" intLanes="" shape="-43.54,-5.59 -43.54,-8.79"/>
<junction id="J5" type="dead_end" x="-38.54" y="-5.59" incLanes="E2_0" intLanes="" shape="-38.54,-8.79 -38.54,-5.59"/>
<junction id="J6" type="dead_end" x="219.40" y="-5.41" incLanes="" intLanes="" shape="219.40,-5.41 219.40,-8.61"/>
<junction id="J7" type="dead_end" x="224.40" y="-5.41" incLanes="E3_0" intLanes="" shape="224.40,-8.61 224.40,-5.41"/>
<junction id="J8" type="dead_end" x="90.96" y="-62.29" incLanes="" intLanes="" shape="90.96,-62.29 90.96,-65.49"/>
<junction id="J9" type="dead_end" x="95.96" y="-62.29" incLanes="E4_0" intLanes="" shape="95.96,-65.49 95.96,-62.29"/>

</net>
2 changes: 2 additions & 0 deletions tests/sumo/pedestrian_model/jupedsim/rerouter/options.sumo
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--net-file net.net.xml --route-files input_routes.rou.xml --no-step-log
--ignore-route-errors --additional-files input_additional.add.xml
Empty file.
3 changes: 3 additions & 0 deletions tests/sumo/pedestrian_model/jupedsim/testsuite.sumo
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ larger_net
waypoints
speed_factor

# rerouting with optional rerouters
rerouter

# check correct arrival when there are multiple stops on the same edge
# three_trainStops_at_one_edge (automatically commented due to no test directory being found)

0 comments on commit 62809d8

Please sign in to comment.