openstef 3.4.78__py3-none-any.whl → 3.4.79__py3-none-any.whl

openstef/feature_engineering/holiday_features.py

@@ -1,8 +1,8 @@
 # SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com> # noqa E501>
 #
 # SPDX-License-Identifier: MPL-2.0
-"""This module contains all holiday related features."""
 from datetime import datetime, timedelta
+import collections
 
 import holidays
 import numpy as np
@@ -26,7 +26,6 @@ def generate_holiday_feature_functions(
         2022-12-24 - 2023-01-08 is the 'Kerstvakantie'
         2022-10-15 - 2022-10-23 is the 'HerfstvakantieNoord'
 
-
     The holidays are based on a manually generated csv file.
     The information is collected using:
     https://www.schoolvakanties-nederland.nl/ and the python holiday function
@@ -44,7 +43,6 @@ def generate_holiday_feature_functions(
         - Pinksteren
         - Kerst
 
-
     The 'Brugdagen' are updated untill dec 2020. (Generated using agenda)
 
     Args:
@@ -83,23 +81,34 @@ def generate_holiday_feature_functions(
             )
         }
     )
+
     # Define empty list to keep track of bridgedays
     bridge_days = []
-    # Loop over list of holidays names
+
+    # Group holiday dates by name
+    holiday_dates_by_name = collections.defaultdict(list)
     for date, holiday_name in sorted(country_holidays.items()):
-        # Define function explicitely to mitigate 'late binding' problem
-        def make_holiday_func(requested_date):
-            return lambda x: np.isin(x.index.date, np.array([requested_date]))
+        holiday_dates_by_name[holiday_name].append(date)
 
-        # Create lag function for each holiday
+    # Create one function per holiday name that checks all dates for that holiday
+    for holiday_name, dates in holiday_dates_by_name.items():
+        # Use a default argument to capture the dates at definition time
         holiday_functions.update(
-            {"is_" + holiday_name.replace(" ", "_").lower(): make_holiday_func(date)}
+            {
+                "is_"
+                + holiday_name.replace(
+                    " ", "_"
+                ).lower(): lambda x, dates_local=dates: np.isin(
+                    x.index.date, np.array(dates_local)
+                )
+            }
         )
 
-        # Check for bridge day
-        holiday_functions, bridge_days = check_for_bridge_day(
-            date, holiday_name, country_code, years, holiday_functions, bridge_days
-        )
+        # Check for bridge days for each date of this holiday
+        for date in dates:
+            holiday_functions, bridge_days = check_for_bridge_day(
+                date, holiday_name, country_code, years, holiday_functions, bridge_days
+            )
 
     # Add feature function that includes all bridgedays
     holiday_functions.update(
@@ -108,7 +117,7 @@ def generate_holiday_feature_functions(
 
     # Add school holidays if country is NL
     if country_code == "NL":
-        # Manully generated csv including all dutch schoolholidays for different regions
+        # Manually generated csv including all dutch schoolholidays for different regions
         df_holidays = pd.read_csv(path_to_school_holidays_csv, index_col=None)
         df_holidays["datum"] = pd.to_datetime(df_holidays.datum).apply(
             lambda x: x.date()
@@ -125,19 +134,17 @@ def generate_holiday_feature_functions(
 
         # Loop over list of holidays names
         for holiday_name in list(set(df_holidays.name)):
-            # Define function explicitely to mitigate 'late binding' problem
-            def make_holiday_func(holidayname=holiday_name):
-                return lambda x: np.isin(
-                    x.index.date,
-                    df_holidays.datum[df_holidays.name == holidayname].values,
-                )
-
-            # Create lag function for each holiday
+            # Use the holidayname as a default argument to capture it at definition time
             holiday_functions.update(
                 {
                     "is_"
-                    + holiday_name.replace(" ", "_").lower(): make_holiday_func(
-                        holidayname=holiday_name
+                    + holiday_name.replace(
+                        " ", "_"
+                    ).lower(): lambda x, holiday_name_local=holiday_name: np.isin(
+                        x.index.date,
+                        df_holidays.datum[
+                            df_holidays.name == holiday_name_local
+                        ].values,
                     )
                 }
             )
@@ -178,9 +185,10 @@ def check_for_bridge_day(
     if date in country_holidays:
         return holiday_functions, bridge_days
 
-    # Define function explicitely to mitigate 'late binding' problem
+    # Define function explicitly to mitigate 'late binding' problem
+    # Use a default argument to capture the date at definition time
     def make_holiday_func(requested_date):
-        return lambda x: np.isin(x.index.date, np.array([requested_date]))
+        return lambda x, dt=requested_date: np.isin(x.index.date, np.array([dt]))
 
     # Looking forward: If day after tomorow is a national holiday or
     # a saturday check if tomorow is not a national holiday

openstef/model/regressors/median.py

@@ -304,9 +304,11 @@ class MedianRegressor(OpenstfRegressor, RegressorMixin):
 
         Which lag features are used is determined by the feature engineering step.
         """
-        feature_names, frequency, feature_to_lags_in_min = (
-            self._extract_and_validate_lags(x)
-        )
+        (
+            feature_names,
+            frequency,
+            feature_to_lags_in_min,
+        ) = self._extract_and_validate_lags(x)
 
         self.feature_names_ = list(feature_names)
         self.frequency_ = frequency

{openstef-3.4.78.dist-info → openstef-3.4.79.dist-info}/METADATA

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

{openstef-3.4.78.dist-info → openstef-3.4.79.dist-info}/RECORD

@@ -27,7 +27,7 @@ openstef/feature_engineering/data_preparation.py,sha256=TXAPTtSmBRC_LZP7o5Jlmj7J
 openstef/feature_engineering/feature_adder.py,sha256=aSqDl_gUrB3H2TD3cNvU5JniY_KOb4u4a2A6J7zB2BQ,6835
 openstef/feature_engineering/feature_applicator.py,sha256=bU1Pu5V1fxMCQCwh6HG66nmctBjrNa7gHUYqOqPmLTU,7501
 openstef/feature_engineering/general.py,sha256=PdvnDqkze31FggUuWHQ1ysroh_uDOa1hZ7NftMYH2_U,4130
-openstef/feature_engineering/holiday_features.py,sha256=CbolIP5bfiQkqDct-9TbD828-lhC48bfeNQ2-VFnsJA,8274
+openstef/feature_engineering/holiday_features.py,sha256=g3VBj9oU3wmp82iKcknX41S_7Z4tGIjlvgbZOcFqQaw,8572
 openstef/feature_engineering/lag_features.py,sha256=Dr6qS8UhdgEHPZZSe-w6ibtjl_lcbcQohhqdZN9fqEU,5652
 openstef/feature_engineering/missing_values_transformer.py,sha256=U8pdA61k8CRosO3yR2IsCy5C4Ka3c8BWCimDLIB4LCQ,5010
 openstef/feature_engineering/rolling_features.py,sha256=V-UulqWKuSksFQAASyVSQim1stEA4TmtHNULCrrdgjo,2160
@@ -64,7 +64,7 @@ openstef/model/regressors/gblinear_quantile.py,sha256=PKQL_TAXa3Kw9oZrKC6Uvo_n2N
 openstef/model/regressors/lgbm.py,sha256=zCdn1euEdSFxYJzH8XqQFFnb6R4JVUnmineKjX_Gy-g,800
 openstef/model/regressors/linear.py,sha256=uOvZMLGZH_9nXfmS5honCMfyVeyGXP1Cza9A_BdXlVw,3665
 openstef/model/regressors/linear_quantile.py,sha256=zIpGo9deMeTZdwFWoZ3FstX74mYdlAhfg-YOsPRFl0k,10534
-openstef/model/regressors/median.py,sha256=i6nqSsKHnMxA06Ea6SNWIn4f8lvAaMz58Smx3bZ731E,14132
+openstef/model/regressors/median.py,sha256=f_yZWuJXAUbGbHAIMqpIAFSaUi0GnEe55DgFWGo7S5U,14157
 openstef/model/regressors/regressor.py,sha256=0um575rTEkzYb1E5IAOuTlsZDhmb7eI5byu5e062NRs,3469
 openstef/model/regressors/xgb.py,sha256=uhV9Wm90aOkjByTm-O2xpt2kpANRxAqQvv5mA0H1uBc,1294
 openstef/model/regressors/xgb_multioutput_quantile.py,sha256=xWzA7tymC_o-F1OS3I7vUKf9zP6RR1ZglEeY4NAgjU0,9146
@@ -104,8 +104,8 @@ openstef/tasks/utils/predictionjobloop.py,sha256=Ysy3zF5lzPMz_asYDKeF5m0qgVT3tCt
 openstef/tasks/utils/taskcontext.py,sha256=O-LZ_wHEl5vbT8oB7EYtOeMkvk6EqCnI1-KiyER7Eu4,5407
 openstef/validation/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/validation/validation.py,sha256=r6UqkdH5TMjsGfn8Ta07K1jkqmrVmwcPGfyQvMmZyO4,11459
-openstef-3.4.78.dist-info/licenses/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-openstef-3.4.78.dist-info/METADATA,sha256=81sI3OOBkDqIOnQOVq9HCvFzCGnTEpAhg70_4j_2DxM,8834
-openstef-3.4.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-openstef-3.4.78.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
-openstef-3.4.78.dist-info/RECORD,,
+openstef-3.4.79.dist-info/licenses/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+openstef-3.4.79.dist-info/METADATA,sha256=zfFVPR_RhCyKZ50LSCxuA46CI8L8d2tIJH02ryc9bUk,8834
+openstef-3.4.79.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+openstef-3.4.79.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
+openstef-3.4.79.dist-info/RECORD,,