patching meso results refs #21

eclipse-sumo · Nov 28, 2024 · a747a55 · a747a55
1 parent 8072d31
commit a747a55
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 26 deletions.
diff --git a/tests/sumo/devices/battery/half_equipped/tripinfos.sumo.meso b/tests/sumo/devices/battery/half_equipped/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-26 14:42:55 by Eclipse SUMO sumo Version v1_20_0+2163-b3a702dda2d
+<!-- generated on 2024-11-28 11:52:51 by Eclipse SUMO sumo Version v1_21_0+1016-6ec0787118a
 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,18 +48,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <tripinfo id="flow.0" depart="0.00" departLane="beg_0" departPos="0.00" departSpeed="39.59" departDelay="0.00" arrival="27.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="39.59" duration="27.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.0" vType="PKW" speedFactor="1.10" vaporized=""/>
     <tripinfo id="flow.1" depart="1.00" departLane="beg_0" departPos="0.00" departSpeed="37.41" departDelay="0.00" arrival="30.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="37.41" duration="29.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.1" vType="PKW" speedFactor="1.04" vaporized=""/>
     <tripinfo id="flow.2" depart="2.00" departLane="beg_0" departPos="0.00" departSpeed="38.70" departDelay="0.00" arrival="30.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="37.42" duration="28.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.39" rerouteNo="0" devices="tripinfo_flow.2 battery_flow.2" vType="PKW" speedFactor="1.08" vaporized="">
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="10000.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.3" depart="3.00" departLane="beg_0" departPos="0.00" departSpeed="40.00" departDelay="0.00" arrival="31.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="37.42" duration="28.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.72" rerouteNo="0" devices="tripinfo_flow.3 battery_flow.3" vType="PKW" speedFactor="1.11" vaporized="">
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="10000.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.4" depart="4.00" departLane="beg_0" departPos="0.00" departSpeed="39.06" departDelay="0.00" arrival="32.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="39.06" duration="28.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.4" vType="PKW" speedFactor="1.09" vaporized=""/>
     <tripinfo id="flow.5" depart="5.00" departLane="beg_0" departPos="0.00" departSpeed="35.48" departDelay="0.00" arrival="35.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="35.48" duration="30.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.5 battery_flow.5" vType="PKW" speedFactor="0.99" vaporized="">
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="10000.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.6" depart="6.00" departLane="beg_0" departPos="0.00" departSpeed="39.34" departDelay="0.00" arrival="36.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="35.48" duration="30.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.39" rerouteNo="0" devices="tripinfo_flow.6" vType="PKW" speedFactor="1.09" vaporized=""/>
     <tripinfo id="flow.7" depart="7.00" departLane="beg_0" departPos="0.00" departSpeed="36.47" departDelay="0.00" arrival="37.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="36.47" duration="30.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.7 battery_flow.7" vType="PKW" speedFactor="1.01" vaporized="">
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="10000.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.8" depart="8.00" departLane="beg_0" departPos="0.00" departSpeed="37.40" departDelay="0.00" arrival="37.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="36.47" duration="29.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.17" rerouteNo="0" devices="tripinfo_flow.8" vType="PKW" speedFactor="1.04" vaporized=""/>
     <tripinfo id="flow.9" depart="9.00" departLane="beg_0" departPos="0.00" departSpeed="35.94" departDelay="0.00" arrival="39.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="35.94" duration="30.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.9" vType="PKW" speedFactor="1.00" vaporized=""/>

diff --git a/tests/sumo/devices/battery/recuperateByDecel/tripinfos.sumo.meso b/tests/sumo/devices/battery/recuperateByDecel/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-26 14:42:55 by Eclipse SUMO sumo Version v1_20_0+2163-b3a702dda2d
+<!-- generated on 2024-11-28 11:52:51 by Eclipse SUMO sumo Version v1_21_0+1016-6ec0787118a
 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
@@ -52,42 +52,42 @@ 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">
     <tripinfo id="flow.0" depart="0.00" departLane="beg_0" departPos="0.00" departSpeed="40.32" departDelay="0.00" arrival="27.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="40.32" duration="27.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.0 emissions_flow.0 battery_flow.0" vType="PKW" speedFactor="1.12" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="323.199961"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.1" depart="1.00" departLane="beg_0" departPos="0.00" departSpeed="31.55" departDelay="0.00" arrival="35.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="31.55" duration="34.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.1 emissions_flow.1 battery_flow.1" vType="PKW" speedFactor="0.88" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="219.388005"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.2" depart="2.00" departLane="beg_0" departPos="0.00" departSpeed="36.75" departDelay="0.00" arrival="36.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="31.55" duration="34.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="4.20" rerouteNo="0" devices="tripinfo_flow.2 emissions_flow.2 battery_flow.2" vType="PKW" speedFactor="1.02" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="226.017578"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.3" depart="3.00" departLane="beg_0" departPos="0.00" departSpeed="41.67" departDelay="0.00" arrival="36.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="31.55" duration="33.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="7.06" rerouteNo="0" devices="tripinfo_flow.3 emissions_flow.3 battery_flow.3" vType="PKW" speedFactor="1.17" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="234.955600"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.4" depart="4.00" departLane="beg_0" departPos="0.00" departSpeed="38.18" departDelay="0.00" arrival="37.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="31.55" duration="33.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="4.17" rerouteNo="0" devices="tripinfo_flow.4 emissions_flow.4 battery_flow.4" vType="PKW" speedFactor="1.06" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="241.018818"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.5" depart="5.00" departLane="beg_0" departPos="0.00" departSpeed="23.83" departDelay="0.00" arrival="50.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="23.83" duration="45.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_flow.5 emissions_flow.5 battery_flow.5" vType="PKW" speedFactor="0.66" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="149.118814"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.6" depart="6.00" departLane="beg_0" departPos="0.00" departSpeed="27.65" departDelay="0.00" arrival="51.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="23.83" duration="45.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="17.00" rerouteNo="0" devices="tripinfo_flow.6 emissions_flow.6 battery_flow.6" vType="PKW" speedFactor="1.09" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="152.053774"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.7" depart="7.00" departLane="beg_0" departPos="0.00" departSpeed="27.79" departDelay="0.00" arrival="51.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="23.83" duration="44.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="5.24" rerouteNo="0" devices="tripinfo_flow.7 emissions_flow.7 battery_flow.7" vType="PKW" speedFactor="0.77" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="154.990560"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.8" depart="8.00" departLane="beg_0" departPos="0.00" departSpeed="31.53" departDelay="0.00" arrival="51.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="23.83" duration="43.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.21" rerouteNo="0" devices="tripinfo_flow.8 emissions_flow.8 battery_flow.8" vType="PKW" speedFactor="0.88" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="159.322595"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
     <tripinfo id="flow.9" depart="9.00" departLane="beg_0" departPos="0.00" departSpeed="25.70" departDelay="0.00" arrival="52.00" arrivalLane="beg_0" arrivalPos="1000.00" arrivalSpeed="23.83" duration="43.00" routeLength="1000.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.99" rerouteNo="0" devices="tripinfo_flow.9 emissions_flow.9 battery_flow.9" vType="PKW" speedFactor="0.71" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="159.569920"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="17500.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
 </tripinfos>
diff --git a/tests/sumo/devices/battery/tripinfo_emission/tripinfos.sumo.meso b/tests/sumo/devices/battery/tripinfo_emission/tripinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-26 14:42:55 by Eclipse SUMO sumo Version v1_20_0+2163-b3a702dda2d
+<!-- generated on 2024-11-28 11:52:51 by Eclipse SUMO sumo Version v1_21_0+1016-6ec0787118a
 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
@@ -56,6 +56,6 @@ 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">
     <tripinfo id="vehWithCustDepartEnergy" depart="0.00" departLane="76to16_0" departPos="0.00" departSpeed="15.28" departDelay="0.00" arrival="49.00" arrivalLane="38to167_0" arrivalPos="84.71" arrivalSpeed="9.16" duration="49.00" routeLength="552.87" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="0.00" rerouteNo="0" devices="tripinfo_vehWithCustDepartEnergy emissions_vehWithCustDepartEnergy battery_vehWithCustDepartEnergy" vType="PKW" speedFactor="1.10" vaporized="">
         <emissions CO_abs="0" CO2_abs="0" HC_abs="0" PMx_abs="0" NOx_abs="0" fuel_abs="0" electricity_abs="315.006212"/>
-        <battery depleted="0"/>
+        <battery depleted="0" actualBatteryCapacity="10000.00" totalEnergyConsumed="0.00" totalEnergyRegenerated="0.00"/>
     </tripinfo>
 </tripinfos>
diff --git a/tests/sumo/rail/portion_working/join_front_signal/railsignalblocks.sumo.meso b/tests/sumo/rail/portion_working/join_front_signal/railsignalblocks.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-11-01 10:31:59 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
+<!-- generated on 2024-11-28 11:52:51 by Eclipse SUMO sumo Version v1_21_0+1016-6ec0787118a
 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
@@ -53,18 +53,24 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=""/>
                 <flank lanes=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="gneJ6.0"/>
+                <foes driveWays="gneJ0.d0.0 gneJ6.0"/>
             </driveWay>
+            <subDriveWay id="gneJ6.0.0" vehicle="" edges="d2 b">
+                <forward lanes="d2_0 b_0"/>
+            </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="gneJ0">
         <driveWay id="gneJ0.d0" vehicle="t0" edges="a b">
             <forward lanes="a_0 b_0"/>
             <bidi lanes=""/>
             <flank lanes=""/>
-            <conflictLinks signals=""/>
-            <foes driveWays="gneJ0.d0"/>
+            <conflictLinks signals="gneJ6_0"/>
+            <foes driveWays="gneJ0.d0 gneJ6.0.0"/>
         </driveWay>
+        <subDriveWay id="gneJ0.d0.0" vehicle="" edges="a">
+            <forward lanes="a_0"/>
+        </subDriveWay>
     </departJunction>
     <departJunction id="gneJ4">
         <driveWay id="gneJ4.d0" vehicle="t1" edges="d">

diff --git a/tests/sumo/rail/portion_working/join_signal/railsignalblocks.sumo.meso b/tests/sumo/rail/portion_working/join_signal/railsignalblocks.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-11-01 10:31:59 by Eclipse SUMO sumo Version v1_21_0+0544-8c77a935d25
+<!-- generated on 2024-11-28 11:52:51 by Eclipse SUMO sumo Version v1_21_0+1016-6ec0787118a
 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
@@ -53,18 +53,24 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
                 <bidi lanes=""/>
                 <flank lanes=""/>
                 <conflictLinks signals=""/>
-                <foes driveWays="gneJ6.0"/>
+                <foes driveWays="gneJ0.d0.0 gneJ6.0"/>
             </driveWay>
+            <subDriveWay id="gneJ6.0.0" vehicle="" edges="d2">
+                <forward lanes="d2_0"/>
+            </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="gneJ0">
         <driveWay id="gneJ0.d0" vehicle="t0" edges="a b c">
             <forward lanes="a_0 b_0 c_0"/>
             <bidi lanes=""/>
             <flank lanes=""/>
-            <conflictLinks signals=""/>
-            <foes driveWays="gneJ0.d0"/>
+            <conflictLinks signals="gneJ6_0"/>
+            <foes driveWays="gneJ0.d0 gneJ6.0.0"/>
         </driveWay>
+        <subDriveWay id="gneJ0.d0.0" vehicle="" edges="a b">
+            <forward lanes="a_0 b_0"/>
+        </subDriveWay>
     </departJunction>
     <departJunction id="gneJ4">
         <driveWay id="gneJ4.d0" vehicle="t1" edges="d">