Skip to content

Commit

Permalink
update tests ref #21 #9663
Browse files Browse the repository at this point in the history 
Signed-off-by: m-kro <m.barthauer@t-online.de>
  • Loading branch information
@m-kro
m-kro committed Apr 16, 2024
1 parent 2a1bc6e commit 6b90f7c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 35 deletions.
2 changes: 0 additions & 2 deletions tests/sumo/devices/stationfinder/charging/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
Warning: The vType 'ElectricVehicle1' has a 'vehicleMass' parameter, which is deprecated. Please use the 'mass' attribute (for the empty mass) and the 'loading' parameter, if needed.
Warning: The battery device is active for vehicle 'veh0' but no emission class is set. Please consider setting an explicit emission class or battery outputs might be inconsistent with emission outputs!
3 changes: 1 addition & 2 deletions tests/sumo/devices/stationfinder/charging/input_routes.rou.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<routes>
<vType accel="1.0" decel="5.0" id="ElectricVehicle1" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle1" emissionClass="Energy" mass="1600" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="rotatingMass" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
5 changes: 0 additions & 5 deletions tests/sumo/devices/stationfinder/searching/errors.sumo
View file
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
Warning: The vType 'ElectricVehicle1' has a 'vehicleMass' parameter, which is deprecated. Please use the 'mass' attribute (for the empty mass) and the 'loading' parameter, if needed.
Warning: The vType 'ElectricVehicle2' has a 'vehicleMass' parameter, which is deprecated. Please use the 'mass' attribute (for the empty mass) and the 'loading' parameter, if needed.
Warning: The battery device is active for vehicle 'veh0' but no emission class is set. Please consider setting an explicit emission class or battery outputs might be inconsistent with emission outputs!
Warning: The battery device is active for vehicle 'veh1' but no emission class is set. Please consider setting an explicit emission class or battery outputs might be inconsistent with emission outputs!
Warning: The battery device is active for vehicle 'veh2' but no emission class is set. Please consider setting an explicit emission class or battery outputs might be inconsistent with emission outputs!
50 changes: 24 additions & 26 deletions tests/sumo/devices/stationfinder/searching/input_routes.rou.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,31 @@

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<!-- VTypes -->
<vType accel="1.0" decel="5.0" id="ElectricVehicle1" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="rotatingMass" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
<param key="radialDragCoefficient" value="0"/>
<param key="rollDragCoefficient" value="0.1"/>
<param key="constantPowerIntake" value="40"/>
<param key="propulsionEfficiency" value="0.8"/>
<param key="recuperationEfficiency" value="0.8"/>
</vType>
<vType accel="1.0" decel="5.0" id="ElectricVehicle1" emissionClass="Energy" mass="1600" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="rotatingMass" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
<param key="radialDragCoefficient" value="0"/>
<param key="rollDragCoefficient" value="0.1"/>
<param key="constantPowerIntake" value="40"/>
<param key="propulsionEfficiency" value="0.8"/>
<param key="recuperationEfficiency" value="0.8"/>
</vType>

<vType accel="1.0" decel="5.0" id="ElectricVehicle2" length="5" maxSpeed="40.0" sigma="0.0" minGap="2.5" color="1,1,1">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="rotatingMass" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
<param key="radialDragCoefficient" value="0"/>
<param key="rollDragCoefficient" value="0.1"/>
<param key="constantPowerIntake" value="40"/>
<param key="propulsionEfficiency" value="0.8"/>
<param key="recuperationEfficiency" value="0.8"/>
</vType>
<vType accel="1.0" decel="5.0" id="ElectricVehicle2" emissionClass="Energy" mass="1600" length="5" maxSpeed="40.0" sigma="0.0" minGap="2.5" color="1,1,1">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="rotatingMass" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
<param key="radialDragCoefficient" value="0"/>
<param key="rollDragCoefficient" value="0.1"/>
<param key="constantPowerIntake" value="40"/>
<param key="propulsionEfficiency" value="0.8"/>
<param key="recuperationEfficiency" value="0.8"/>
</vType>

<!-- Vehicles, persons and containers (sorted by depart) -->
<vehicle id="veh0" type="ElectricVehicle1" depart="0.00" arrival="346.00">
Expand Down

0 comments on commit 6b90f7c

Please sign in to comment.