geocif 0.1.41__tar.gz → 0.1.43__tar.gz

{geocif-0.1.41/geocif.egg-info → geocif-0.1.43}/PKG-INFO

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

{geocif-0.1.41 → geocif-0.1.43}/geocif/cei/indices.py

@@ -607,8 +607,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 +777,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.41 → geocif-0.1.43}/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"D:\Users\ritvik\projects\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,9 +164,9 @@ 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:
+        if False:
             num_cpu = int(cpu_count() * 0.5)
             with Pool(num_cpu) as p:
                 for i, _ in enumerate(p.imap_unordered(indices.process, combinations)):
@@ -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.41 → geocif-0.1.43}/geocif/ml/stages.py

@@ -25,6 +25,11 @@ def add_stage_information(df, method):
     # Stage looks like this: 13_12_11
     # Starting Stage will look like this: 13
     # Ending Stage will look like this: 11
+    # If stage is a list then convert it to a string
+    #
+    #
+
+    breakpoint()
     df["Starting Stage"] = df["Stage"].apply(lambda x: int(x.split("_")[0]))
     df["Ending Stage"] = df["Stage"].apply(lambda x: int(x.split("_")[-1]))
 

{geocif-0.1.41 → geocif-0.1.43/geocif.egg-info}/PKG-INFO

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

{geocif-0.1.41 → geocif-0.1.43}/setup.py

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