patching expected results refs #21, #14500

tests/sumo/devices/rerouting/stops/cyclic_trip_past_stop/vehroutes.sumo.meso

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-02-11 11:28:56 by Eclipse SUMO sumo Version v1_12_0+0490-00f3a0f
+<!-- generated on 2024-03-13 11:30:15 by Eclipse SUMO sumo Version v1_19_0+1258-f6542afa4fc
 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
@@ -27,7 +27,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <processing>
         <default.speeddev value="0"/>
-        <pedestrian.model value="nonInteracting"/>
     </processing>
 
     <routing>
@@ -38,7 +37,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -53,8 +51,8 @@ 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="bus" type="bus" depart="0.00" departPos="0.00" arrival="268.00">
         <routeDistribution>
-            <route replacedOnEdge="a" reason="device.rerouting" replacedAtTime="2.00" probability="0" edges="a b c -c -b -a a b c"/>
-            <route replacedOnEdge="b" replacedOnIndex="1" reason="device.rerouting" replacedAtTime="28.00" probability="0" edges="a b c"/>
+            <route replacedOnEdge="a" reason="device.rerouting" replacedAtTime="12.00" probability="0" edges="a b c -c -b -a a b c"/>
+            <route replacedOnEdge="a" reason="device.rerouting" replacedAtTime="14.00" probability="0" edges="a b c -c detour -a a b c"/>
             <route edges="a b c -c -b -a a b c"/>
         </routeDistribution>
         <stop busStop="busStop_a" duration="10.00"/>

tests/sumo/devices/taxi/bugs/ticket9867/stopinfos.sumo.meso

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-03-13 11:30:15 by Eclipse SUMO sumo Version v1_19_0+1258-f6542afa4fc
+<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>
+        <tripinfo-output value="tripinfos.xml"/>
+        <tripinfo-output.write-unfinished value="true"/>
+        <vehroute-output value="vehroutes.xml"/>
+        <vehroute-output.write-unfinished value="true"/>
+        <stop-output value="stopinfos.xml"/>
+    </output>
+
+    <time>
+        <end value="1000"/>
+    </time>
+
+    <report>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <taxi_device>
+        <device.taxi.dispatch-period value="10"/>
+        <device.taxi.idle-algorithm value="randomCircling"/>
+    </taxi_device>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+    </mesoscopic>
+
+</configuration>
+-->
+
+<stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
+    <stopinfo id="trip_1" type="taxi" edge="A2B2" pos="95.87" parking="1" started="58.87" ended="60.00" initialPersons="0" loadedPersons="1" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="trip_1" type="taxi" edge="B2C2" pos="190.40" parking="1" started="86.58" ended="147.00" initialPersons="1" loadedPersons="0" unloadedPersons="1" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+</stops>

tests/sumo/devices/taxi/bugs/ticket9867/tripinfos.sumo.meso

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-03-13 11:30:15 by Eclipse SUMO sumo Version v1_19_0+1258-f6542afa4fc
+<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>
+        <tripinfo-output value="tripinfos.xml"/>
+        <tripinfo-output.write-unfinished value="true"/>
+        <vehroute-output value="vehroutes.xml"/>
+        <vehroute-output.write-unfinished value="true"/>
+        <stop-output value="stopinfos.xml"/>
+    </output>
+
+    <time>
+        <end value="1000"/>
+    </time>
+
+    <report>
+        <duration-log.disable value="true"/>
+        <no-step-log value="true"/>
+    </report>
+
+    <taxi_device>
+        <device.taxi.dispatch-period value="10"/>
+        <device.taxi.idle-algorithm value="randomCircling"/>
+    </taxi_device>
+
+    <mesoscopic>
+        <mesosim value="true"/>
+    </mesoscopic>
+
+</configuration>
+-->
+
+<tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
+    <personinfo id="p0" depart="5.00" type="DEFAULT_PEDTYPE" speedFactor="0.94">
+        <ride waitingTime="54.00" vehicle="trip_1" depart="59.00" arrival="87.00" arrivalPos="190.40" duration="28.00" routeLength="382.13" timeLoss="0.00"/>
+    </personinfo>
+    <tripinfo id="trip_1" depart="0.00" departLane="" departPos="0.00" departSpeed="14.31" departDelay="0.00" arrival="-1.00" arrivalLane="" arrivalPos="-1.00" arrivalSpeed="-1.00" duration="1000.00" routeLength="13393.20" waitingTime="0.00" waitingCount="0" stopTime="61.00" timeLoss="61.00" rerouteNo="66" devices="vehroute_trip_1 tripinfo_trip_1 routing_trip_1 taxi_trip_1 person_trip_1" vType="taxi" speedFactor="1.03" vaporized="end">
+        <taxi customers="1" occupiedDistance="382.13" occupiedTime="28.71"/>
+    </tripinfo>
+</tripinfos>