adapting jupedsim tests #21

eclipse-sumo · May 6, 2024 · f722914 · f722914
1 parent 90945a5
commit f722914
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/tests/sumo/pedestrian_model/jupedsim/larger_net/tripinfos.sumo b/tests/sumo/pedestrian_model/jupedsim/larger_net/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-05-06 10:18:37 by Eclipse SUMO sumo Version v1_19_0+2084-90c9a6509c4
+<!-- generated on 2024-05-06 22:54:06 by Eclipse SUMO sumo Version 1.20.0
 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
@@ -41,20 +41,20 @@ 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="11" depart="11.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="151.00" waitingTime="0.00" timeLoss="5.58" traveltime="151.00">
-        <walk depart="11.00" departPos="0.00" arrival="162.00" arrivalPos="79.00" duration="151.00" routeLength="201.97" timeLoss="5.58" maxSpeed="1.39"/>
+    <personinfo id="11" depart="11.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="156.00" waitingTime="0.00" timeLoss="10.58" traveltime="156.00">
+        <walk depart="11.00" departPos="0.00" arrival="167.00" arrivalPos="79.00" duration="156.00" routeLength="201.97" timeLoss="10.58" maxSpeed="1.39"/>
+    </personinfo>
+    <personinfo id="13" depart="13.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="245.00" waitingTime="0.00" timeLoss="-0.56" traveltime="245.00">
+        <walk depart="13.00" departPos="0.00" arrival="258.00" arrivalPos="105.38" duration="245.00" routeLength="341.05" timeLoss="-0.56" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="2" depart="2.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="321.00" waitingTime="0.00" timeLoss="0.63" traveltime="321.00">
         <walk depart="2.00" departPos="0.00" arrival="323.00" arrivalPos="56.01" duration="321.00" routeLength="444.96" timeLoss="0.63" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="20" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="320.00" waitingTime="0.00" timeLoss="9.86" traveltime="320.00">
-        <walk depart="20.00" departPos="0.00" arrival="340.00" arrivalPos="91.12" duration="320.00" routeLength="430.75" timeLoss="9.86" maxSpeed="1.39"/>
-    </personinfo>
     <personinfo id="6" depart="6.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="336.00" waitingTime="0.00" timeLoss="-1.86" traveltime="336.00">
         <walk depart="6.00" departPos="0.00" arrival="342.00" arrivalPos="83.08" duration="336.00" routeLength="469.25" timeLoss="-1.86" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="13" depart="13.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="395.00" waitingTime="0.00" timeLoss="149.45" traveltime="395.00">
-        <walk depart="13.00" departPos="0.00" arrival="408.00" arrivalPos="105.38" duration="395.00" routeLength="341.05" timeLoss="149.45" maxSpeed="1.39"/>
+    <personinfo id="20" depart="20.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="323.00" waitingTime="0.00" timeLoss="12.86" traveltime="323.00">
+        <walk depart="20.00" departPos="0.00" arrival="343.00" arrivalPos="91.12" duration="323.00" routeLength="430.75" timeLoss="12.86" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="10" depart="10.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="452.00" waitingTime="0.00" timeLoss="-2.94" traveltime="452.00">
         <walk depart="10.00" departPos="0.00" arrival="462.00" arrivalPos="78.30" duration="452.00" routeLength="631.86" timeLoss="-2.94" maxSpeed="1.39"/>
@@ -74,34 +74,34 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <personinfo id="7" depart="7.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="745.00" waitingTime="0.00" timeLoss="10.46" traveltime="745.00">
         <walk depart="7.00" departPos="0.00" arrival="752.00" arrivalPos="106.30" duration="745.00" routeLength="1020.20" timeLoss="10.46" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="17" depart="17.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="835.00" waitingTime="0.00" timeLoss="11.63" traveltime="835.00">
-        <walk depart="17.00" departPos="0.00" arrival="852.00" arrivalPos="107.02" duration="835.00" routeLength="1143.57" timeLoss="11.63" maxSpeed="1.39"/>
-    </personinfo>
     <personinfo id="19" depart="19.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="837.00" waitingTime="0.00" timeLoss="2.95" traveltime="837.00">
         <walk depart="19.00" departPos="0.00" arrival="856.00" arrivalPos="107.11" duration="837.00" routeLength="1158.40" timeLoss="2.95" maxSpeed="1.39"/>
     </personinfo>
+    <personinfo id="17" depart="17.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="841.00" waitingTime="0.00" timeLoss="17.63" traveltime="841.00">
+        <walk depart="17.00" departPos="0.00" arrival="858.00" arrivalPos="107.02" duration="841.00" routeLength="1143.57" timeLoss="17.63" maxSpeed="1.39"/>
+    </personinfo>
     <personinfo id="1" depart="1.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="953.00" waitingTime="0.00" timeLoss="10.29" traveltime="953.00">
         <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" duration="946.00" waitingTime="0.00" timeLoss="1.38" traveltime="946.00">
         <walk depart="9.00" departPos="0.00" arrival="955.00" arrivalPos="102.69" duration="946.00" routeLength="1311.98" timeLoss="1.38" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="12" depart="12.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="972.00" waitingTime="0.00" timeLoss="6.26" traveltime="972.00">
-        <walk depart="12.00" departPos="0.00" arrival="984.00" arrivalPos="86.58" duration="972.00" routeLength="1341.30" timeLoss="6.26" maxSpeed="1.39"/>
+    <personinfo id="12" depart="12.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="977.00" waitingTime="0.00" timeLoss="11.26" traveltime="977.00">
+        <walk depart="12.00" departPos="0.00" arrival="989.00" arrivalPos="86.58" duration="977.00" routeLength="1341.30" timeLoss="11.26" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="3" depart="3.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1099.00" waitingTime="0.00" timeLoss="-3.35" traveltime="1099.00">
         <walk depart="3.00" departPos="0.00" arrival="1102.00" arrivalPos="70.38" duration="1099.00" routeLength="1531.04" timeLoss="-3.35" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="5" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1364.00" waitingTime="0.00" timeLoss="1.31" traveltime="1364.00">
-        <walk depart="5.00" departPos="0.00" arrival="1369.00" arrivalPos="71.81" duration="1364.00" routeLength="1892.63" timeLoss="1.31" maxSpeed="1.39"/>
+    <personinfo id="5" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1367.00" waitingTime="0.00" timeLoss="4.31" traveltime="1367.00">
+        <walk depart="5.00" departPos="0.00" arrival="1372.00" arrivalPos="71.81" duration="1367.00" routeLength="1892.63" timeLoss="4.31" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="8" depart="8.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1536.00" waitingTime="0.00" timeLoss="7.71" traveltime="1536.00">
         <walk depart="8.00" departPos="0.00" arrival="1544.00" arrivalPos="116.30" duration="1536.00" routeLength="2122.63" timeLoss="7.71" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="4" depart="4.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1616.00" waitingTime="0.00" timeLoss="12.42" traveltime="1616.00">
         <walk depart="4.00" departPos="0.00" arrival="1620.00" arrivalPos="113.83" duration="1616.00" routeLength="2227.19" timeLoss="12.42" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="14" depart="14.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1773.00" waitingTime="0.00" timeLoss="24.35" traveltime="1773.00">
-        <walk depart="14.00" departPos="0.00" arrival="1787.00" arrivalPos="107.88" duration="1773.00" routeLength="2428.68" timeLoss="24.35" maxSpeed="1.39"/>
+    <personinfo id="14" depart="14.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="1780.00" waitingTime="0.00" timeLoss="31.35" traveltime="1780.00">
+        <walk depart="14.00" departPos="0.00" arrival="1794.00" arrivalPos="107.88" duration="1780.00" routeLength="2428.68" timeLoss="31.35" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>
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-05-06 10:18:37 by Eclipse SUMO sumo Version v1_19_0+2084-90c9a6509c4
+<!-- generated on 2024-05-06 22:54:07 by Eclipse SUMO sumo Version 1.20.0
 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
@@ -134,4 +134,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <personinfo id="pf_3.20" depart="24.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="74.00" waitingTime="0.00" timeLoss="10.84" traveltime="74.00">
         <walk depart="24.00" departPos="0.00" arrival="98.00" arrivalPos="2.50" duration="74.00" routeLength="87.72" timeLoss="10.84" maxSpeed="1.39"/>
     </personinfo>
+    <personinfo id="pf_3.2" depart="2.40" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="95.00" waitingTime="0.00" timeLoss="31.84" traveltime="95.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>
 </tripinfos>