geocif 0.1.27__tar.gz → 0.1.29__tar.gz

{geocif-0.1.27/geocif.egg-info → geocif-0.1.29}/PKG-INFO

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

{geocif-0.1.27 → geocif-0.1.29}/geocif/geocif.py

@@ -144,8 +144,8 @@ class Geocif:
         """
         # If ML model is run for individual region or cluster, then Region_ID is the same for each region
         # or cluster and therefore redundant for the ML model
-        if self.cluster_strategy in ["individual", "auto_detect"]:
-            self.cat_features.remove("Region_ID")
+        #if self.cluster_strategy in ["individual", "auto_detect"]:
+        #    self.cat_features.remove("Region_ID")
 
         self.fixed_columns: list = [
             "Country",
@@ -425,6 +425,7 @@ class Geocif:
         # Create an index based on following columns
         index_columns = [
             "Model",
+            "Cluster Strategy"
             "Country",
             "Region",
             "Crop",
@@ -717,6 +718,7 @@ class Geocif:
         )
 
         # cat_features should be converted to category type
+
         df[self.cat_features] = df[self.cat_features].astype("category")
 
         """  Heatmap of correlation of various features with yield at each time step"""

{geocif-0.1.27 → geocif-0.1.29}/geocif/indices_runner.py

@@ -153,23 +153,23 @@ class cei_runner(base.BaseGeo):
                 category,
                 year,
                 "ndvi",
-                True,
+                False,  # redo
             )
-            for year in range(2001, ar.utcnow().year + 1)
+            for year in range(2023, ar.utcnow().year + 1)
             for status, path, filename, admin_zone, category in combinations
         ]
 
         # 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 "angola" in i[2] or
-        #                 "lesotho" in i[2] or
+        combinations = [i for i in combinations if "angola_maize" in i[3] or
+                       "lesotho_maize" in i[3] or
         #                 "namibia" in i[2] or
         #                 "united_republic_of_tanzania" in i[2] or
-        #                 "zambia" in i[2] or
-        #                 "zimbabwe" in i[2] or
+                         "zambia_maize" in i[3] or
+                         "zimbabwe_maize" in i[3] or
         #                 "south_africa" in i[2] or
-        #                 "mozambique" in i[2] or
+                      "mozambique_maize" in i[3]]
         #                 "malawi" in i[2]]
 
         if self.do_parallel:
@@ -201,7 +201,7 @@ def run(path_config_files=[]):
     indices.validate_index_definitions()
 
     for method in [
-        "monthly_r",  # "dekad_r"  # "dekad_r"
+        "biweekly_r",  # "dekad_r"  # "dekad_r"
     ]:  # , "full_season", "phenological_stages", "fraction_season"]:
         obj = cei_runner(path_config_files)
         obj.main(method)

{geocif-0.1.27 → geocif-0.1.29/geocif.egg-info}/PKG-INFO

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

{geocif-0.1.27 → geocif-0.1.29}/setup.py

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