patching expected results refs #21, #9891

eclipse-sumo · May 17, 2024 · 3a77c01 · 3a77c01
1 parent bc174c3
commit 3a77c01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/tests/sumo/extended/state/save_taz/state.sumo.meso b/tests/sumo/extended/state/save_taz/state.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-06-20 08:01:52 by Eclipse SUMO sumo Version v1_17_0+1032-444433a
+<!-- generated on 2024-05-17 14:27:58 by Eclipse SUMO sumo Version v1_20_0+0108-bc174c3c663
 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
@@ -44,18 +44,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_17_0+1032-444433a" time="10.00" type="meso">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0108-bc174c3c663" time="10.00" type="meso">
     <route id="!flowFromTo" state="0" edges="beg end"/>
     <route id="!flowFromTo.0!var#1" state="0" edges="beg middle end"/>
     <route id="r0" state="1" edges="beg middle end"/>
     <delay number="2" begin="4" end="0" depart="7.00" time="0.00"/>
     <vType id="t0" sigma="0"/>
     <vehicle id="flowFromTo.0" type="t0" depart="0.00" route="!flowFromTo.0!var#1" distance="0 1" speedFactor="1.0000" reroute="1" state="262242 7000 0 0 0 0 15630 7000 9223372036854775807">
-        <device id="tripinfo_flowFromTo.0" state="0.811124 -0 0 0 0 0 -1"/>
+        <device id="tripinfo_flowFromTo.0" state="0.811124 -0 0 0 0 0 -1 -1000  -1 0 -1"/>
         <device id="routing_flowFromTo.0" state="0"/>
     </vehicle>
     <vehicle id="flowNumber.0" type="t0" depart="0.00" route="r0" distance="7 0" speedFactor="1.0000" state="2146 0 1 0 0 0 14199 7000 9223372036854775807">
-        <device id="tripinfo_flowNumber.0" state="1 7 0 0 0 0 -1"/>
+        <device id="tripinfo_flowNumber.0" state="1 7 0 0 0 0 -1 -1000  -1 0 -1"/>
     </vehicle>
     <vehicle id="flowNumber.1" type="t0" depart="8.00" route="r0" distance="0 0" speedFactor="1.0000" state="2146 9223372036854775807 0 -1000 -1 0 -9223372036854775808 -9223372036854775808 9223372036854775807"/>
     <vehicle id="flowPeriod.0" type="t0" depart="5.00" route="r0" distance="0 0" speedFactor="1.0000" state="2146 9223372036854775807 0 -1000 -1 0 -9223372036854775808 -9223372036854775808 9223372036854775807"/>

diff --git a/tests/sumo/extended/state/save_taz_route_invalid/state.sumo.meso b/tests/sumo/extended/state/save_taz_route_invalid/state.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-04-05 10:31:35 by Eclipse SUMO sumo Version v1_12_0+1949-1d2ae20f770
+<!-- generated on 2024-05-17 14:27:58 by Eclipse SUMO sumo Version v1_20_0+0108-bc174c3c663
 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
@@ -29,13 +29,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <processing>
         <ignore-route-errors value="true"/>
         <default.speeddev value="0"/>
-        <pedestrian.model value="nonInteracting"/>
     </processing>
 
     <report>
         <verbose value="true"/>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -47,15 +45,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 </configuration>
 -->
 
-<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_12_0+1949-1d2ae20f770" time="10.00" type="meso">
+<snapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/state_file.xsd" version="v1_20_0+0108-bc174c3c663" time="10.00" type="meso">
     <route id="!tripFromTo!var#1" state="0" edges="middle"/>
     <route id="!tripFromTo2" state="0" edges="1-source 1-sink"/>
     <route id="!tripFromTo3" state="0" edges="1-source 1-sink"/>
     <route id="!tripFromTo4" state="0" edges="1-source 1-sink"/>
     <delay number="1" begin="4" end="0" depart="0.00" time="0.00"/>
     <vType id="t0" sigma="0"/>
     <vehicle id="tripFromTo" type="t0" depart="9.00" fromTaz="1" toTaz="1" route="!tripFromTo!var#1" distance="0 1" speedFactor="1.0000" reroute="1" state="458754 9000 0 0 0 0 16199 9000 9223372036854775807">
-        <device id="tripinfo_tripFromTo" state="13.89 -0 0 0 0 0 -1"/>
+        <device id="tripinfo_tripFromTo" state="13.89 -0 0 0 0 0 -1 -1000  -1 0 -1"/>
         <device id="routing_tripFromTo" state="0"/>
     </vehicle>
     <vehicle id="tripFromTo2" type="t0" depart="10.00" fromTaz="1" toTaz="1" route="!tripFromTo2" distance="0 0" speedFactor="1.0000" reroute="1" state="458754 9223372036854775807 0 -1000 -1 0 -9223372036854775808 -9223372036854775808 9223372036854775807">