openenergyid 0.1.16__tar.gz → 0.1.17__tar.gz

{openenergyid-0.1.16 → openenergyid-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openenergyid
-Version: 0.1.16
+Version: 0.1.17
 Summary: Open Source Python library for energy analytics and simulations
 Project-URL: Homepage, https://energyid.eu
 Project-URL: Repository, https://github.com/EnergieID/OpenEnergyID

{openenergyid-0.1.16 → openenergyid-0.1.17}/openenergyid/__init__.py

@@ -1,6 +1,6 @@
 """Open Energy ID Python SDK."""
 
-__version__ = "0.1.16"
+__version__ = "0.1.17"
 
 from .enums import Granularity
 from .models import TimeDataFrame, TimeSeries

{openenergyid-0.1.16 → openenergyid-0.1.17}/openenergyid/dyntar/main.py

@@ -1,5 +1,6 @@
 """Main module of the DynTar package."""
 
+import numpy as np
 import pandas as pd
 
 from openenergyid.const import (
@@ -122,18 +123,25 @@ def extend_dataframe_with_heatmap(df: pd.DataFrame, inplace: bool = False) -> pd
     if not inplace:
         df = df.copy()
 
-    heatmap_score_delivered = (
-        (df[ELECTRICITY_DELIVERED_SMR2] - df[ELECTRICITY_DELIVERED_SMR3])
-        / df[ELECTRICITY_DELIVERED_SMR2]
-        * (df[RLP_WEIGHTED_PRICE_DELIVERED] - df[PRICE_ELECTRICITY_DELIVERED])
-        / df[RLP_WEIGHTED_PRICE_DELIVERED]
-    )
-    heatmap_score_exported = (
-        (df[ELECTRICITY_EXPORTED_SMR2] - df[ELECTRICITY_EXPORTED_SMR3])
-        / df[ELECTRICITY_EXPORTED_SMR2]
-        * (df[SPP_WEIGHTED_PRICE_EXPORTED] - df[PRICE_ELECTRICITY_EXPORTED])
-        / df[SPP_WEIGHTED_PRICE_EXPORTED]
+    normalized_energy_delta_delivered = (
+        df[ELECTRICITY_DELIVERED_SMR2] - df[ELECTRICITY_DELIVERED_SMR3]
+    ) / df[ELECTRICITY_DELIVERED_SMR2]
+    normalized_price_delta_delivered = (
+        df[RLP_WEIGHTED_PRICE_DELIVERED] - df[PRICE_ELECTRICITY_DELIVERED]
+    ) / df[RLP_WEIGHTED_PRICE_DELIVERED]
+    heatmap_score_delivered = normalized_energy_delta_delivered * normalized_price_delta_delivered
+
+    normalized_energy_delta_exported = (
+        df[ELECTRICITY_EXPORTED_SMR2] - df[ELECTRICITY_EXPORTED_SMR3]
+    ) / df[ELECTRICITY_EXPORTED_SMR2]
+    normalized_energy_delta_exported = normalized_energy_delta_exported.replace(
+        [np.inf, -np.inf], np.nan
     )
+    normalized_price_delta_exported = (
+        df[SPP_WEIGHTED_PRICE_EXPORTED] - df[PRICE_ELECTRICITY_EXPORTED]
+    ) / df[SPP_WEIGHTED_PRICE_EXPORTED]
+    heatmap_score_exported = normalized_energy_delta_exported * normalized_price_delta_exported
+
     heatmap_score_delivered.fillna(0, inplace=True)
     heatmap_score_exported.fillna(0, inplace=True)