openstef 3.4.51__py3-none-any.whl → 3.4.52__py3-none-any.whl

openstef/metrics/metrics.py

@@ -171,19 +171,19 @@ def r_mne_highest(realised: pd.Series, forecast: pd.Series) -> float:
 
     # Determine load range on entire dataset
     range_ = (
-        combined["load"].max() - combined["load"].min()
-        if (combined["load"].max() - combined["load"].min()) != 0
+        combined[realised.name].max() - combined[realised.name].min()
+        if (combined[realised.name].max() - combined[realised.name].min()) != 0
         else np.nan
     )
 
     # Select 5 percent highest realised load values
-    combined["highest"] = combined["load"][
-        combined["load"] > combined["load"].quantile(0.95)
+    combined["highest"] = combined[realised.name][
+        combined[realised.name] > combined[realised.name].quantile(0.95)
     ]
     combined = combined[np.invert(np.isnan(combined["highest"]))]
 
     # Calculate rMNE for the selected points
-    diff = combined[forecast.name] - combined["load"]
+    diff = combined[forecast.name] - combined[realised.name]
 
     if len(diff[diff < 0]) < 2:
         return 0.0
@@ -208,20 +208,20 @@ def r_mpe_highest(realised: pd.Series, forecast: pd.Series) -> float:
 
     # Determine load range on entire dataset
     range_ = (
-        combined["load"].max() - combined["load"].min()
-        if (combined["load"].max() - combined["load"].min()) != 0
+        combined[realised.name].max() - combined[realised.name].min()
+        if (combined[realised.name].max() - combined[realised.name].min()) != 0
         else np.nan
     )
 
     # Select 5 percent highest realised load values
-    combined["highest"] = combined["load"][
-        combined["load"] > combined["load"].quantile(0.95)
+    combined["highest"] = combined[realised.name][
+        combined[realised.name] > combined[realised.name].quantile(0.95)
     ]
     combined = combined[np.invert(np.isnan(combined["highest"]))]
 
     # Calculate rMPE for the selected points
 
-    diff = combined[forecast.name] - combined["load"]
+    diff = combined[forecast.name] - combined[realised.name]
 
     if len(diff[diff > 0]) < 2:
         return 0.0
@@ -282,13 +282,15 @@ def skill_score_positive_peaks(
     combined = pd.concat([realised, forecast], axis=1)
 
     # Select 5 percent highest realised load values
-    combined["highest"] = combined["load"][
-        combined["load"] > combined["load"].quantile(0.95)
+    combined["highest"] = combined[realised.name][
+        combined[realised.name] > combined[realised.name].quantile(0.95)
     ]
     combined = combined[np.invert(np.isnan(combined["highest"]))]
 
     # Calculate rMAE for the selected points
-    skill_score_highest = skill_score(combined["load"], combined[forecast.name], mean)
+    skill_score_highest = skill_score(
+        combined[realised.name], combined[forecast.name], mean
+    )
 
     if np.isnan(skill_score_highest):
         return 0
@@ -304,8 +306,8 @@ def franks_skill_score(
     combined = pd.concat([realised, forecast], axis=1)
     if range_ == 1.0:
         range_ = (
-            combined["load"].max() - combined["load"].min()
-            if (combined["load"].max() - combined["load"].min()) != 0
+            combined[realised.name].max() - combined[realised.name].min()
+            if (combined[realised.name].max() - combined[realised.name].min()) != 0
             else np.nan
         )
 
@@ -325,19 +327,19 @@ def franks_skill_score_peaks(
     combined = pd.concat([realised, forecast, basecase], axis=1)
 
     range_ = (
-        combined["load"].max() - combined["load"].min()
-        if (combined["load"].max() - combined["load"].min()) != 0
+        combined[realised.name].max() - combined[realised.name].min()
+        if (combined[realised.name].max() - combined[realised.name].min()) != 0
         else np.nan
     )
     # Select 5 percent highest realised load values
-    combined["highest"] = combined["load"][
-        combined["load"] > combined["load"].quantile(0.95)
+    combined["highest"] = combined[realised.name][
+        combined[realised.name] > combined[realised.name].quantile(0.95)
     ]
     combined = combined[np.invert(np.isnan(combined["highest"]))]
 
     # Calculate rMAE for the selected points
     franks_skill_score_highest = franks_skill_score(
-        combined["load"],
+        combined[realised.name],
         combined[forecast.name],
         combined[basecase.name],
         range_=range_,

{openstef-3.4.51.dist-info → openstef-3.4.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: openstef
-Version: 3.4.51
+Version: 3.4.52
 Summary: Open short term energy forecaster
 Home-page: https://github.com/OpenSTEF/openstef
 Author: Alliander N.V

{openstef-3.4.51.dist-info → openstef-3.4.52.dist-info}/RECORD

@@ -33,7 +33,7 @@ openstef/feature_engineering/missing_values_transformer.py,sha256=o_zCVEOCPn2tWz
 openstef/feature_engineering/weather_features.py,sha256=Lr9DItyHvJ2CpWQ1r6A83tJKtR2k_Wwn32FdFTGblO0,15750
 openstef/metrics/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/metrics/figure.py,sha256=KDoezYem9wdS13kUx7M7FOy-4u88Sg3OX1DuhNT6kgQ,9751
-openstef/metrics/metrics.py,sha256=si93EP2i34v3IPg-nOcm_aheoFAdu46i3azV_PjPmF8,15237
+openstef/metrics/metrics.py,sha256=BsVrKalhgs20YsVBGyYZI2Uzor2nTPKTBCLHFCogCH8,15475
 openstef/metrics/reporter.py,sha256=w1Q6xWoYGmvnjwjXik-Gz7_gnb0lOeJMep-whEV5mNk,7897
 openstef/model/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/model/basecase.py,sha256=caI6Q-8y0ymlxGK9Js_H3Vh0q6ruNHlGD5RG0_kE5M0,2878
@@ -93,8 +93,8 @@ openstef/tasks/utils/predictionjobloop.py,sha256=Ysy3zF5lzPMz_asYDKeF5m0qgVT3tCt
 openstef/tasks/utils/taskcontext.py,sha256=L9K14ycwgVxbIVUjH2DIn_QWbnu-OfxcGtQ1K9T6sus,5630
 openstef/validation/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/validation/validation.py,sha256=HVgreHvcZvPazfwC3NNE8_3lsMsZEd_42osCAg1_6W4,11128
-openstef-3.4.51.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-openstef-3.4.51.dist-info/METADATA,sha256=ed42n4dAuv1juArxfUH62jmnK5QfRV6qSJ6rZ5wVUUA,8305
-openstef-3.4.51.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-openstef-3.4.51.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
-openstef-3.4.51.dist-info/RECORD,,
+openstef-3.4.52.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+openstef-3.4.52.dist-info/METADATA,sha256=r8E2LPnPIDJ-AhzrbVmYP3MPYIfx2OOpwIuYC9obtcE,8305
+openstef-3.4.52.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+openstef-3.4.52.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
+openstef-3.4.52.dist-info/RECORD,,