geocif 0.1.42__tar.gz → 0.1.44__tar.gz

{geocif-0.1.42/geocif.egg-info → geocif-0.1.44}/PKG-INFO

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

{geocif-0.1.42 → geocif-0.1.44}/geocif/cei/indices.py

@@ -193,7 +193,7 @@ class CEIs:
             df = self.df_harvest_year
 
         if not df.empty:
-            self.country = df[col].unique()[0]
+            self.country = df[col].unique()[0].lower().replace(" ", "_")
         else:
             raise ValueError("Dataframe is empty")
 
@@ -418,8 +418,6 @@ class CEIs:
         if not self.redo:
             mask_year = self.harvest_year < current_year - 1
 
-            if os.path.isfile(intermediate_file) and mask_year:
-                return None
             if os.path.isfile(cei_file) and mask_year:
                 return None
 
@@ -607,8 +605,8 @@ class CEIs:
 
         """
         # If stage is not a list then convert it to a list
-        if not isinstance(stage, list):
-            stage = [stage]
+        # if not isinstance(stage, list):
+        #     stage = [stage]
 
         columns = [
             "Description",
@@ -777,7 +775,7 @@ class CEIs:
         ds = compute_indices(df_time_period, df_base_period, index_name)
 
         # If method is False then set stage to None
-        istage = None if self.method == "full_season" else stage
+        istage = None if self.method == "full_season" else "_".join(map(str, stage))
 
         if ds:
             # convert xarray dataset to dataframe and add additional information

{geocif-0.1.42 → geocif-0.1.44}/geocif/geocif.py

@@ -745,7 +745,7 @@ class Geocif:
 
         if self.median_area_as_feature:
             df = fe.compute_median_statistics(
-                df, self.all_seasons_with_area, self.number_median_years, "Area (ha)"
+                df, self.all_seasons_with_yield, self.number_median_years, "Area (ha)"
             )
 
         if self.lag_yield_as_feature:

{geocif-0.1.42 → geocif-0.1.44}/geocif/indices_runner_v2.py

@@ -47,7 +47,7 @@ class cei_runner(base.BaseGeo):
 
         self.dir_input = Path(self.parser.get("PATHS", "dir_input"))
         self.base_dir = Path(
-            r"/gpfs/data1/cmongp1/GEOGLAM/Output/countries/malawi"
+            r"D:\Users\ritvik\projects\GEOGLAM\Output\countries\afghanistan"
         )  # Path(self.parser.get("PATHS", "dir_crop_inputs"))
         self.do_parallel = self.parser.getboolean("DEFAULT", "do_parallel")
 
@@ -164,7 +164,7 @@ class cei_runner(base.BaseGeo):
         # Only keep those entries in combinations where the third elemt is
         # mozambique, south_africa, angola or dem_people's_rep_of_korea
         # This is done to test the code for these countries
-        combinations = [i for i in combinations if "malawi_maize_s1" in i[3]]
+        combinations = [i for i in combinations if "afghanistan_maize_s1" in i[3]]
 
         if True:
             num_cpu = int(cpu_count() * 0.5)
@@ -195,7 +195,7 @@ def run(path_config_files=[]):
     indices.validate_index_definitions()
 
     for method in [
-        "biweekly_r",  # "dekad_r"  # "dekad_r"
+        "monthly_r",  # "dekad_r"  # "dekad_r"
     ]:  # , "full_season", "phenological_stages", "fraction_season"]:
         obj = cei_runner(path_config_files)
         obj.main(method)

{geocif-0.1.42 → geocif-0.1.44}/geocif/ml/correlations.py

@@ -253,7 +253,7 @@ def all_correlated_feature_by_time(df, **kwargs):
 
     dict_selected_features = {}
     dict_best_cei = {}
-
+    breakpoint()
     if not national_correlation:
         groups = df.groupby(group_by)
         for region_id, group in tqdm(

{geocif-0.1.42 → geocif-0.1.44/geocif.egg-info}/PKG-INFO

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

{geocif-0.1.42 → geocif-0.1.44}/setup.py

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