patching expected meso results refs #21

eclipse-sumo · Apr 29, 2024 · ea36e0f · ea36e0f
1 parent e5b7843
commit ea36e0f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/tests/sumo/devices/elechybrid/elechybrid_2/elechybrid_out_test1.sumo.meso b/tests/sumo/devices/elechybrid/elechybrid_2/elechybrid_out_test1.sumo.meso
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-11-23 10:34:22 by Eclipse SUMO sumo Version v1_11_0+0005-a0af71f
+<!-- generated on 2024-04-29 21:03:49 by Eclipse SUMO sumo Version v1_19_0+1989-e5b78432182
 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>
@@ -34,20 +39,14 @@ SPDX-License-Identifier: EPL-2.0
         <ignore-route-errors value="true"/>
         <default.speeddev value="0"/>
         <overhead-wire.solver value="true"/>
-        <pedestrian.model value="nonInteracting"/>
     </processing>
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
 
-    <battery>
-        <device.battery.explicit value="test1"/>
-    </battery>
-
     <elechybrid_device>
         <device.elechybrid.explicit value="test1,test2"/>
     </elechybrid_device>
@@ -60,11 +59,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <elecHybrid-export vehicle="test1" maximumBatteryCapacity="46000.00" recuperationEnabled="1">
-    <timestep time="0.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8900" acceleration="0.0000" distance="nan" x="-1.4500" y="46.3800" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="1.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8900" acceleration="0.0000" distance="nan" x="-1.4500" y="46.3800" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="2.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8900" acceleration="0.0000" distance="nan" x="-1.4500" y="46.3800" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="3.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8880" acceleration="0.0000" distance="nan" x="39.2000" y="46.0200" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="4.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8880" acceleration="0.0000" distance="nan" x="39.2000" y="46.0200" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="5.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8889" acceleration="0.0000" distance="nan" x="72.7800" y="41.4900" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="6.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8889" acceleration="0.0000" distance="nan" x="72.7800" y="41.4900" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="0.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8900" acceleration="0.0000" distance="0.0000" x="-1.4500" y="46.3800" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="1.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8900" acceleration="0.0000" distance="0.0000" x="-1.4500" y="46.3800" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="2.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8900" acceleration="0.0000" distance="0.0000" x="-1.4500" y="46.3800" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="3.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8880" acceleration="0.0000" distance="40.4200" x="39.2000" y="46.0200" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="4.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8880" acceleration="0.0000" distance="40.4200" x="39.2000" y="46.0200" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="5.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8889" acceleration="0.0000" distance="67.9600" x="72.7800" y="41.4900" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="6.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8889" acceleration="0.0000" distance="67.9600" x="72.7800" y="41.4900" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
 </elecHybrid-export>
diff --git a/tests/sumo/devices/elechybrid/elechybrid_2/elechybrid_out_test2.sumo.meso b/tests/sumo/devices/elechybrid/elechybrid_2/elechybrid_out_test2.sumo.meso
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2021-11-23 10:34:22 by Eclipse SUMO sumo Version v1_11_0+0005-a0af71f
+<!-- generated on 2024-04-29 21:03:49 by Eclipse SUMO sumo Version v1_19_0+1989-e5b78432182
 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>
@@ -34,20 +39,14 @@ SPDX-License-Identifier: EPL-2.0
         <ignore-route-errors value="true"/>
         <default.speeddev value="0"/>
         <overhead-wire.solver value="true"/>
-        <pedestrian.model value="nonInteracting"/>
     </processing>
 
     <report>
         <xml-validation value="never"/>
-        <xml-validation.routes value="never"/>
         <duration-log.disable value="true"/>
         <no-step-log value="true"/>
     </report>
 
-    <battery>
-        <device.battery.explicit value="test1"/>
-    </battery>
-
     <elechybrid_device>
         <device.elechybrid.explicit value="test1,test2"/>
     </elechybrid_device>
@@ -60,7 +59,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <elecHybrid-export vehicle="test2" maximumBatteryCapacity="46000.00" recuperationEnabled="1">
-    <timestep time="0.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8868" acceleration="0.0000" distance="nan" x="36.1600" y="33.7600" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="1.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8868" acceleration="0.0000" distance="nan" x="36.1600" y="33.7600" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
-    <timestep time="2.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8864" acceleration="0.0000" distance="nan" x="47.1100" y="-4.8900" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="0.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8868" acceleration="0.0000" distance="0.0000" x="36.1600" y="33.7600" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="1.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8868" acceleration="0.0000" distance="0.0000" x="36.1600" y="33.7600" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
+    <timestep time="2.00" actualBatteryCapacity="23000.0000" energyConsumed="0.0000" energyCharged="0.0000" power="nan" overheadWireId="" tractionSubstationId="" current="nan" circuitVoltage="nan" alphaCircuitSolver="nan" speed="13.8864" acceleration="0.0000" distance="26.0600" x="47.1100" y="-4.8900" z="0.0000" slope="0.0000" posOnLane="0.0000"/>
 </elecHybrid-export>
diff --git a/tests/sumo/output/vehroutes/transportable/walk_departPos_random/errors.sumo.meso b/tests/sumo/output/vehroutes/transportable/walk_departPos_random/errors.sumo.meso