patching expected results refs #21, #15698

eclipse-sumo · Nov 12, 2024 · 855882d · 855882d
1 parent d39138a
commit 855882d
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/tests/sumo/devices/taxi/basic/end_of_work/tripinfos.sumo b/tests/sumo/devices/taxi/basic/end_of_work/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-26 13:47:12 by Eclipse SUMO sumo Version v1_20_0+0840-6edfc792969
+<!-- generated on 2024-11-12 12:01:21 by Eclipse SUMO sumo Version v1_21_0+0721-62572a188ae
 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,13 +41,13 @@ 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">
-    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="149.00" arrivalLane="B0C0_1" arrivalPos="285.60" arrivalSpeed="13.57" duration="149.00" routeLength="582.50" waitingTime="1.00" waitingCount="1" stopTime="94.00" timeLoss="12.14" rerouteNo="1" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
+    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="148.00" arrivalLane="B0C0_1" arrivalPos="285.60" arrivalSpeed="13.57" duration="148.00" routeLength="582.50" waitingTime="0.00" waitingCount="0" stopTime="94.00" timeLoss="11.22" rerouteNo="1" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
         <taxi customers="0" occupiedDistance="0.00" occupiedTime="0.00"/>
     </tripinfo>
     <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="213.00" waitingTime="30.00" timeLoss="22.73" traveltime="183.00">
         <ride waitingTime="30.00" vehicle="trip_1" depart="30.00" arrival="213.00" arrivalPos="287.60" duration="183.00" routeLength="1370.25" timeLoss="22.73"/>
     </personinfo>
-    <tripinfo id="trip_1" depart="0.00" departLane="A2B2_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="502.00" arrivalLane="A0B0_1" arrivalPos="287.60" arrivalSpeed="2.14" duration="502.00" routeLength="1672.12" waitingTime="2.00" waitingCount="1" stopTime="349.00" timeLoss="29.84" rerouteNo="3" devices="tripinfo_trip_1 routing_trip_1 taxi_trip_1 person_trip_1" vType="taxi" speedFactor="1.00" vaporized="">
+    <tripinfo id="trip_1" depart="0.00" departLane="A2B2_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="502.00" arrivalLane="A0B0_1" arrivalPos="287.60" arrivalSpeed="2.11" duration="502.00" routeLength="1672.12" waitingTime="1.00" waitingCount="1" stopTime="349.00" timeLoss="29.84" rerouteNo="3" devices="tripinfo_trip_1 routing_trip_1 taxi_trip_1 person_trip_1" vType="taxi" speedFactor="1.00" vaporized="">
         <taxi customers="1" occupiedDistance="1370.25" occupiedTime="126.00"/>
     </tripinfo>
 </tripinfos>
diff --git a/tests/sumo/devices/taxi/idling/stop/end_of_work_initial_stop/tripinfos.sumo b/tests/sumo/devices/taxi/idling/stop/end_of_work_initial_stop/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-26 13:47:13 by Eclipse SUMO sumo Version v1_20_0+0840-6edfc792969
+<!-- generated on 2024-11-12 12:01:21 by Eclipse SUMO sumo Version v1_21_0+0721-62572a188ae
 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
@@ -42,13 +42,13 @@ 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">
-    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="149.00" arrivalLane="B0C0_1" arrivalPos="285.60" arrivalSpeed="13.57" duration="149.00" routeLength="582.50" waitingTime="1.00" waitingCount="1" stopTime="94.00" timeLoss="12.14" rerouteNo="1" devices="vehroute_trip_0 tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
+    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="148.00" arrivalLane="B0C0_1" arrivalPos="285.60" arrivalSpeed="13.57" duration="148.00" routeLength="582.50" waitingTime="0.00" waitingCount="0" stopTime="94.00" timeLoss="11.22" rerouteNo="1" devices="vehroute_trip_0 tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
         <taxi customers="0" occupiedDistance="0.00" occupiedTime="0.00"/>
     </tripinfo>
     <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="213.00" waitingTime="30.00" timeLoss="22.73" traveltime="183.00">
         <ride waitingTime="30.00" vehicle="trip_1" depart="30.00" arrival="213.00" arrivalPos="287.60" duration="183.00" routeLength="1370.25" timeLoss="22.73"/>
     </personinfo>
-    <tripinfo id="trip_1" depart="0.00" departLane="A2B2_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="502.00" arrivalLane="A0B0_1" arrivalPos="287.60" arrivalSpeed="2.14" duration="502.00" routeLength="1672.12" waitingTime="2.00" waitingCount="1" stopTime="349.00" timeLoss="29.84" rerouteNo="3" devices="vehroute_trip_1 tripinfo_trip_1 routing_trip_1 taxi_trip_1 person_trip_1" vType="taxi" speedFactor="1.00" vaporized="">
+    <tripinfo id="trip_1" depart="0.00" departLane="A2B2_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="502.00" arrivalLane="A0B0_1" arrivalPos="287.60" arrivalSpeed="2.11" duration="502.00" routeLength="1672.12" waitingTime="1.00" waitingCount="1" stopTime="349.00" timeLoss="29.84" rerouteNo="3" devices="vehroute_trip_1 tripinfo_trip_1 routing_trip_1 taxi_trip_1 person_trip_1" vType="taxi" speedFactor="1.00" vaporized="">
         <taxi customers="1" occupiedDistance="1370.25" occupiedTime="126.00"/>
     </tripinfo>
 </tripinfos>
diff --git a/tests/sumo/devices/taxi/idling/stop/end_of_work_initial_stop/vehroutes.sumo b/tests/sumo/devices/taxi/idling/stop/end_of_work_initial_stop/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-26 13:47:13 by Eclipse SUMO sumo Version v1_20_0+0840-6edfc792969
+<!-- generated on 2024-11-12 12:01:21 by Eclipse SUMO sumo Version v1_21_0+0721-62572a188ae
 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
@@ -42,7 +42,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <vehicle id="trip_0" type="taxi" depart="0.00" arrival="149.00">
+    <vehicle id="trip_0" type="taxi" depart="0.00" arrival="148.00">
         <route edges="A0B0 B0C0"/>
         <stop lane="A0B0_1" triggered="person"/>
     </vehicle>

diff --git a/tests/sumo/devices/taxi/prebooking/abort_pickup/tripinfos.sumo b/tests/sumo/devices/taxi/prebooking/abort_pickup/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-28 13:32:43 by Eclipse SUMO sumo Version v1_20_0+1753-8d7e5fec371
+<!-- generated on 2024-11-12 12:01:21 by Eclipse SUMO sumo Version v1_21_0+0721-62572a188ae
 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
@@ -45,7 +45,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="302.00" routeLength="282.49" waitingTime="0.00" waitingCount="0" stopTime="275.00" timeLoss="6.66" rerouteNo="0" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
         <taxi customers="0" occupiedDistance="0.00" occupiedTime="0.00"/>
     </tripinfo>
-    <tripinfo id="trip_1" depart="0.00" departLane="A2B2_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="302.00" routeLength="303.93" waitingTime="1.00" waitingCount="1" stopTime="267.00" timeLoss="13.12" rerouteNo="3" devices="tripinfo_trip_1 routing_trip_1 taxi_trip_1" vType="taxi" speedFactor="1.00" vaporized="">
+    <tripinfo id="trip_1" depart="0.00" departLane="A2B2_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="302.00" routeLength="301.88" waitingTime="1.00" waitingCount="1" stopTime="268.00" timeLoss="12.27" rerouteNo="3" devices="tripinfo_trip_1 routing_trip_1 taxi_trip_1" vType="taxi" speedFactor="1.00" vaporized="">
         <taxi customers="0" occupiedDistance="0.00" occupiedTime="0.00"/>
     </tripinfo>
 </tripinfos>
diff --git a/tests/sumo/devices/taxi/prebooking/greedy/too_late_next/tripinfos.sumo b/tests/sumo/devices/taxi/prebooking/greedy/too_late_next/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-25 11:27:33 by Eclipse SUMO sumo Version v1_20_0+0786-c99c98a91ec
+<!-- generated on 2024-11-12 12:01:21 by Eclipse SUMO sumo Version v1_21_0+0721-62572a188ae
 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
@@ -39,14 +39,14 @@ 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="p1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="442.00" waitingTime="323.00" timeLoss="17.27" traveltime="119.00">
-        <ride waitingTime="323.00" vehicle="trip_0" depart="323.00" arrival="442.00" arrivalPos="285.60" duration="119.00" routeLength="565.51" timeLoss="17.27"/>
+    <personinfo id="p1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="441.00" waitingTime="322.00" timeLoss="17.21" traveltime="119.00">
+        <ride waitingTime="322.00" vehicle="trip_0" depart="322.00" arrival="441.00" arrivalPos="285.60" duration="119.00" routeLength="565.55" timeLoss="17.21"/>
     </personinfo>
-    <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="-1" waitingTime="145.00" timeLoss="-1" traveltime="-1">
+    <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="-1" waitingTime="144.00" timeLoss="-1" traveltime="-1">
         <stop duration="300.00" arrival="300.00" arrivalPos="0.00" actType="waiting"/>
-        <ride waitingTime="145.00" vehicle="NULL" depart="-1" arrival="-1" arrivalPos="-1" duration="-1" routeLength="-1" timeLoss="-1"/>
+        <ride waitingTime="144.00" vehicle="NULL" depart="-1" arrival="-1" arrivalPos="-1" duration="-1" routeLength="-1" timeLoss="-1"/>
     </personinfo>
-    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="445.00" routeLength="1446.72" waitingTime="7.00" waitingCount="2" stopTime="292.00" timeLoss="44.47" rerouteNo="5" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
-        <taxi customers="1" occupiedDistance="565.51" occupiedTime="62.00"/>
+    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="444.00" routeLength="1446.72" waitingTime="7.00" waitingCount="2" stopTime="293.00" timeLoss="41.60" rerouteNo="5" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
+        <taxi customers="1" occupiedDistance="565.55" occupiedTime="62.00"/>
     </tripinfo>
 </tripinfos>
diff --git a/tests/sumo/devices/taxi/prebooking/greedyShared/too_late_next/tripinfos.sumo b/tests/sumo/devices/taxi/prebooking/greedyShared/too_late_next/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-06-25 11:27:33 by Eclipse SUMO sumo Version v1_20_0+0786-c99c98a91ec
+<!-- generated on 2024-11-12 12:01:21 by Eclipse SUMO sumo Version v1_21_0+0721-62572a188ae
 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
@@ -43,14 +43,14 @@ 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="p1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="442.00" waitingTime="323.00" timeLoss="17.27" traveltime="119.00">
-        <ride waitingTime="323.00" vehicle="trip_0" depart="323.00" arrival="442.00" arrivalPos="285.60" duration="119.00" routeLength="565.51" timeLoss="17.27"/>
+    <personinfo id="p1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="441.00" waitingTime="322.00" timeLoss="17.21" traveltime="119.00">
+        <ride waitingTime="322.00" vehicle="trip_0" depart="322.00" arrival="441.00" arrivalPos="285.60" duration="119.00" routeLength="565.55" timeLoss="17.21"/>
     </personinfo>
-    <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="-1" waitingTime="145.00" timeLoss="-1" traveltime="-1">
+    <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="-1" waitingTime="144.00" timeLoss="-1" traveltime="-1">
         <stop duration="300.00" arrival="300.00" arrivalPos="0.00" actType="waiting"/>
-        <ride waitingTime="145.00" vehicle="NULL" depart="-1" arrival="-1" arrivalPos="-1" duration="-1" routeLength="-1" timeLoss="-1"/>
+        <ride waitingTime="144.00" vehicle="NULL" depart="-1" arrival="-1" arrivalPos="-1" duration="-1" routeLength="-1" timeLoss="-1"/>
     </personinfo>
-    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="445.00" routeLength="1446.72" waitingTime="7.00" waitingCount="2" stopTime="292.00" timeLoss="44.47" rerouteNo="5" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
-        <taxi customers="1" occupiedDistance="565.51" occupiedTime="62.00"/>
+    <tripinfo id="trip_0" depart="0.00" departLane="A0B0_1" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="444.00" routeLength="1446.72" waitingTime="7.00" waitingCount="2" stopTime="293.00" timeLoss="41.60" rerouteNo="5" devices="tripinfo_trip_0 routing_trip_0 taxi_trip_0 person_trip_0" vType="taxi" speedFactor="1.00" vaporized="">
+        <taxi customers="1" occupiedDistance="565.55" occupiedTime="62.00"/>
     </tripinfo>
 </tripinfos>