adding and adapting tests #21 fix #14514

eclipse-sumo · Mar 15, 2024 · 31c9e0b · 31c9e0b
1 parent 135dd86
commit 31c9e0b
Show file tree

Hide file tree

Showing 12 changed files with 1,045 additions and 567 deletions.
diff --git a/tests/sumo/pedestrian_model/jupedsim/testsuite.sumo b/tests/sumo/pedestrian_model/jupedsim/testsuite.sumo
@@ -24,10 +24,10 @@ walking_area
 # larger network
 larger_net
 waypoints
+
+# changing the radius of the waypoint
+waypoint_radius
 speed_factor
 
 # rerouting with optional rerouters
 rerouter
-
-# This test checks the unboarding of passengers, which requires geometry switching.
-geometry_switching
diff --git a/tests/sumo/pedestrian_model/jupedsim/vanishing_area/fcd.sumo b/tests/sumo/pedestrian_model/jupedsim/vanishing_area/fcd.sumo
diff --git a/tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo b/tests/sumo/pedestrian_model/jupedsim/vanishing_area/output.sumo
@@ -1,9 +1,9 @@
-Loading net-file from 'net.net.xml' ... done (11ms).
-Loading additional-files from 'input_additional.add.xml' ... done (1ms).
+Loading net-file from 'net.net.xml' ... done (2ms).
+Loading additional-files from 'input_additional.add.xml' ... done (0ms).
 Loading done.
 Generating initial JuPedSim geometry for pedestrian network ... 
 done.
-Simulation version v1_19_0+1118-98ab26335df started with time: 0.00.
+Simulation version v1_19_0+1308-9c99b20f1c6 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.
@@ -18,20 +18,20 @@ Person 'pf_3.16' in vanishing area 'jupedsim.vanishing_area_1' was removed from
 Person 'pf_3.14' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
 Person 'pf_3.1' in vanishing area 'jupedsim.vanishing_area_2' was removed from the simulation.
 Person 'pf_3.17' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
-Person 'pf_3.19' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
 Person 'pf_3.2' in vanishing area 'jupedsim.vanishing_area_2' was removed from the simulation.
+Person 'pf_3.19' in vanishing area 'jupedsim.vanishing_area_1' was removed from the simulation.
 Simulation ended at time: 100.00
 Reason: The final simulation step has been reached.
 Performance: 
- Duration: 8.20s
- Real time factor: 12.1996
+ Duration: 6.14s
+ Real time factor: 16.276
  UPS: 0.000000
- UPS-Persons: 1976.088813
+ UPS-Persons: 2635.253906
 Vehicles: 
  Inserted: 0
  Running: 0
  Waiting: 0
 Persons: 
  Inserted: 12000
- Running: 299
+ Running: 298
 
diff --git a/tests/sumo/pedestrian_model/jupedsim/vanishing_area/tripinfos.sumo b/tests/sumo/pedestrian_model/jupedsim/vanishing_area/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-01 11:56:58 by Eclipse SUMO sumo Version v1_19_0+1118-98ab26335df
+<!-- generated on 2024-03-15 10:11:47 by Eclipse SUMO sumo Version v1_19_0+1308-9c99b20f1c6
 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
@@ -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="79.00" arrivalPos="2.50" duration="71.00" routeLength="88.42" timeLoss="7.34" maxSpeed="1.39"/>
+        <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"/>
     </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="82.00" arrivalPos="2.50" duration="71.00" routeLength="88.42" timeLoss="7.34" maxSpeed="1.39"/>
+        <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"/>
     </personinfo>
     <personinfo id="pf_2.7" depart="8.40" type="DEFAULT_PEDTYPE" speedFactor="1.00">
-        <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"/>
+        <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"/>
     </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"/>
@@ -117,7 +117,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <walk depart="17.00" departPos="0.00" arrival="92.00" arrivalPos="2.50" duration="75.00" routeLength="87.72" timeLoss="11.84" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="pf_3.1" depart="1.20" type="DEFAULT_PEDTYPE" speedFactor="1.00">
-        <walk depart="2.00" departPos="0.00" arrival="93.00" arrivalPos="2.50" duration="91.00" routeLength="87.72" timeLoss="27.84" maxSpeed="1.39"/>
+        <walk depart="2.00" departPos="0.00" arrival="92.00" arrivalPos="2.50" duration="90.00" routeLength="87.72" timeLoss="26.84" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="pf_2.17" depart="20.40" type="DEFAULT_PEDTYPE" speedFactor="1.00">
         <walk depart="21.00" departPos="0.00" arrival="94.00" arrivalPos="2.50" duration="73.00" routeLength="88.42" timeLoss="9.34" maxSpeed="1.39"/>
@@ -134,13 +134,16 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <personinfo id="pf_2.18" depart="21.60" type="DEFAULT_PEDTYPE" speedFactor="1.00">
         <walk depart="22.00" departPos="0.00" arrival="97.00" arrivalPos="2.50" duration="75.00" routeLength="88.42" timeLoss="11.34" maxSpeed="1.39"/>
     </personinfo>
+    <personinfo id="pf_3.2" depart="2.40" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+        <walk depart="3.00" departPos="0.00" arrival="97.00" arrivalPos="2.50" duration="94.00" routeLength="87.72" timeLoss="30.84" maxSpeed="1.39"/>
+    </personinfo>
     <personinfo id="pf_2.20" depart="24.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
         <walk depart="24.00" departPos="0.00" arrival="98.00" arrivalPos="2.50" duration="74.00" routeLength="88.42" timeLoss="10.34" maxSpeed="1.39"/>
     </personinfo>
     <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_3.2" depart="2.40" type="DEFAULT_PEDTYPE" speedFactor="1.00">
-        <walk depart="3.00" departPos="0.00" arrival="98.00" arrivalPos="2.50" duration="95.00" routeLength="87.72" timeLoss="31.84" maxSpeed="1.39"/>
+    <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>
diff --git a/tests/sumo/pedestrian_model/jupedsim/waypoint_radius/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/waypoint_radius/errors.sumo
diff --git a/tests/sumo/pedestrian_model/jupedsim/waypoint_radius/fcd.sumo b/tests/sumo/pedestrian_model/jupedsim/waypoint_radius/fcd.sumo
@@ -0,0 +1,279 @@
+<?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
+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"/>
+        <fcd-output value="fcd.xml"/>
+        <tripinfo-output value="tripinfos.xml"/>
+    </output>
+
+    <time>
+        <end value="2000"/>
+    </time>
+
+    <processing>
+        <default.speeddev value="0"/>
+        <pedestrian.model value="jupedsim"/>
+    </processing>
+
+    <report>
+        <xml-validation value="never"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <fcd_device>
+        <device.fcd.period value="10"/>
+    </fcd_device>
+
+</configuration>
+-->
+
+<fcd-export xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/fcd_file.xsd">
+    <timestep time="0.00">
+        <person id="p_0" x="-4.91" y="79.33" angle="180.00" speed="0.00" pos="0.00" edge="E0" slope="0.00"/>
+    </timestep>
+    <timestep time="10.00">
+        <person id="p_0" x="-0.21" y="66.35" angle="155.13" speed="1.39" pos="8.11" edge="E1" slope="0.00"/>
+    </timestep>
+    <timestep time="20.00">
+        <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"/>
+    </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"/>
+    </timestep>
+    <timestep time="50.00">
+        <person id="p_0" x="27.59" y="49.22" angle="17.89" speed="1.39" pos="14.17" edge="E3" slope="0.00"/>
+    </timestep>
+    <timestep time="60.00">
+        <person id="p_0" x="31.90" y="62.43" angle="18.23" speed="1.39" pos="28.03" edge="E3" slope="0.00"/>
+    </timestep>
+    <timestep time="70.00">
+        <person id="p_0" x="36.24" y="75.62" angle="18.23" speed="1.39" pos="41.89" edge="E3" slope="0.00"/>
+    </timestep>
+    <timestep time="80.00">
+        <person id="p_0" x="46.88" y="81.16" angle="93.94" speed="1.39" pos="9.19" edge="E4" slope="0.00"/>
+    </timestep>
+    <timestep time="90.00">
+        <person id="p_0" x="58.18" y="76.11" angle="149.81" speed="1.39" pos="5.12" edge="E5" slope="0.00"/>
+    </timestep>
+    <timestep time="100.00">
+        <person id="p_0" x="65.17" y="64.11" angle="149.81" speed="1.39" pos="18.98" edge="E5" slope="0.00"/>
+    </timestep>
+    <timestep time="110.00">
+        <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"/>
+    </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"/>
+    </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"/>
+    </timestep>
+    <timestep time="150.00"/>
+    <timestep time="160.00"/>
+    <timestep time="170.00"/>
+    <timestep time="180.00"/>
+    <timestep time="190.00"/>
+    <timestep time="200.00"/>
+    <timestep time="210.00"/>
+    <timestep time="220.00"/>
+    <timestep time="230.00"/>
+    <timestep time="240.00"/>
+    <timestep time="250.00"/>
+    <timestep time="260.00"/>
+    <timestep time="270.00"/>
+    <timestep time="280.00"/>
+    <timestep time="290.00"/>
+    <timestep time="300.00"/>
+    <timestep time="310.00"/>
+    <timestep time="320.00"/>
+    <timestep time="330.00"/>
+    <timestep time="340.00"/>
+    <timestep time="350.00"/>
+    <timestep time="360.00"/>
+    <timestep time="370.00"/>
+    <timestep time="380.00"/>
+    <timestep time="390.00"/>
+    <timestep time="400.00"/>
+    <timestep time="410.00"/>
+    <timestep time="420.00"/>
+    <timestep time="430.00"/>
+    <timestep time="440.00"/>
+    <timestep time="450.00"/>
+    <timestep time="460.00"/>
+    <timestep time="470.00"/>
+    <timestep time="480.00"/>
+    <timestep time="490.00"/>
+    <timestep time="500.00"/>
+    <timestep time="510.00"/>
+    <timestep time="520.00"/>
+    <timestep time="530.00"/>
+    <timestep time="540.00"/>
+    <timestep time="550.00"/>
+    <timestep time="560.00"/>
+    <timestep time="570.00"/>
+    <timestep time="580.00"/>
+    <timestep time="590.00"/>
+    <timestep time="600.00"/>
+    <timestep time="610.00"/>
+    <timestep time="620.00"/>
+    <timestep time="630.00"/>
+    <timestep time="640.00"/>
+    <timestep time="650.00"/>
+    <timestep time="660.00"/>
+    <timestep time="670.00"/>
+    <timestep time="680.00"/>
+    <timestep time="690.00"/>
+    <timestep time="700.00"/>
+    <timestep time="710.00"/>
+    <timestep time="720.00"/>
+    <timestep time="730.00"/>
+    <timestep time="740.00"/>
+    <timestep time="750.00"/>
+    <timestep time="760.00"/>
+    <timestep time="770.00"/>
+    <timestep time="780.00"/>
+    <timestep time="790.00"/>
+    <timestep time="800.00"/>
+    <timestep time="810.00"/>
+    <timestep time="820.00"/>
+    <timestep time="830.00"/>
+    <timestep time="840.00"/>
+    <timestep time="850.00"/>
+    <timestep time="860.00"/>
+    <timestep time="870.00"/>
+    <timestep time="880.00"/>
+    <timestep time="890.00"/>
+    <timestep time="900.00"/>
+    <timestep time="910.00"/>
+    <timestep time="920.00"/>
+    <timestep time="930.00"/>
+    <timestep time="940.00"/>
+    <timestep time="950.00"/>
+    <timestep time="960.00"/>
+    <timestep time="970.00"/>
+    <timestep time="980.00"/>
+    <timestep time="990.00"/>
+    <timestep time="1000.00"/>
+    <timestep time="1010.00"/>
+    <timestep time="1020.00"/>
+    <timestep time="1030.00"/>
+    <timestep time="1040.00"/>
+    <timestep time="1050.00"/>
+    <timestep time="1060.00"/>
+    <timestep time="1070.00"/>
+    <timestep time="1080.00"/>
+    <timestep time="1090.00"/>
+    <timestep time="1100.00"/>
+    <timestep time="1110.00"/>
+    <timestep time="1120.00"/>
+    <timestep time="1130.00"/>
+    <timestep time="1140.00"/>
+    <timestep time="1150.00"/>
+    <timestep time="1160.00"/>
+    <timestep time="1170.00"/>
+    <timestep time="1180.00"/>
+    <timestep time="1190.00"/>
+    <timestep time="1200.00"/>
+    <timestep time="1210.00"/>
+    <timestep time="1220.00"/>
+    <timestep time="1230.00"/>
+    <timestep time="1240.00"/>
+    <timestep time="1250.00"/>
+    <timestep time="1260.00"/>
+    <timestep time="1270.00"/>
+    <timestep time="1280.00"/>
+    <timestep time="1290.00"/>
+    <timestep time="1300.00"/>
+    <timestep time="1310.00"/>
+    <timestep time="1320.00"/>
+    <timestep time="1330.00"/>
+    <timestep time="1340.00"/>
+    <timestep time="1350.00"/>
+    <timestep time="1360.00"/>
+    <timestep time="1370.00"/>
+    <timestep time="1380.00"/>
+    <timestep time="1390.00"/>
+    <timestep time="1400.00"/>
+    <timestep time="1410.00"/>
+    <timestep time="1420.00"/>
+    <timestep time="1430.00"/>
+    <timestep time="1440.00"/>
+    <timestep time="1450.00"/>
+    <timestep time="1460.00"/>
+    <timestep time="1470.00"/>
+    <timestep time="1480.00"/>
+    <timestep time="1490.00"/>
+    <timestep time="1500.00"/>
+    <timestep time="1510.00"/>
+    <timestep time="1520.00"/>
+    <timestep time="1530.00"/>
+    <timestep time="1540.00"/>
+    <timestep time="1550.00"/>
+    <timestep time="1560.00"/>
+    <timestep time="1570.00"/>
+    <timestep time="1580.00"/>
+    <timestep time="1590.00"/>
+    <timestep time="1600.00"/>
+    <timestep time="1610.00"/>
+    <timestep time="1620.00"/>
+    <timestep time="1630.00"/>
+    <timestep time="1640.00"/>
+    <timestep time="1650.00"/>
+    <timestep time="1660.00"/>
+    <timestep time="1670.00"/>
+    <timestep time="1680.00"/>
+    <timestep time="1690.00"/>
+    <timestep time="1700.00"/>
+    <timestep time="1710.00"/>
+    <timestep time="1720.00"/>
+    <timestep time="1730.00"/>
+    <timestep time="1740.00"/>
+    <timestep time="1750.00"/>
+    <timestep time="1760.00"/>
+    <timestep time="1770.00"/>
+    <timestep time="1780.00"/>
+    <timestep time="1790.00"/>
+    <timestep time="1800.00"/>
+    <timestep time="1810.00"/>
+    <timestep time="1820.00"/>
+    <timestep time="1830.00"/>
+    <timestep time="1840.00"/>
+    <timestep time="1850.00"/>
+    <timestep time="1860.00"/>
+    <timestep time="1870.00"/>
+    <timestep time="1880.00"/>
+    <timestep time="1890.00"/>
+    <timestep time="1900.00"/>
+    <timestep time="1910.00"/>
+    <timestep time="1920.00"/>
+    <timestep time="1930.00"/>
+    <timestep time="1940.00"/>
+    <timestep time="1950.00"/>
+    <timestep time="1960.00"/>
+    <timestep time="1970.00"/>
+    <timestep time="1980.00"/>
+    <timestep time="1990.00"/>
+</fcd-export>