geocif 0.2.38__tar.gz → 0.2.40__tar.gz

{geocif-0.2.38/geocif.egg-info → geocif-0.2.40}/PKG-INFO

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

{geocif-0.2.38 → geocif-0.2.40}/geocif/geocif.py

@@ -328,6 +328,7 @@ class Geocif:
                 elif self.model_name == "linear":
                     self.model.fit(X_train_scaled, self.y_train)
                 elif self.model_name == "gam":
+                    breakpoint()
                     self.model.fit(X_train_scaled.values, self.y_train.values)
                     self.best_hyperparams = {}
                 elif self.model_name in ["cubist"]:
@@ -786,7 +787,7 @@ class Geocif:
         """ Train, Predict, Explain and Store results for each region """
         pbar = tqdm(self.df_train["Region_ID"].unique(), leave=False)
         for idx, region in enumerate(pbar):
-            if self.model_name in ["linear", "gam"]:
+            if self.model_name in ["linear"]:
                 self.create_feature_names(stages, dict_best_cei[region][0:3].tolist())
             elif self.model_name in ["cumulative_1", "cumulative_2", "cumulative_3"]:
                 self.create_feature_names(stages, {})
@@ -1271,8 +1272,7 @@ class Geocif:
                 try:
                     self.loop_ml(stage, dict_selected_features, dict_best_cei)
                 except Exception as e:
-                    breakpoint()
-                    pass
+                    self.logger.error(e)
         wandb.finish()
 
     def setup(self, forecast_season, model):

{geocif-0.2.38 → geocif-0.2.40}/geocif/ml/trainers.py

@@ -351,9 +351,14 @@ def auto_train(
                 "cumulative_3": s(0) + s(1) + s(2) + te(0, 1) + te(0, 2) + te(1, 2) + f(3),
             }
 
-            formula = gam_formulas.get(model_name, gam_cls(n_splines=25, spline_order=3))
-            model = GAM(formula).gridsearch(X_train.values, y_train.values, lam=np.logspace(-3, 3, 11)) if model_name.startswith("gam") else formula
+            # Fill nans with medians
+            for col in X_train.columns:
+                if X_train[col].isnull().any():
+                    median = X_train[col].median()
+                    X_train[col].fillna(median, inplace=True)
 
+            formula = gam_formulas.get(model_name, gam_cls(n_splines=25, spline_order=3))
+            model = gam_cls(n_splines=25, spline_order=3).gridsearch(X_train, y_train.values, lam=np.logspace(-3, 3, 11)) if model_name.startswith("gam") else formula
         elif model_name == "geospaNN":
             import torch
             import geospaNN

{geocif-0.2.38 → geocif-0.2.40/geocif.egg-info}/PKG-INFO

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

{geocif-0.2.38 → geocif-0.2.40}/setup.py

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