Skip to content

Commit

Permalink
adapting tests to new mass handling #21 #13056 #14285
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Feb 6, 2024
1 parent 27e83b7 commit 4d088d1
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 52 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Warning: The vType 'trolleybus' has a 'vehicleMass' parameter, which is deprecated. Please use the 'mass' attribute (for the empty mass) and the 'loading' parameter, if needed.
27 changes: 19 additions & 8 deletions tests/complex/traci/vehicle/vehicle/errors.complex
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
Warning: New value of emergencyDecel (3.00) is lower than decel (4.50)
Warning: Automatically setting emergencyDecel to 5.10 for vType 'DEFAULT_VEHTYPE@horiz' to match decel.
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:196: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:202: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
traci.vehicle.setAdaptedTraveltime(vehID, 0, 1000, "1o", 55)
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:197: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:203: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
traci.vehicle.setEffort(vehID, 0, 1000, "1o", 54)
Error: Answered with error to command 0xa4: Vehicle 'bla' is not known.
Warning: No connection between edge '2fi' and edge 'disconnected' found.
Warning: No route for vehicle '1' found.
Error: Answered with error to command 0xc4: Route replacement failed for vehicle '1' (No route found).
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:246: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:282: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
Warning: Vehicle '1' aborts stop.
Error: Answered with error to command 0xa4: Vehicle 'anotherOne' is not known.
Warning: Departure time for vehicle 'departInThePast' is in the past; using current time instead.
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:379: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(parkingVeh))
Warning: Vehicle 'parking2' aborts stop.
Warning: Teleporting vehicle 'collider'; collision with vehicle 'blocker', lane='2fi_0', gap=-3.74, time=117.00 stage=events.
Warning: Vehicle 'collider' ends teleporting on edge '2si', time=117.00.
Warning: No connection between edge '3fi' and edge 'disconnected' found.
Warning: No route for vehicle 'failVeh' found.
Warning: Setting the vehicle mass via parameters is deprecated, please use setMass for the vehicle or its type.
Error: Answered with error to command 0xa4: Vehicle 'elVeh' does not support device parameter 'device.foo.bar' (No device of type 'foo' exists).
Error: Answered with error to command 0xa4: Vehicle 'elVeh' does not support device parameter 'device.battery.foobar' (Parameter 'foobar' is not supported for device of type 'battery').
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:240: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:274: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:363: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(parkingVeh))
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
27 changes: 19 additions & 8 deletions tests/complex/traci/vehicle/vehicle_sublane/errors.complex
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
Warning: New value of emergencyDecel (3.00) is lower than decel (4.50)
Warning: Automatically setting emergencyDecel to 5.10 for vType 'DEFAULT_VEHTYPE@horiz' to match decel.
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:196: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:202: UserWarning: Parameter order has changed for setAdaptedTraveltime(). Attempting legacy ordering. Please update your code.
traci.vehicle.setAdaptedTraveltime(vehID, 0, 1000, "1o", 55)
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:197: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:203: UserWarning: Parameter order has changed for setEffort(). Attempting legacy ordering. Please update your code.
traci.vehicle.setEffort(vehID, 0, 1000, "1o", 54)
Error: Answered with error to command 0xa4: Vehicle 'bla' is not known.
Warning: No connection between edge '2fi' and edge 'disconnected' found.
Warning: No route for vehicle '1' found.
Error: Answered with error to command 0xc4: Route replacement failed for vehicle '1' (No route found).
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:246: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:282: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
Warning: Vehicle '1' aborts stop.
Error: Answered with error to command 0xa4: Vehicle 'anotherOne' is not known.
Warning: Departure time for vehicle 'departInThePast' is in the past; using current time instead.
/home/behr_mi/sumo/tests/../tests/complex/traci/vehicle/vehicle/runner.py:379: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(parkingVeh))
Warning: Vehicle 'parking2' aborts stop.
Warning: Teleporting vehicle 'collider'; collision with vehicle 'blocker', lane='2fi_0', gap=-3.74', latGap=-1.80, time=117.00 stage=events.
Warning: Vehicle 'collider' ends teleporting on edge '2si', time=117.00.
Warning: No connection between edge '3fi' and edge 'disconnected' found.
Warning: No route for vehicle 'failVeh' found.
Warning: Setting the vehicle mass via parameters is deprecated, please use setMass for the vehicle or its type.
Error: Answered with error to command 0xa4: Vehicle 'elVeh' does not support device parameter 'device.foo.bar' (No device of type 'foo' exists).
Error: Answered with error to command 0xa4: Vehicle 'elVeh' does not support device parameter 'device.battery.foobar' (Parameter 'foobar' is not supported for device of type 'battery').
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:240: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:274: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(vehID))
C:\Users\behr_mi\Projekte\sumo\repos\sumo\tests\..\tests/complex/traci/vehicle/vehicle/runner.py:363: UserWarning: Call to deprecated function getNextStops.
print("legacy getNextStops", traci.vehicle.getNextStops(parkingVeh))
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
Warning: Getting the vehicle mass via parameters is deprecated, please use getMass for the vehicle or its type.
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
3 changes: 1 addition & 2 deletions tests/sumo/devices/battery/braunschweig/input_routes.rou.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<routes>
<vType accel="2.6" decel="4.5" id="PKW" impatience="0.05" length="4.5" maxSpeed="41.667" minGap="2.5" sigma="0.5" speedDev="0.05" speedFactor="1.07" tau="1" vClass="private">
<vType accel="2.6" decel="4.5" id="PKW" impatience="0.05" length="4.5" maxSpeed="41.667" minGap="2.5" sigma="0.5" speedDev="0.05" speedFactor="1.07" tau="1" vClass="private" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
-->

<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand All @@ -14,10 +13,9 @@
<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">
<vType accel="1.0" decel="5.0" id="ElectricVehicle2" length="5" maxSpeed="40.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand All @@ -14,10 +13,9 @@
<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">
<vType accel="1.0" decel="5.0" id="ElectricVehicle2" length="5" maxSpeed="40.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<routes>
<vType accel="2.6" decel="4.5" id="PKW" impatience="0.05" length="4.5" maxSpeed="41.667" minGap="2.5" sigma="0.5" speedDev="0.05" speedFactor="1.07" tau="1" vClass="private">
<vType accel="2.6" decel="4.5" id="PKW" impatience="0.05" length="4.5" maxSpeed="41.667" minGap="2.5" sigma="0.5" speedDev="0.05" speedFactor="1.07" tau="1" vClass="private" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
3 changes: 1 addition & 2 deletions tests/sumo/devices/battery/trackFuel/input_routes.rou.xml
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
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="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" emissionClass="Energy">
<vType accel="1.0" decel="5.0" id="ElectricVehicle" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" emissionClass="Energy" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<routes>
<!-- truck gets emissionClass HDV by default -->
<vType accel="1.0" decel="5.0" id="truck" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" vClass="truck">
<vType accel="1.0" decel="5.0" id="truck" length="12" maxSpeed="100.0" sigma="0.0" minGap="2.5" color="1,1,1" vClass="truck" mass="1600">
<param key="device.battery.capacity" value="35000"/>
<param key="device.battery.maxPower" value="100000"/>
<param key="vehicleMass" value="1600"/>
<param key="internalMomentOfInertia" value="30"/>
<param key="frontSurfaceArea" value="2.2"/>
<param key="airDragCoefficient" value="0.33"/>
Expand Down

0 comments on commit 4d088d1

Please sign in to comment.