adapting more emission output tests #21 #14209

eclipse-sumo · Jan 23, 2024 · 6b5de12 · 6b5de12
1 parent 474bc5e
commit 6b5de12
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 31 deletions.
diff --git a/tests/complex/sumo/socketout/output.complex b/tests/complex/sumo/socketout/output.complex
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-06-16 10:37:20 by Eclipse SUMO sumo Version v1_13_0+0901-ab95b5a7246
+<!-- generated on 2024-01-23 07:38:11 by Eclipse SUMO sumo Version v1_19_0+0653-474bc5e6c94
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -26,24 +26,24 @@
         <edge id="3/1to2/1" sampledSeconds="54.90" CO_abs="1056.825000" CO2_abs="115961.000000" HC_abs="7.304750" PMx_abs="0.684725" NOx_abs="38.170750" fuel_abs="36987.350000" electricity_abs="0"
             CO_normed="162.380282" CO2_normed="17817.311140" HC_normed="1.122369" PMx_normed="0.105207" NOx_normed="5.864904" fuel_normed="5683.075544" electricity_normed="0"
             traveltime="39.05" CO_perVeh="751.712500" CO2_perVeh="82482.277778" HC_perVeh="5.195819" PMx_perVeh="0.487040" NOx_perVeh="27.150597" fuel_perVeh="26308.852778" electricity_perVeh="0"/>
-        <edge id="4/1to3/1" sampledSeconds="58.70" CO_abs="1129.975000" CO2_abs="123987.444444" HC_abs="7.810361" PMx_abs="0.732119" NOx_abs="40.812806" fuel_abs="39547.494444" electricity_abs="0"
-            CO_normed="173.619718" CO2_normed="19050.567648" HC_normed="1.200055" PMx_normed="0.112490" NOx_normed="6.270854" fuel_normed="6076.439607" electricity_normed="0"
+        <edge id="4/1to3/1" sampledSeconds="58.10" CO_abs="1118.425000" CO2_abs="122720.111111" HC_abs="7.730528" PMx_abs="0.724636" NOx_abs="40.395639" fuel_abs="39143.261111" electricity_abs="0"
+            CO_normed="171.845070" CO2_normed="18855.842936" HC_normed="1.187789" PMx_normed="0.111340" NOx_normed="6.206756" fuel_normed="6014.329492" electricity_normed="0"
             traveltime="39.05" CO_perVeh="751.712500" CO2_perVeh="82482.277778" HC_perVeh="5.195819" PMx_perVeh="0.487040" NOx_perVeh="27.150597" fuel_perVeh="26308.852778" electricity_perVeh="0"/>
     </interval>
     <interval begin="60.00" end="120.00" id="dump_60">
         <edge id="1/1to0/1" sampledSeconds="18.70" CO_abs="359.975000" CO2_abs="39498.555556" HC_abs="2.488139" PMx_abs="0.233231" NOx_abs="13.001694" fuel_abs="12598.605556" electricity_abs="0"
             CO_normed="55.309859" CO2_normed="6068.920188" HC_normed="0.382300" PMx_normed="0.035836" NOx_normed="1.997700" fuel_normed="1935.765258" electricity_normed="0"
             traveltime="39.05" CO_perVeh="751.712500" CO2_perVeh="82482.277778" HC_perVeh="5.195819" PMx_perVeh="0.487040" NOx_perVeh="27.150597" fuel_perVeh="26308.852778" electricity_perVeh="0"/>
-        <edge id="2/1to1/1" sampledSeconds="78.70" CO_abs="1514.975000" CO2_abs="166231.888889" HC_abs="10.471472" PMx_abs="0.981564" NOx_abs="54.718361" fuel_abs="53021.938889" electricity_abs="0"
-            CO_normed="232.774648" CO2_normed="25541.391379" HC_normed="1.608933" PMx_normed="0.150816" NOx_normed="8.407431" fuel_normed="8146.776782" electricity_normed="0"
+        <edge id="2/1to1/1" sampledSeconds="78.10" CO_abs="1503.425000" CO2_abs="164964.555556" HC_abs="10.391639" PMx_abs="0.974081" NOx_abs="54.301194" fuel_abs="52617.705556" electricity_abs="0"
+            CO_normed="231.000000" CO2_normed="25346.666667" HC_normed="1.596667" PMx_normed="0.149667" NOx_normed="8.343333" fuel_normed="8084.666667" electricity_normed="0"
             traveltime="39.05" CO_perVeh="751.712500" CO2_perVeh="82482.277778" HC_perVeh="5.195819" PMx_perVeh="0.487040" NOx_perVeh="27.150597" fuel_perVeh="26308.852778" electricity_perVeh="0"/>
-        <edge id="3/1to2/1" sampledSeconds="23.80" CO_abs="458.150000" CO2_abs="50270.888889" HC_abs="3.166722" PMx_abs="0.296839" NOx_abs="16.547611" fuel_abs="16034.588889" electricity_abs="0"
-            CO_normed="70.394366" CO2_normed="7724.080239" HC_normed="0.486564" PMx_normed="0.045609" NOx_normed="2.542527" fuel_normed="2463.701238" electricity_normed="0"
+        <edge id="3/1to2/1" sampledSeconds="23.20" CO_abs="446.600000" CO2_abs="49003.555556" HC_abs="3.086889" PMx_abs="0.289356" NOx_abs="16.130444" fuel_abs="15630.355556" electricity_abs="0"
+            CO_normed="68.619718" CO2_normed="7529.355527" HC_normed="0.474298" PMx_normed="0.044459" NOx_normed="2.478429" fuel_normed="2401.591122" electricity_normed="0"
             traveltime="39.05" CO_perVeh="751.712500" CO2_perVeh="82482.277778" HC_perVeh="5.195819" PMx_perVeh="0.487040" NOx_perVeh="27.150597" fuel_perVeh="26308.852778" electricity_perVeh="0"/>
     </interval>
     <interval begin="120.00" end="150.00" id="dump_60">
-        <edge id="1/1to0/1" sampledSeconds="57.50" CO_abs="1106.875000" CO2_abs="121452.777778" HC_abs="7.650694" PMx_abs="0.717153" NOx_abs="39.978472" fuel_abs="38739.027778" electricity_abs="0"
-            CO_normed="340.140845" CO2_normed="37322.236449" HC_normed="2.351046" PMx_normed="0.220380" NOx_normed="12.285318" fuel_normed="11904.438754" electricity_normed="0"
+        <edge id="1/1to0/1" sampledSeconds="57.20" CO_abs="1101.100000" CO2_abs="120819.111111" HC_abs="7.610778" PMx_abs="0.713411" NOx_abs="39.769889" fuel_abs="38536.911111" electricity_abs="0"
+            CO_normed="338.366197" CO2_normed="37127.511737" HC_normed="2.338779" PMx_normed="0.219230" NOx_normed="12.221221" fuel_normed="11842.328638" electricity_normed="0"
             traveltime="39.05" CO_perVeh="751.712500" CO2_perVeh="82482.277778" HC_perVeh="5.195819" PMx_perVeh="0.487040" NOx_perVeh="27.150597" fuel_perVeh="26308.852778" electricity_perVeh="0"/>
     </interval>
 </meandata>
diff --git a/tests/sumo/devices/battery/tripinfo_emission/aggregated300.sumo b/tests/sumo/devices/battery/tripinfo_emission/aggregated300.sumo
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Oct 16 10:35:09 2020 by Eclipse SUMO sumo Version v1_7_0+0625-fbb42d88cd
+<!-- generated on 2024-01-23 07:36:18 by Eclipse SUMO sumo Version v1_19_0+0653-474bc5e6c94
 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
+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
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -29,7 +34,6 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
@@ -329,9 +333,9 @@ SPDX-License-Identifier: EPL-2.0
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
         <edge id="16to164" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
-        <edge id="16to38" sampledSeconds="23.94" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="112.880742"
-            CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="36.878251"
-            traveltime="23.42" CO_perVeh="0" CO2_perVeh="0" HC_perVeh="0" PMx_perVeh="0" NOx_perVeh="0" fuel_perVeh="0" electricity_perVeh="110.401058"/>
+        <edge id="16to38" sampledSeconds="23.42" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="108.857093"
+            CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="35.563721"
+            traveltime="23.42" CO_perVeh="0" CO2_perVeh="0" HC_perVeh="0" PMx_perVeh="0" NOx_perVeh="0" fuel_perVeh="0" electricity_perVeh="108.857093"/>
         <edge id="170to148" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
         <edge id="171to133" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
@@ -488,9 +492,9 @@ SPDX-License-Identifier: EPL-2.0
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
         <edge id="38to165" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
-        <edge id="38to167" sampledSeconds="10.17" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="50.495469"
-            CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="39.017329"
-            traveltime="9.65" CO_perVeh="0" CO2_perVeh="0" HC_perVeh="0" PMx_perVeh="0" NOx_perVeh="0" fuel_perVeh="0" electricity_perVeh="47.948337"/>
+        <edge id="38to167" sampledSeconds="9.66" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="47.328541"
+            CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="36.570277"
+            traveltime="9.66" CO_perVeh="0" CO2_perVeh="0" HC_perVeh="0" PMx_perVeh="0" NOx_perVeh="0" fuel_perVeh="0" electricity_perVeh="47.328541"/>
         <edge id="39to33" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
         <edge id="39to40" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
@@ -707,9 +711,9 @@ SPDX-License-Identifier: EPL-2.0
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
         <edge id="75to39" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
-        <edge id="76to16" sampledSeconds="18.89" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="138.532999"
-            CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="33.858386"
-            traveltime="18.58" CO_perVeh="0" CO2_perVeh="0" HC_perVeh="0" PMx_perVeh="0" NOx_perVeh="0" fuel_perVeh="0" electricity_perVeh="136.243702"/>
+        <edge id="76to16" sampledSeconds="18.38" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="146.099671"
+            CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="35.707732"
+            traveltime="18.38" CO_perVeh="0" CO2_perVeh="0" HC_perVeh="0" PMx_perVeh="0" NOx_perVeh="0" fuel_perVeh="0" electricity_perVeh="146.099671"/>
         <edge id="77to4" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"
             CO_normed="0" CO2_normed="0" HC_normed="0" PMx_normed="0" NOx_normed="0" fuel_normed="0" electricity_normed="0"/>
         <edge id="79to6" sampledSeconds="0.00" CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="0"

diff --git a/tests/sumo/output/emission-idling/detector2.sumo b/tests/sumo/output/emission-idling/detector2.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-06-15 13:02:24 by Eclipse SUMO sumo Version v1_13_0+0844-22f88dc7bc3
+<!-- generated on 2024-01-23 07:35:44 by Eclipse SUMO sumo Version v1_19_0+0653-474bc5e6c94
 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,16 +41,16 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </report>
 
     <emissions>
-        <device.emissions.probability value="1"/>
+        <device.emissions.probability value="1.0"/>
     </emissions>
 
 </configuration>
 -->
 
 <meandata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/meandata_file.xsd">
     <interval begin="0.00" end="150.00" id="ld1">
-        <edge id="E0" sampledSeconds="151.75" CO_abs="41.813037" CO2_abs="297570.585344" HC_abs="15.310453" PMx_abs="29.049467" NOx_abs="1227.832315" fuel_abs="94169.138405" electricity_abs="0"
-            CO_normed="5.017564" CO2_normed="35708.470241" HC_normed="1.837254" PMx_normed="3.485936" NOx_normed="147.339878" fuel_normed="11300.296609" electricity_normed="0"
-            traveltime="76.24" CO_perVeh="21.007120" CO2_perVeh="149501.242314" HC_perVeh="7.692063" PMx_perVeh="14.594626" NOx_perVeh="616.870301" fuel_perVeh="47311.138508" electricity_perVeh="0"/>
+        <edge id="E0" sampledSeconds="151.11" CO_abs="41.545458" CO2_abs="295973.186275" HC_abs="15.207581" PMx_abs="28.875711" NOx_abs="1223.650507" fuel_abs="93663.583569" electricity_abs="0"
+            CO_normed="4.985455" CO2_normed="35516.782353" HC_normed="1.824910" PMx_normed="3.465085" NOx_normed="146.838061" fuel_normed="11239.630028" electricity_normed="0"
+            traveltime="77.53" CO_perVeh="21.316785" CO2_perVeh="151862.490589" HC_perVeh="7.802940" PMx_perVeh="14.815995" NOx_perVeh="627.849489" fuel_perVeh="48058.357101" electricity_perVeh="0"/>
     </interval>
 </meandata>
diff --git a/tests/sumo/output/emission-idling/detector3.sumo b/tests/sumo/output/emission-idling/detector3.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-06-15 13:02:24 by Eclipse SUMO sumo Version v1_13_0+0844-22f88dc7bc3
+<!-- generated on 2024-01-23 07:35:44 by Eclipse SUMO sumo Version v1_19_0+0653-474bc5e6c94
 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,7 +41,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </report>
 
     <emissions>
-        <device.emissions.probability value="1"/>
+        <device.emissions.probability value="1.0"/>
     </emissions>
 
 </configuration>
@@ -50,9 +50,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <meandata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/meandata_file.xsd">
     <interval begin="0.00" end="150.00" id="ld1">
         <edge id="E0">
-            <lane id="E0_0" sampledSeconds="151.75" CO_abs="41.813037" CO2_abs="297570.585344" HC_abs="15.310453" PMx_abs="29.049467" NOx_abs="1227.832315" fuel_abs="94169.138405" electricity_abs="0"
-            CO_normed="5.017564" CO2_normed="35708.470241" HC_normed="1.837254" PMx_normed="3.485936" NOx_normed="147.339878" fuel_normed="11300.296609" electricity_normed="0"
-            traveltime="76.24" CO_perVeh="21.007120" CO2_perVeh="149501.242314" HC_perVeh="7.692063" PMx_perVeh="14.594626" NOx_perVeh="616.870301" fuel_perVeh="47311.138508" electricity_perVeh="0"/>
+            <lane id="E0_0" sampledSeconds="151.11" CO_abs="41.545458" CO2_abs="295973.186275" HC_abs="15.207581" PMx_abs="28.875711" NOx_abs="1223.650507" fuel_abs="93663.583569" electricity_abs="0"
+            CO_normed="4.985455" CO2_normed="35516.782353" HC_normed="1.824910" PMx_normed="3.465085" NOx_normed="146.838061" fuel_normed="11239.630028" electricity_normed="0"
+            traveltime="77.53" CO_perVeh="21.316785" CO2_perVeh="151862.490589" HC_perVeh="7.802940" PMx_perVeh="14.815995" NOx_perVeh="627.849489" fuel_perVeh="48058.357101" electricity_perVeh="0"/>
         </edge>
     </interval>
 </meandata>