Skip to content

Commit

Permalink
[JuPedSim] Updated tests w.r.t. commit 63eb0db.
Browse files Browse the repository at this point in the history
  • Loading branch information
bcoueraud87 authored and namdre committed Apr 16, 2024
1 parent 0cb5614 commit 1bc82e4
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 98 deletions.
128 changes: 65 additions & 63 deletions tests/sumo/pedestrian_model/jupedsim/geometry_switching/fcd.sumo

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions tests/sumo/pedestrian_model/jupedsim/larger_net/tripinfos.sumo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-01-15 15:26:06 by Eclipse SUMO sumo Version v1_19_0+0627-db9832c3763
<!-- generated on 2024-04-16 14:21:04 by Eclipse SUMO sumo Version v1_19_0+1839-63eb0dbab5a
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
Expand Down Expand Up @@ -48,10 +48,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<walk depart="13.00" departPos="0.00" arrival="257.00" arrivalPos="105.38" duration="244.00" routeLength="341.04" timeLoss="-1.55" maxSpeed="1.39"/>
</personinfo>
<personinfo id="2" depart="2.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="2.00" departPos="0.00" arrival="323.00" arrivalPos="56.01" duration="321.00" routeLength="444.97" timeLoss="0.62" maxSpeed="1.39"/>
<walk depart="2.00" departPos="0.00" arrival="324.00" arrivalPos="56.01" duration="322.00" routeLength="444.97" timeLoss="1.62" maxSpeed="1.39"/>
</personinfo>
<personinfo id="20" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="20.00" departPos="0.00" arrival="338.00" arrivalPos="91.12" duration="318.00" routeLength="430.74" timeLoss="7.86" maxSpeed="1.39"/>
<walk depart="20.00" departPos="0.00" arrival="339.00" arrivalPos="91.12" duration="319.00" routeLength="430.74" timeLoss="8.86" maxSpeed="1.39"/>
</personinfo>
<personinfo id="6" depart="6.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="6.00" departPos="0.00" arrival="342.00" arrivalPos="83.07" duration="336.00" routeLength="469.24" timeLoss="-1.85" maxSpeed="1.39"/>
Expand All @@ -78,10 +78,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<walk depart="17.00" departPos="0.00" arrival="850.00" arrivalPos="107.02" duration="833.00" routeLength="1143.59" timeLoss="9.62" maxSpeed="1.39"/>
</personinfo>
<personinfo id="19" depart="19.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="19.00" departPos="0.00" arrival="854.00" arrivalPos="107.11" duration="835.00" routeLength="1158.40" timeLoss="0.95" maxSpeed="1.39"/>
<walk depart="19.00" departPos="0.00" arrival="855.00" arrivalPos="107.11" duration="836.00" routeLength="1158.40" timeLoss="1.95" maxSpeed="1.39"/>
</personinfo>
<personinfo id="1" depart="1.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="1.00" departPos="0.00" arrival="953.00" arrivalPos="46.08" duration="952.00" routeLength="1309.32" timeLoss="9.29" maxSpeed="1.39"/>
<walk depart="1.00" departPos="0.00" arrival="954.00" arrivalPos="46.08" duration="953.00" routeLength="1309.32" timeLoss="10.29" maxSpeed="1.39"/>
</personinfo>
<personinfo id="9" depart="9.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="9.00" departPos="0.00" arrival="955.00" arrivalPos="102.69" duration="946.00" routeLength="1311.96" timeLoss="1.39" maxSpeed="1.39"/>
Expand Down
11 changes: 8 additions & 3 deletions tests/sumo/pedestrian_model/jupedsim/vanishing_area/fcd.sumo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-15 10:11:47 by Eclipse SUMO sumo Version v1_19_0+1308-9c99b20f1c6
<!-- generated on 2024-04-16 14:21:01 by Eclipse SUMO sumo Version v1_19_0+1839-63eb0dbab5a
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
Expand Down Expand Up @@ -10292,6 +10292,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="pf_2.28" x="1751.88" y="2057.18" angle="250.39" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.29" x="1751.68" y="2058.27" angle="250.23" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.30" x="1750.32" y="2055.99" angle="251.03" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.5" x="1715.46" y="2051.77" angle="0.19" speed="1.38" pos="2.49" edge="E1" slope="0.00"/>
<person id="pf_2.6" x="1715.72" y="2050.29" angle="333.50" speed="0.75" pos="2.75" edge="E1" slope="0.00"/>
<person id="pf_3.20" x="1743.09" y="2054.11" angle="250.53" speed="1.39" pos="5.00" edge="E2" slope="0.00"/>
<person id="pf_3.21" x="1742.60" y="2055.16" angle="250.45" speed="1.39" pos="5.00" edge="E2" slope="0.00"/>
Expand Down Expand Up @@ -10546,6 +10547,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="pf_2.29" x="1750.37" y="2057.80" angle="250.23" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.30" x="1749.01" y="2055.54" angle="251.05" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.32" x="1761.10" y="2060.52" angle="250.55" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.6" x="1715.46" y="2051.43" angle="0.12" speed="1.16" pos="2.49" edge="E1" slope="0.00"/>
<person id="pf_3.22" x="1743.54" y="2054.27" angle="250.53" speed="1.39" pos="5.00" edge="E2" slope="0.00"/>
<person id="pf_3.24" x="1743.28" y="2055.40" angle="250.45" speed="1.39" pos="5.00" edge="E2" slope="0.00"/>
<person id="pf_3.1" x="1703.67" y="2040.22" angle="251.88" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
Expand Down Expand Up @@ -11318,6 +11320,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="pf_2.33" x="1760.54" y="2061.44" angle="250.26" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.35" x="1758.95" y="2059.70" angle="250.38" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.38" x="1760.71" y="2060.33" angle="250.37" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.9" x="1715.46" y="2051.74" angle="0.19" speed="1.38" pos="2.49" edge="E1" slope="0.00"/>
<person id="pf_2.7" x="1715.72" y="2050.30" angle="332.48" speed="0.83" pos="2.75" edge="E1" slope="0.00"/>
<person id="pf_3.26" x="1743.18" y="2054.00" angle="250.23" speed="1.39" pos="5.00" edge="E2" slope="0.00"/>
<person id="pf_3.1" x="1699.71" y="2038.93" angle="251.88" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
Expand Down Expand Up @@ -11580,7 +11583,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="pf_2.33" x="1759.23" y="2060.97" angle="250.26" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.35" x="1757.65" y="2059.23" angle="250.38" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.38" x="1759.40" y="2059.86" angle="250.38" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.8" x="1715.81" y="2050.19" angle="309.17" speed="1.16" pos="2.84" edge="E1" slope="0.00"/>
<person id="pf_2.7" x="1715.46" y="2051.41" angle="0.07" speed="1.15" pos="2.49" edge="E1" slope="0.00"/>
<person id="pf_2.8" x="1715.87" y="2050.15" angle="297.23" speed="1.09" pos="2.90" edge="E1" slope="0.00"/>
<person id="pf_3.27" x="1743.46" y="2054.74" angle="250.90" speed="1.34" pos="5.00" edge="E2" slope="0.00"/>
<person id="pf_3.29" x="1743.21" y="2055.78" angle="250.90" speed="1.39" pos="5.00" edge="E2" slope="0.00"/>
<person id="pf_3.1" x="1698.39" y="2038.49" angle="251.88" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
Expand Down Expand Up @@ -11848,7 +11852,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="pf_2.33" x="1757.92" y="2060.50" angle="250.25" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.35" x="1756.34" y="2058.76" angle="250.39" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.38" x="1758.10" y="2059.39" angle="250.38" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.8" x="1715.46" y="2051.51" angle="0.19" speed="1.37" pos="2.49" edge="E1" slope="0.00"/>
<person id="pf_2.8" x="1715.48" y="2051.15" angle="347.40" speed="1.08" pos="2.51" edge="E1" slope="0.00"/>
<person id="pf_3.1" x="1697.07" y="2038.06" angle="251.88" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
<person id="pf_3.10" x="1719.33" y="2046.89" angle="250.52" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
<person id="pf_3.11" x="1713.84" y="2043.72" angle="251.59" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
Expand Down Expand Up @@ -16410,6 +16414,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="pf_2.47" x="1754.88" y="2059.40" angle="250.21" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.48" x="1760.13" y="2061.34" angle="250.23" speed="1.38" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.50" x="1753.58" y="2057.79" angle="250.36" speed="1.39" pos="5.00" edge="E0" slope="0.00"/>
<person id="pf_2.19" x="1715.46" y="2051.70" angle="0.19" speed="1.38" pos="2.49" edge="E1" slope="0.00"/>
<person id="pf_3.11" x="1692.75" y="2036.70" angle="251.59" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
<person id="pf_3.12" x="1698.06" y="2041.18" angle="242.26" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
<person id="pf_3.13" x="1698.43" y="2038.64" angle="251.39" speed="1.39" pos="5.00" edge="E3" slope="0.00"/>
Expand Down
14 changes: 7 additions & 7 deletions tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Loading net-file from 'net.net.xml' ... done (2ms).
Loading additional-files from 'input_additional.add.xml' ... done (0ms).
Loading net-file from 'net.net.xml' ... done (97ms).
Loading additional-files from 'input_additional.add.xml' ... done (6ms).
Loading done.
Generating initial JuPedSim geometry for pedestrian network ...
done.
Simulation version v1_19_0+1308-9c99b20f1c6 started with time: 0.00.
Simulation version v1_19_0+1839-63eb0dbab5a started with time: 0.00.
Person 'pf_2.0' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
Person 'pf_3.0' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
Person 'pf_2.1' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
Expand All @@ -23,15 +23,15 @@ Person 'pf_3.19' in vanishing area 'jupedsim.vanishing_area_1' was removed from
Simulation ended at time: 100.00
Reason: The final simulation step has been reached.
Performance:
Duration: 6.14s
Real time factor: 16.276
Duration: 25.16s
Real time factor: 3.9744
UPS: 0.000000
UPS-Persons: 2635.253906
UPS-Persons: 643.694607
Vehicles:
Inserted: 0
Running: 0
Waiting: 0
Persons:
Inserted: 12000
Running: 298
Running: 299

17 changes: 7 additions & 10 deletions tests/sumo/pedestrian_model/jupedsim/vanishing_area/tripinfos.sumo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-15 10:11:47 by Eclipse SUMO sumo Version v1_19_0+1308-9c99b20f1c6
<!-- generated on 2024-04-16 14:21:01 by Eclipse SUMO sumo Version v1_19_0+1839-63eb0dbab5a
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
Expand Down Expand Up @@ -68,23 +68,23 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<personinfo id="pf_2.4" depart="4.80" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="5.00" departPos="0.00" arrival="75.00" arrivalPos="2.50" duration="70.00" routeLength="88.42" timeLoss="6.34" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_2.5" depart="6.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="6.00" departPos="0.00" arrival="77.00" arrivalPos="2.50" duration="71.00" routeLength="88.42" timeLoss="7.34" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_3.7" depart="8.40" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="9.00" departPos="0.00" arrival="77.00" arrivalPos="2.50" duration="68.00" routeLength="87.72" timeLoss="4.84" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_2.5" depart="6.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="6.00" departPos="0.00" arrival="78.00" arrivalPos="2.50" duration="72.00" routeLength="88.42" timeLoss="8.34" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_2.6" depart="7.20" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="8.00" departPos="0.00" arrival="78.00" arrivalPos="2.50" duration="70.00" routeLength="88.42" timeLoss="6.34" maxSpeed="1.39"/>
<walk depart="8.00" departPos="0.00" arrival="79.00" arrivalPos="2.50" duration="71.00" routeLength="88.42" timeLoss="7.34" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_3.6" depart="7.20" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="8.00" departPos="0.00" arrival="80.00" arrivalPos="2.50" duration="72.00" routeLength="87.72" timeLoss="8.84" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_2.9" depart="10.80" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="11.00" departPos="0.00" arrival="81.00" arrivalPos="2.50" duration="70.00" routeLength="88.42" timeLoss="6.34" maxSpeed="1.39"/>
<walk depart="11.00" departPos="0.00" arrival="82.00" arrivalPos="2.50" duration="71.00" routeLength="88.42" timeLoss="7.34" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_2.7" depart="8.40" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="9.00" departPos="0.00" arrival="82.00" arrivalPos="2.50" duration="73.00" routeLength="88.42" timeLoss="9.34" maxSpeed="1.39"/>
<walk depart="9.00" departPos="0.00" arrival="83.00" arrivalPos="2.50" duration="74.00" routeLength="88.42" timeLoss="10.34" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_3.9" depart="10.80" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="11.00" departPos="0.00" arrival="83.00" arrivalPos="2.50" duration="72.00" routeLength="87.72" timeLoss="8.84" maxSpeed="1.39"/>
Expand Down Expand Up @@ -143,7 +143,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<personinfo id="pf_3.19" depart="22.80" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="23.00" departPos="0.00" arrival="98.00" arrivalPos="2.50" duration="75.00" routeLength="87.72" timeLoss="11.84" maxSpeed="1.39"/>
</personinfo>
<personinfo id="pf_2.19" depart="22.80" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="23.00" departPos="0.00" arrival="99.00" arrivalPos="2.50" duration="76.00" routeLength="88.42" timeLoss="12.34" maxSpeed="1.39"/>
</personinfo>
</tripinfos>
14 changes: 8 additions & 6 deletions tests/sumo/pedestrian_model/jupedsim/waypoint_radius/fcd.sumo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-15 10:13:30 by Eclipse SUMO sumo Version v1_19_0+1308-9c99b20f1c6
<!-- generated on 2024-04-16 14:21:03 by Eclipse SUMO sumo Version v1_19_0+1839-63eb0dbab5a
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
Expand Down Expand Up @@ -56,7 +56,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="p_0" x="5.86" y="53.87" angle="148.51" speed="1.39" pos="21.97" edge="E1" slope="0.00"/>
</timestep>
<timestep time="30.00">
<person id="p_0" x="13.12" y="42.03" angle="148.51" speed="1.39" pos="0.00" edge="E2" slope="0.00"/>
<person id="p_0" x="13.12" y="42.03" angle="148.51" speed="1.39" pos="35.84" edge="E2" slope="0.00"/>
</timestep>
<timestep time="40.00">
<person id="p_0" x="23.32" y="36.01" angle="19.11" speed="1.21" pos="0.30" edge="E3" slope="0.00"/>
Expand All @@ -83,15 +83,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<person id="p_0" x="72.23" y="52.15" angle="149.44" speed="1.39" pos="32.84" edge="E5" slope="0.00"/>
</timestep>
<timestep time="120.00">
<person id="p_0" x="80.92" y="42.40" angle="99.51" speed="1.39" pos="4.06" edge="E6" slope="0.00"/>
<person id="p_0" x="80.63" y="42.00" angle="88.78" speed="1.39" pos="3.91" edge="E6" slope="0.00"/>
</timestep>
<timestep time="130.00">
<person id="p_0" x="86.44" y="53.07" angle="15.75" speed="1.39" pos="11.31" edge="E7" slope="0.00"/>
<person id="p_0" x="86.38" y="52.83" angle="15.75" speed="1.39" pos="11.06" edge="E7" slope="0.00"/>
</timestep>
<timestep time="140.00">
<person id="p_0" x="89.64" y="66.58" angle="11.43" speed="1.39" pos="25.18" edge="E7" slope="0.00"/>
<person id="p_0" x="89.59" y="66.34" angle="11.43" speed="1.39" pos="24.93" edge="E7" slope="0.00"/>
</timestep>
<timestep time="150.00">
<person id="p_0" x="92.34" y="79.95" angle="11.43" speed="1.39" pos="0.87" edge="E8" slope="0.00"/>
</timestep>
<timestep time="150.00"/>
<timestep time="160.00"/>
<timestep time="170.00"/>
<timestep time="180.00"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-03-15 10:13:30 by Eclipse SUMO sumo Version v1_19_0+1308-9c99b20f1c6
<!-- generated on 2024-04-16 14:21:03 by Eclipse SUMO sumo Version v1_19_0+1839-63eb0dbab5a
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
Expand Down Expand Up @@ -47,8 +47,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later

<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
<personinfo id="p_0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
<walk depart="0.00" departPos="0.00" arrival="23.00" arrivalPos="3.02" duration="23.00" routeLength="53.43" timeLoss="-15.47" maxSpeed="1.39"/>
<walk depart="23.00" departPos="3.02" arrival="118.00" arrivalPos="3.06" duration="95.00" routeLength="118.95" timeLoss="9.35" maxSpeed="1.39"/>
<walk depart="118.00" departPos="3.06" arrival="150.00" arrivalPos="2.88" duration="32.00" routeLength="46.29" timeLoss="-1.33" maxSpeed="1.39"/>
<walk depart="0.00" departPos="0.00" arrival="30.00" arrivalPos="3.02" duration="30.00" routeLength="53.43" timeLoss="-8.47" maxSpeed="1.39"/>
<walk depart="30.00" departPos="3.02" arrival="119.00" arrivalPos="3.06" duration="89.00" routeLength="118.95" timeLoss="3.35" maxSpeed="1.39"/>
<walk depart="119.00" departPos="3.06" arrival="151.00" arrivalPos="2.88" duration="32.00" routeLength="46.29" timeLoss="-1.33" maxSpeed="1.39"/>
</personinfo>
</tripinfos>

0 comments on commit 1bc82e4

Please sign in to comment.