github/psa_car_controller
1
0
Fork 0
mirror of https://github.com/flobz/psa_car_controller.git synced 2026-08-21 17:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent division by zero during calculation of co2_per_kw (#68)

Browse Source 
* Prevent division by zero during calculation of co2_per_kw

Co-authored-by: Florian BEZANNIER <48728684+flobz@users.noreply.github.com>
This commit is contained in:
Max
2021-04-06 11:07:30 +02:00
committed by GitHub
co-authored by Florian BEZANNIER
parent d9f0141ff4
commit ed6e942908
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/figures.py
+12 -5
View File
@@ -111,11 +111,7 @@ def get_figures(trips: Trips, charging: Tuple[dict]):
# charging
charging_data = DataFrame.from_records(charging)
try:
co2_data = charging_data[charging_data["co2"] > 0]
co2_per_kw = co2_data["co2"].sum() / co2_data["kw"].sum()
except (ZeroDivisionError, KeyError):
co2_per_kw = 0
co2_per_kw = __calculate_co2_per_kw(charging_data)
co2_per_km = co2_per_kw * kw_per_km / 100
try:
charge_speed = 3600 * charging_data["kw"].mean() / \
@@ -181,3 +177,14 @@ def get_figures(trips: Trips, charging: Tuple[dict]):
else:
consumption_graph_by_temp = Graph(style={'display': 'none'})
def __calculate_co2_per_kw(charging_data):
try:
co2_data = charging_data[charging_data["co2"] > 0]
co2_kw_sum = co2_data["kw"].sum()
if co2_kw_sum > 0:
return co2_data["co2"].sum() / co2_kw_sum
except KeyError:
return 0
return 0