geocif 0.2.34__tar.gz → 0.2.36__tar.gz

{geocif-0.2.34/geocif.egg-info → geocif-0.2.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.2.34
+Version: 0.2.36
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.2.34 → geocif-0.2.36}/geocif/geocif.py

@@ -831,8 +831,16 @@ class Geocif:
             df_region_train = df_region_train.dropna(subset=[self.target_column])
 
             self.X_train = df_region_train[self.feature_names]
-            # Drop any columns with NaNs
-            self.X_train.dropna(axis=1, how="any", inplace=True)
+            # Drop any columns with NaNs except the lag yield columns
+            lag_prefix = "t -"
+            lag_cols = [
+                col for col in self.X_train.columns
+                if col.startswith(lag_prefix) and self.target in col
+            ]
+
+            cols_with_na = self.X_train.columns[self.X_train.isna().any()]
+            cols_to_check = [col for col in cols_with_na if col not in lag_cols]
+            self.X_train.dropna(axis=1, how="any", subset=cols_to_check, inplace=True)
             self.y_train = df_region_train[self.target_column]
 
             self.apply_feature_selector(region, dir_output)
@@ -1260,7 +1268,10 @@ class Geocif:
                 )
                 pbar.update()
 
-                self.loop_ml(stage, dict_selected_features, dict_best_cei)
+                try:
+                    self.loop_ml(stage, dict_selected_features, dict_best_cei)
+                except:
+                    pass
         wandb.finish()
 
     def setup(self, forecast_season, model):
@@ -1371,13 +1382,6 @@ class Geocif:
             self.df_inputs[self.target].notna()
         ]["Harvest Year"].unique()
 
-        # Exclude the current forecast season from all_seasons_with_yield
-        self.all_seasons_with_yield = [
-            season
-            for season in self.all_seasons_with_yield
-            if season != self.forecast_season
-        ]
-
         if self.method.endswith("_r"):
             if self.forecast_season == self.today_year:
                 mask = self.df_inputs["Harvest Year"] == self.forecast_season

{geocif-0.2.34 → geocif-0.2.36}/geocif/ml/feature_engineering.py

@@ -176,9 +176,6 @@ def compute_lag_yield(
         if group[target_col].isnull().all():
             continue
 
-        # Exclude the forecast season from the unique years
-        unique_years = unique_years[unique_years != forecast_season]
-
         for harvest_year in unique_years:
             closest_years = compute_closest_years(
                 all_seasons_with_yield, harvest_year, number_lag_years, only_historic=True

{geocif-0.2.34 → geocif-0.2.36}/geocif/ml/feature_selection.py

@@ -82,16 +82,20 @@ def select_features(
         counter = Counter()
         selections = {}
 
-        models = ["BorutaPy", "mrmr"]
+        models = ["Leshy", "BorutaPy", "mrmr"]
         # run three selectors and count feature picks
         for sub_m in models:
-            _, _, feats = select_features(
-                X_clean, y,
-                method=sub_m,
-                min_features_to_select=min_features_to_select,
-                threshold_nan=threshold_nan,
-                threshold_unique=threshold_unique
-            )
+            try:
+                _, _, feats = select_features(
+                    X_clean, y,
+                    method=sub_m,
+                    min_features_to_select=min_features_to_select,
+                    threshold_nan=threshold_nan,
+                    threshold_unique=threshold_unique
+                )
+            except:
+                feats = []
+
             selections[sub_m] = set(feats)
             counter.update(feats)
 

{geocif-0.2.34 → geocif-0.2.36/geocif.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.2.34
+Version: 0.2.36
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.2.34 → geocif-0.2.36}/setup.py

@@ -50,6 +50,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://ritviksahajpal.github.io/yield_forecasting/",
-    version="0.2.34",
+    version="0.2.36",
     zip_safe=False,
 )