geocif 0.1.47__tar.gz → 0.1.48__tar.gz

{geocif-0.1.47/geocif.egg-info → geocif-0.1.48}/PKG-INFO

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

{geocif-0.1.47 → geocif-0.1.48}/geocif/geocif.py

@@ -11,7 +11,6 @@ import geopandas as gp
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-import sklearn
 from tqdm import tqdm
 
 from geocif import logger as log
@@ -28,7 +27,6 @@ from .ml import trend
 from .ml import xai
 
 plt.style.use("default")
-sklearn.set_config(transform_output="pandas")
 
 import warnings
 
@@ -304,6 +302,8 @@ class Geocif:
                         verbose=False,
                         # callbacks=[TQDMCallback(self.best_hyperparams["iterations"])],
                     )
+                elif self.model_name == "oblique":
+                    self.model.fit(X_train, y_train)
                 elif self.model_name == "geospaNN":
                     self.model.fit(
                         X_train,

{geocif-0.1.47 → geocif-0.1.48}/geocif/ml/trainers.py

@@ -2,10 +2,7 @@ import multiprocessing as mp
 
 import numpy as np
 import optuna
-import pandas as pd
 from catboost import CatBoostRegressor
-from sklearn.metrics import root_mean_squared_error
-from sklearn.model_selection import train_test_split
 from tqdm import tqdm
 
 
@@ -30,6 +27,8 @@ def loocv(
     :param cat_features: list, list of categorical feature names
     :return: float, average RMSE
     """
+    from sklearn.metrics import root_mean_squared_error
+
     rmse_values = []
 
     X = df[feature_names + cat_features]
@@ -81,6 +80,9 @@ def optuna_objective(model, df, feature_names, target_col, cat_features=[]):
     Returns:
 
     """
+    from sklearn.metrics import root_mean_squared_error
+    from sklearn.model_selection import train_test_split
+
     X = df[feature_names + cat_features]
     y = df[target_col]
 
@@ -280,6 +282,19 @@ def auto_train(
                 hyperparams["iterations"] = 1000
                 regr = CatBoostRegressor(**hyperparams, cat_features=cat_features)
                 model = MERF(regr, max_iterations=10)
+        elif model_name == "oblique":
+            breakpoint()
+            from sktree.ensemble import ObliqueRandomForestRegressor
+
+            print("Training ObliqueRandomForestRegressor")
+            model = ObliqueRandomForestRegressor(
+                n_estimators=500,
+                max_depth=7,
+                n_jobs=-1,
+                verbose=2,
+                random_state=42,
+            )
+            print("Finished training ObliqueRandomForestRegressor")
         elif model_name == "linear":
             from sklearn.linear_model import LassoCV
 

{geocif-0.1.47 → geocif-0.1.48/geocif.egg-info}/PKG-INFO

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

{geocif-0.1.47 → geocif-0.1.48}/setup.py

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