geocif 0.1.39__tar.gz → 0.1.40__tar.gz

{geocif-0.1.39/geocif.egg-info → geocif-0.1.40}/PKG-INFO

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

{geocif-0.1.39 → geocif-0.1.40}/geocif/experiments.py

@@ -15,6 +15,10 @@ warnings.simplefilter(action="ignore", category=FutureWarning)
 
 
 def main(inputs, logger, parser, section, item, type, values):
+    # Set experiment_name
+    experiment_name = f"{section}_{item}"
+    parser.set("DEFAULT", "experiment_name", experiment_name)
+
     if type == "str":
         original_value = parser.get(section, item)
     elif type == "bool":

{geocif-0.1.39 → geocif-0.1.40}/geocif/geocif.py

@@ -644,6 +644,7 @@ class Geocif:
                 kwargs = {
                     "cluster_strategy": self.cluster_strategy,
                     "model": self.model,
+                    "model_name": self.model_name,
                     "forecast_season": self.forecast_season,
                     "crop": self.crop,
                     "country": self.country,
@@ -659,6 +660,7 @@ class Geocif:
                 model = self.model.estimator_
             else:
                 model = self.model
+
             output.store(self.db_path, experiment_id, df, model, self.model_name)
 
     def get_cei_column_names(self, df):

{geocif-0.1.39 → geocif-0.1.40}/geocif/ml/xai.py

@@ -8,6 +8,7 @@ from tqdm import tqdm
 def explain(df_train, df_test, **kwargs):
     cluster_strategy = kwargs.get("cluster_strategy", "auto_detect")
     model = kwargs.get("model")
+    model_name = kwargs.get("model_name")
     forecast_season = kwargs.get("forecast_season")
     crop = kwargs.get("crop")
     country = kwargs.get("country")
@@ -48,7 +49,7 @@ def explain(df_train, df_test, **kwargs):
     plt.tight_layout()
 
     fname = f"beeswarm_{region_name}_{forecast_season}.png"
-    out_dir = analysis_dir / country / crop / str(forecast_season)
+    out_dir = analysis_dir / country / crop / model_name / str(forecast_season)
     os.makedirs(out_dir, exist_ok=True)
     plt.savefig(out_dir / fname, dpi=250)
     plt.close()

{geocif-0.1.39 → geocif-0.1.40/geocif.egg-info}/PKG-INFO

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

{geocif-0.1.39 → geocif-0.1.40}/setup.py

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