patching expected results refs #21, #14821

eclipse-sumo · May 6, 2024 · 90c9a65 · 90c9a65
1 parent d964155
commit 90c9a65
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 151 deletions.
diff --git a/tests/sumo/devices/taxi/idling/stop/1container/tripinfos.sumo.meso b/tests/sumo/devices/taxi/idling/stop/1container/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-12-21 11:35:39 by Eclipse SUMO sumo Version v1_15_0+1188-e721eef
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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,7 +43,7 @@ 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">
-    <containerinfo id="c0" depart="0.00" type="DEFAULT_CONTAINERTYPE">
+    <containerinfo id="c0" depart="0.00" type="DEFAULT_CONTAINERTYPE" duration="89.00" waitingTime="21.00" timeLoss="0.00" traveltime="89.00">
         <transport waitingTime="21.00" vehicle="trip_1" depart="21.00" arrival="110.00" arrivalPos="191.73" duration="89.00" routeLength="1221.73" timeLoss="0.00"/>
     </containerinfo>
     <tripinfo id="trip_0" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="171.00" routeLength="95.87" waitingTime="0.00" waitingCount="0" stopTime="1.00" timeLoss="0.00" rerouteNo="0" devices="vehroute_trip_0 tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="end">

diff --git a/tests/sumo/devices/taxi/idling/stop/1person/tripinfos.sumo.meso b/tests/sumo/devices/taxi/idling/stop/1person/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-12-21 11:35:39 by Eclipse SUMO sumo Version v1_15_0+1188-e721eef
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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,7 +43,7 @@ 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="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="89.00" waitingTime="21.00" timeLoss="0.00" traveltime="89.00">
         <ride waitingTime="21.00" vehicle="trip_1" depart="21.00" arrival="110.00" arrivalPos="191.73" duration="89.00" routeLength="1221.73" timeLoss="0.00"/>
     </personinfo>
     <tripinfo id="trip_0" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="171.00" routeLength="95.87" waitingTime="0.00" waitingCount="0" stopTime="1.00" timeLoss="0.00" rerouteNo="0" devices="vehroute_trip_0 tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="end">

diff --git a/tests/sumo/devices/taxi/idling/stop/end_of_work/tripinfos.sumo.meso b/tests/sumo/devices/taxi/idling/stop/end_of_work/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-12-21 11:35:39 by Eclipse SUMO sumo Version v1_15_0+1188-e721eef
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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
@@ -46,7 +46,7 @@ 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="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="p0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="89.00" waitingTime="21.00" timeLoss="0.00" traveltime="89.00">
         <ride waitingTime="21.00" vehicle="trip_1" depart="21.00" arrival="110.00" arrivalPos="191.73" duration="89.00" routeLength="1221.73" timeLoss="0.00"/>
     </personinfo>
     <tripinfo id="trip_0" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="155.00" arrivalLane="" arrivalPos="285.60" arrivalSpeed="13.89" duration="155.00" routeLength="573.20" waitingTime="0.00" waitingCount="0" stopTime="1.00" timeLoss="113.53" rerouteNo="0" devices="vehroute_trip_0 tripinfo_trip_0 routing_trip_0 taxi_trip_0" vType="taxi" speedFactor="1.00" vaporized="">

diff --git a/tests/sumo/devices/taxi/idling/stop/reuse_stop_laneEnd/errors.sumo.meso b/tests/sumo/devices/taxi/idling/stop/reuse_stop_laneEnd/errors.sumo.meso
diff --git a/tests/sumo/devices/taxi/idling/stop/reuse_stop_laneEnd/tripinfos.sumo.meso b/tests/sumo/devices/taxi/idling/stop/reuse_stop_laneEnd/tripinfos.sumo.meso
diff --git a/tests/sumo/devices/taxi/idling/stop/reuse_stop_laneEnd/vehroutes.sumo.meso b/tests/sumo/devices/taxi/idling/stop/reuse_stop_laneEnd/vehroutes.sumo.meso
diff --git a/tests/sumo/devices/taxi/lines/2lines_rideSelect_greedy/tripinfos.sumo.meso b/tests/sumo/devices/taxi/lines/2lines_rideSelect_greedy/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-05 01:42:42 by Eclipse SUMO sumo Version v1_18_0+0084-35bb20c
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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
@@ -46,10 +46,10 @@ 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="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="97.00" waitingTime="48.00" timeLoss="0.00" traveltime="97.00">
         <ride waitingTime="48.00" vehicle="trip_A" depart="48.00" arrival="145.00" arrivalPos="190.40" duration="97.00" routeLength="1332.80" timeLoss="0.00"/>
     </personinfo>
-    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="56.00" waitingTime="249.00" timeLoss="0.00" traveltime="56.00">
         <ride waitingTime="249.00" vehicle="trip_A" depart="249.00" arrival="305.00" arrivalPos="190.40" duration="56.00" routeLength="761.60" timeLoss="0.00"/>
     </personinfo>
     <tripinfo id="trip_A" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="366.00" routeLength="3705.20" waitingTime="0.00" waitingCount="0" stopTime="122.00" timeLoss="35.61" rerouteNo="4" devices="tripinfo_trip_A routing_trip_A taxi_trip_A person_trip_A" vType="taxi" speedFactor="1.00" vaporized="">

diff --git a/tests/sumo/devices/taxi/lines/2lines_rideSelect_greedyClosest/tripinfos.sumo.meso b/tests/sumo/devices/taxi/lines/2lines_rideSelect_greedyClosest/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-05 01:42:42 by Eclipse SUMO sumo Version v1_18_0+0084-35bb20c
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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
@@ -46,10 +46,10 @@ 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="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="97.00" waitingTime="48.00" timeLoss="0.00" traveltime="97.00">
         <ride waitingTime="48.00" vehicle="trip_A" depart="48.00" arrival="145.00" arrivalPos="190.40" duration="97.00" routeLength="1332.80" timeLoss="0.00"/>
     </personinfo>
-    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="56.00" waitingTime="249.00" timeLoss="0.00" traveltime="56.00">
         <ride waitingTime="249.00" vehicle="trip_A" depart="249.00" arrival="305.00" arrivalPos="190.40" duration="56.00" routeLength="761.60" timeLoss="0.00"/>
     </personinfo>
     <tripinfo id="trip_A" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="366.00" routeLength="3705.20" waitingTime="0.00" waitingCount="0" stopTime="122.00" timeLoss="35.61" rerouteNo="4" devices="tripinfo_trip_A routing_trip_A taxi_trip_A person_trip_A" vType="taxi" speedFactor="1.00" vaporized="">

diff --git a/tests/sumo/devices/taxi/lines/2lines_rideSelect_greedyShared/tripinfos.sumo.meso b/tests/sumo/devices/taxi/lines/2lines_rideSelect_greedyShared/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-05 01:42:42 by Eclipse SUMO sumo Version v1_18_0+0084-35bb20c
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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
@@ -46,10 +46,10 @@ 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="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="98.00" waitingTime="48.00" timeLoss="0.00" traveltime="98.00">
         <ride waitingTime="48.00" vehicle="trip_A" depart="48.00" arrival="146.00" arrivalPos="190.40" duration="98.00" routeLength="1332.80" timeLoss="0.00"/>
     </personinfo>
-    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="56.00" waitingTime="90.00" timeLoss="0.00" traveltime="56.00">
         <ride waitingTime="90.00" vehicle="trip_A" depart="90.00" arrival="146.00" arrivalPos="190.40" duration="56.00" routeLength="761.60" timeLoss="0.00"/>
     </personinfo>
     <tripinfo id="trip_A" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="207.00" routeLength="1991.60" waitingTime="0.00" waitingCount="0" stopTime="62.00" timeLoss="0.00" rerouteNo="2" devices="tripinfo_trip_A routing_trip_A taxi_trip_A person_trip_A" vType="taxi" speedFactor="1.00" vaporized="">

diff --git a/tests/sumo/devices/taxi/lines/2lines_rideSelect_routeExtension/tripinfos.sumo.meso b/tests/sumo/devices/taxi/lines/2lines_rideSelect_routeExtension/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-05 01:42:42 by Eclipse SUMO sumo Version v1_18_0+0084-35bb20c
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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
@@ -46,10 +46,10 @@ 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="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="98.00" waitingTime="48.00" timeLoss="0.00" traveltime="98.00">
         <ride waitingTime="48.00" vehicle="trip_A" depart="48.00" arrival="146.00" arrivalPos="190.40" duration="98.00" routeLength="1332.80" timeLoss="0.00"/>
     </personinfo>
-    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="56.00" waitingTime="90.00" timeLoss="0.00" traveltime="56.00">
         <ride waitingTime="90.00" vehicle="trip_A" depart="90.00" arrival="146.00" arrivalPos="190.40" duration="56.00" routeLength="761.60" timeLoss="0.00"/>
     </personinfo>
     <tripinfo id="trip_A" depart="0.00" departLane="" departPos="0.00" departSpeed="13.89" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="207.00" routeLength="1991.60" waitingTime="0.00" waitingCount="0" stopTime="62.00" timeLoss="0.00" rerouteNo="2" devices="tripinfo_trip_A routing_trip_A taxi_trip_A person_trip_A" vType="taxi" speedFactor="1.00" vaporized="">

diff --git a/tests/sumo/devices/taxi/personTrip/bike_sharing/tripinfos.sumo.meso b/tests/sumo/devices/taxi/personTrip/bike_sharing/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-07 22:27:48 by Eclipse SUMO sumo Version v1_19_0+1200-d6b735e953a
+<!-- generated on 2024-05-06 08:14:46 by Eclipse SUMO sumo Version v1_19_0+2082-42a66fb977e
 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
@@ -48,10 +48,10 @@ 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="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="1" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="517.00" waitingTime="0.00" timeLoss="2.92" traveltime="517.00">
         <walk depart="0.00" departPos="0.00" arrival="517.00" arrivalPos="142.80" duration="517.00" routeLength="714.00" timeLoss="2.92" maxSpeed="1.39"/>
     </personinfo>
-    <personinfo id="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00">
+    <personinfo id="0" depart="0.00" type="DEFAULT_PEDTYPE" speedFactor="1.00" duration="568.00" waitingTime="94.00" timeLoss="3.60" traveltime="568.00">
         <walk depart="0.00" departPos="0.00" arrival="274.00" arrivalPos="92.23" duration="274.00" routeLength="377.83" timeLoss="1.96" maxSpeed="1.39"/>
         <ride waitingTime="94.00" vehicle="bikeA" depart="368.00" arrival="489.00" arrivalPos="190.40" duration="121.00" routeLength="666.40" timeLoss="0.00"/>
         <walk depart="489.00" departPos="190.40" arrival="662.00" arrivalPos="142.80" duration="173.00" routeLength="238.00" timeLoss="1.64" maxSpeed="1.39"/>