From 656749ab19a7423075b3ff89e98a86f62ded946c Mon Sep 17 00:00:00 2001 From: Florian Bezannier Date: Mon, 2 Jan 2023 20:33:23 +0100 Subject: [PATCH] fix: division by zero #437 --- .../psacc/application/battery_charge_curve.py | 2 +- tests/test_BatteryChargeCurve.py | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/test_BatteryChargeCurve.py diff --git a/psa_car_controller/psacc/application/battery_charge_curve.py b/psa_car_controller/psacc/application/battery_charge_curve.py index 5037e6a..bee0cf5 100644 --- a/psa_car_controller/psacc/application/battery_charge_curve.py +++ b/psa_car_controller/psacc/application/battery_charge_curve.py @@ -21,7 +21,7 @@ class BatteryChargeCurve: conn = Database.get_db() conn.close() battery_curves = [] - if len(battery_curves_dto) > 0: + if len(battery_curves_dto) > 0 and battery_curves_dto[-1].level > 0: battery_capacity = battery_curves_dto[-1].level * car.battery_power / 100 km_by_kw = 0.8 * battery_curves_dto[-1].autonomy / battery_capacity start = 0 diff --git a/tests/test_BatteryChargeCurve.py b/tests/test_BatteryChargeCurve.py new file mode 100644 index 0000000..52bf3b3 --- /dev/null +++ b/tests/test_BatteryChargeCurve.py @@ -0,0 +1,30 @@ +import unittest + +from psa_car_controller.psacc.application.battery_charge_curve import BatteryChargeCurve +from psa_car_controller.psacc.model.battery_curve import BatteryCurveDto +from psa_car_controller.psacc.model.car import Car +from psa_car_controller.psacc.model.charge import Charge +from tests.utils import date0, date1, date2 + +vin1 = "VRAAAAAAA" +car1 = Car(vin1, "1sdfdksnfk222", "Peugeot", "208", 46, 0) + + +class TestBatteryChargeCurve(unittest.TestCase): + + def test_battery_curve_dto(self): + battery_curve = [BatteryCurveDto(date0, 0, 20, 60), + BatteryCurveDto(date1, 60, 20, 100), + BatteryCurveDto(date2, 80, 20, 120)] + charge = Charge(date0, date2, vin1, 0, 80) + res = [point.speed for point in BatteryChargeCurve.dto_to_battery_curve(car1, charge, battery_curve)] + self.assertEqual([32.5, 14.5, 0], res) + + def test_battery_curve_dto_zero(self): + battery_curve = [BatteryCurveDto(date0, 0, 20, 0)] + level_at_end = 80 + charge = Charge(date0, date2, vin1, 0, level_at_end) + res = BatteryChargeCurve.dto_to_battery_curve(car1, charge, battery_curve) + self.assertEqual(0, res[0].level) + self.assertEqual(level_at_end, res[1].level) + self.assertAlmostEqual(55.19, res[1].speed, places=1)