geocif 0.1.49__tar.gz → 0.1.51__tar.gz

{geocif-0.1.49/geocif.egg-info → geocif-0.1.51}/PKG-INFO

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

{geocif-0.1.49 → geocif-0.1.51}/geocif/analysis.py

@@ -163,6 +163,7 @@ class Geoanalysis:
 
         df_metrics = self._compute_metrics(df)
         df_metrics = self._process_metrics(df_metrics)
+
         self._plot_metrics(df_metrics)
 
         df_regional_metrics_by_year = self._compute_regional_metrics(
@@ -183,6 +184,11 @@ class Geoanalysis:
         return df_metrics, df_regional_metrics, df_national_yield
 
     def _clean_data(self):
+        # Hack exclude 2012 if country == "illinois"
+        if self.country == "illinois":
+            self.df_analysis = self.df_analysis[
+                self.df_analysis["Harvest Year"] != 2012
+            ]
         # Remove rows with missing values in Observed Yield (tn per ha)
         return self.df_analysis.dropna(subset=["Observed Yield (tn per ha)"])
 
@@ -196,11 +202,12 @@ class Geoanalysis:
             .reset_index()
         )
 
-        return df_metrics.pivot_table(
-            index=["Country", "Model", "Harvest Year", "Stage Name", "Stage Range"],
-            columns="level_5",
-            values=0,
-        ).reset_index()
+        # return df_metrics.pivot_table(
+        #    index=["Country", "Model", "Harvest Year", "Stage Name", "Stage Range"],
+        #    columns="level_5",
+        #    values=0,
+        # ).reset_index()
+        return df_metrics
 
     def _process_metrics(self, df_metrics):
         # Assign each unique Stage Name a unique integer identifier

{geocif-0.1.49 → geocif-0.1.51}/geocif/cei/indices.py

@@ -238,7 +238,7 @@ class CEIs:
 
         :return:
         """
-        df = pd.read_csv(self.file_path, engine="pyarrow")
+        df = pd.read_csv(self.file_path)  # , engine="pyarrow")
 
         # Do a groupby based on adm1_name and Season, drop all Seasons for
         # which all PHENOLOGICAL_STAGES are not present in the crop_cal column

{geocif-0.1.49 → geocif-0.1.51}/geocif/experiments.py

@@ -3,7 +3,7 @@ from pathlib import Path
 import matplotlib.pyplot as plt
 import sklearn
 
-from geocif import geocif as gc
+from geocif import geocif_runner as gc
 from geocif import logger as log
 
 plt.style.use("default")