From 9f152d93363be269e0f071303d8217b53b78af98 Mon Sep 17 00:00:00 2001 From: Marco BRENTINI Date: Thu, 7 Oct 2021 13:30:52 +0200 Subject: [PATCH 1/2] Update car_model.py Add Peugeot 3008 Hybrid 225 (and correct battery capacity) --- libs/car_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/car_model.py b/libs/car_model.py index 0deb4c3..5a29c1d 100644 --- a/libs/car_model.py +++ b/libs/car_model.py @@ -60,7 +60,7 @@ car_models = [ ElecModel("Mokka-e", 46, "opel:mokkae:20:48", r"VXKUKZKX.*"), # VXKUKZKXZM ElecModel("Zaphira-e", 68, "peugeot:etraveler:21:75:opel", r"VXEVZZKX.*"), # VXEVZZKXZMZ ElecModel("E-C4", 46, "citroen:ec4:21:50", r"VR7BCZKX.*"), # VR7BCZKXCM - CarModel("SUV 3008", 10.8, 43), + CarModel("SUV 3008 Hybrid 225", 13.2, 43, reg=r"VF3M4DGZ.*"), #VF3M4DGZUMS CarModel("308", 0, 56, reg=r"VF3L35GG.*"), CarModel("208", 0, 44, reg=r"VR3UPHN[SE].*"), # VR3UPHNSSM VR3UPHNEKM CarModel("2008", 0, 44, reg=r"VR3USHNS.*"), # VR3USHNSKM From c8486bf75dbe1e95589991d79f1c303cdd644fdf Mon Sep 17 00:00:00 2001 From: Florian Bezannier Date: Thu, 14 Oct 2021 22:12:56 +0200 Subject: [PATCH 2/2] fix unit test --- test/test_unit.py | 8 ++++---- test/utils.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test_unit.py b/test/test_unit.py index 342e4f2..c7f6e2b 100644 --- a/test/test_unit.py +++ b/test/test_unit.py @@ -198,7 +198,7 @@ class TestUnit(unittest.TestCase): Database.record_position(None, car.vin, 30, latitude, longitude, 22, date2, 30, 28, False) trips = Trips.get_trips(self.vehicule_list) res = trips[car.vin].get_trips_as_dict() - assert compare_dict(res, [{'consumption_km': 5.684210526315789, + assert compare_dict(res, [{'consumption_km': 6.947368421052632, 'start_at': date0, 'consumption_by_temp': None, 'positions': {'lat': [latitude], @@ -209,7 +209,7 @@ class TestUnit(unittest.TestCase): 'mileage': 30.0, 'altitude_diff': 0, 'id': 1, - 'consumption': 1.08, + 'consumption': 1.32, 'consumption_fuel_km': 10.53}]) def test_none_mileage(self): @@ -227,7 +227,7 @@ class TestUnit(unittest.TestCase): trips = Trips.get_trips(self.vehicule_list) res = trips[car.vin].get_trips_as_dict() print(res) - assert compare_dict(res, [{'consumption_km': 5.684210526315789, + assert compare_dict(res, [{'consumption_km': 6.947368421052632, 'start_at': start, 'consumption_by_temp': None, 'positions': {'lat': [latitude], @@ -238,7 +238,7 @@ class TestUnit(unittest.TestCase): 'mileage': 30.0, 'altitude_diff': 0, 'id': 1, - 'consumption': 1.08, + 'consumption': 1.32, 'consumption_fuel_km': 10.53}]) def test_db_callback(self): diff --git a/test/utils.py b/test/utils.py index 9ddcc77..5d1423f 100644 --- a/test/utils.py +++ b/test/utils.py @@ -20,7 +20,7 @@ date4 = date3 + timedelta(minutes=1) vehicule_list = Cars() vehicule_list.extend( - [Car("VR3UHZKX", "vid", "Peugeot"), Car("VXXXXX", "XXXX", "Peugeot", label="SUV 3008")]) + [Car("VR3UHZKX", "vid", "Peugeot"), Car("VXXXXX", "XXXX", "Peugeot", label="SUV 3008 Hybrid 225")]) car = vehicule_list[0] DB_DIR = DATA_DIR + "tmp.db"