Merge pull request #13 from kingsleynweye/develop

Bug fix
HichamJohra · Jan 25, 2023 · 2e68f50 · 2e68f50
2 parents 3762439 + d5aa540
commit 2e68f50
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/energy_flexibility_kpis/kpi.py b/energy_flexibility_kpis/kpi.py
@@ -72,7 +72,7 @@ def flexibility_factor(generic_electricity_consumption_profile: List[float], hig
         (df['timestamp'] >= high_price_start_timestamp) & (df['timestamp'] <= high_price_end_timestamp)
     ]['generic_electricity_consumption'].sum()
     low_price_electricity_consumption = df[
-        (df['timestamp'] < high_price_start_timestamp) & (df['timestamp'] > high_price_end_timestamp)
+        (df['timestamp'] < high_price_start_timestamp) | (df['timestamp'] > high_price_end_timestamp)
     ]['generic_electricity_consumption'].sum()
     flexibility_factor = (low_price_electricity_consumption - high_price_electricity_consumption)/\
         (low_price_electricity_consumption + high_price_electricity_consumption)