patching expected results refs #21, #12067

eclipse-sumo · Dec 19, 2024 · a98409a · a98409a
1 parent a660028
commit a98409a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/tests/sumo/devices/bluelight/mingapfactor/tripinfos.sumo b/tests/sumo/devices/bluelight/mingapfactor/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-09-22 15:42:42 by Eclipse SUMO sumo Version v1_18_0+1749-26d8ef39b84
+<!-- generated on 2024-12-19 14:47:39 by Eclipse SUMO sumo Version v1_21_0+1497-cb7ac34731d
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net2.net.xml"/>
@@ -39,15 +39,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <device.bluelight.mingapfactor value="0.1"/>
     </bluelight_device>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="rescue" depart="40.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="2.00" arrival="60.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.56" arrivalSpeed="23.76" duration="20.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="12.40" rerouteNo="0" devices="tripinfo_rescue bluelight_rescue" vType="rescue" speedFactor="2.00" vaporized="">
+    <tripinfo id="rescue" depart="40.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="2.00" arrival="53.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.28" arrivalSpeed="27.78" duration="13.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="4.85" rerouteNo="0" devices="tripinfo_rescue bluelight_rescue" vType="rescue" speedFactor="2.00" vaporized="">
         <bluelight/>
     </tripinfo>
-    <tripinfo id="left1" depart="35.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="99.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="2" stopTime="0.00" timeLoss="49.58" rerouteNo="0" devices="tripinfo_left1" vType="left" speedFactor="1.00" vaporized=""/>
     <tripinfo id="right1" depart="35.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="99.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="2" stopTime="0.00" timeLoss="49.58" rerouteNo="0" devices="tripinfo_right1" vType="right" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="left2" depart="37.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="102.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="42.00" waitingCount="2" stopTime="0.00" timeLoss="49.81" rerouteNo="0" devices="tripinfo_left2" vType="left" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="right2" depart="37.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="102.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="42.00" waitingCount="2" stopTime="0.00" timeLoss="49.81" rerouteNo="0" devices="tripinfo_right2" vType="right" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="left1" depart="35.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="100.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="44.00" waitingCount="1" stopTime="0.00" timeLoss="49.64" rerouteNo="0" devices="tripinfo_left1" vType="left" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="right2" depart="37.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="101.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="1" stopTime="0.00" timeLoss="49.51" rerouteNo="0" devices="tripinfo_right2" vType="right" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="left2" depart="37.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="102.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="43.00" waitingCount="1" stopTime="0.00" timeLoss="49.87" rerouteNo="0" devices="tripinfo_left2" vType="left" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/devices/bluelight/multiple/tripinfos.sumo b/tests/sumo/devices/bluelight/multiple/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-12-04 10:24:38 by Eclipse SUMO sumo Version v1_15_0+0749-de9f6f8
+<!-- generated on 2024-12-19 14:47:39 by Eclipse SUMO sumo Version v1_21_0+1497-cb7ac34731d
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net2.net.xml"/>
@@ -34,18 +34,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="rescue" depart="40.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="2.00" arrival="61.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.56" arrivalSpeed="23.76" duration="21.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="13.30" rerouteNo="0" devices="tripinfo_rescue bluelight_rescue" vType="rescue" speedFactor="2.00" vaporized="">
+    <tripinfo id="rescue" depart="40.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="2.00" arrival="53.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.28" arrivalSpeed="27.78" duration="13.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="4.85" rerouteNo="0" devices="tripinfo_rescue bluelight_rescue" vType="rescue" speedFactor="2.00" vaporized="">
         <bluelight/>
     </tripinfo>
-    <tripinfo id="rescue2" depart="43.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="4.00" arrival="63.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="-1.00" arrivalSpeed="23.76" duration="20.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="12.42" rerouteNo="0" devices="tripinfo_rescue2 bluelight_rescue2" vType="rescue" speedFactor="2.00" vaporized="">
+    <tripinfo id="rescue2" depart="43.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="4.00" arrival="62.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.56" arrivalSpeed="23.76" duration="19.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="11.32" rerouteNo="0" devices="tripinfo_rescue2 bluelight_rescue2" vType="rescue" speedFactor="2.00" vaporized="">
         <bluelight/>
     </tripinfo>
     <tripinfo id="left1" depart="35.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="100.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="44.00" waitingCount="1" stopTime="0.00" timeLoss="49.64" rerouteNo="0" devices="tripinfo_left1" vType="left" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="right1" depart="35.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="100.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="-0.70" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="44.00" waitingCount="1" stopTime="0.00" timeLoss="49.64" rerouteNo="0" devices="tripinfo_right1" vType="right@right1" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="left2" depart="37.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="101.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.70" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="1" stopTime="0.00" timeLoss="49.18" rerouteNo="0" devices="tripinfo_left2" vType="left@left2" speedFactor="1.00" vaporized=""/>
-    <tripinfo id="right2" depart="37.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="101.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="-0.70" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="1" stopTime="0.00" timeLoss="49.18" rerouteNo="0" devices="tripinfo_right2" vType="right@right2" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="right1" depart="35.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="100.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="44.00" waitingCount="1" stopTime="0.00" timeLoss="49.64" rerouteNo="0" devices="tripinfo_right1" vType="right" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="left2" depart="37.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="101.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="1" stopTime="0.00" timeLoss="49.18" rerouteNo="0" devices="tripinfo_left2" vType="left" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="right2" depart="37.00" departLane="SC_0" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="101.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="64.00" routeLength="200.00" waitingTime="43.00" waitingCount="1" stopTime="0.00" timeLoss="49.18" rerouteNo="0" devices="tripinfo_right2" vType="right" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/devices/bluelight/single/tripinfos.sumo b/tests/sumo/devices/bluelight/single/tripinfos.sumo
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Jun 19 15:33:46 2020 by Eclipse SUMO Version v1_6_0+0852-e16bec9b48
+<!-- generated on 2024-12-19 14:47:39 by Eclipse SUMO sumo Version v1_21_0+1497-cb7ac34731d
 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
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net2.net.xml"/>
@@ -33,11 +38,11 @@ SPDX-License-Identifier: EPL-2.0
         <device.bluelight.explicit value="rescue"/>
     </bluelight_device>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <tripinfo id="rescue" depart="40.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="2.00" arrival="61.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.56" arrivalSpeed="23.76" duration="21.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="13.30" rerouteNo="0" devices="tripinfo_rescue bluelight_rescue" vType="rescue" speedFactor="2.00" vaporized="">
+    <tripinfo id="rescue" depart="40.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="2.00" arrival="53.00" arrivalLane="CN_0" arrivalPos="91.95" arrivalPosLat="1.28" arrivalSpeed="27.78" duration="13.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="4.85" rerouteNo="0" devices="tripinfo_rescue bluelight_rescue" vType="rescue" speedFactor="2.00" vaporized="">
         <bluelight/>
     </tripinfo>
     <tripinfo id="left1" depart="35.00" departLane="SC_1" departPos="0.00" departPosLat="0.00" departSpeed="0.00" departDelay="0.00" arrival="100.00" arrivalLane="CN_1" arrivalPos="91.95" arrivalPosLat="0.00" arrivalSpeed="13.89" duration="65.00" routeLength="200.00" waitingTime="44.00" waitingCount="1" stopTime="0.00" timeLoss="49.64" rerouteNo="0" devices="tripinfo_left1" vType="left" speedFactor="1.00" vaporized=""/>