geocif 0.1.43__tar.gz → 0.1.44__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.43
+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.43 → 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
 

{geocif-0.1.43 → 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.43 → geocif-0.1.44}/geocif/indices_runner_v2.py

@@ -166,7 +166,7 @@ class cei_runner(base.BaseGeo):
         # This is done to test the code for these countries
         combinations = [i for i in combinations if "afghanistan_maize_s1" in i[3]]
 
-        if False:
+        if True:
             num_cpu = int(cpu_count() * 0.5)
             with Pool(num_cpu) as p:
                 for i, _ in enumerate(p.imap_unordered(indices.process, combinations)):

{geocif-0.1.43 → 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.43 → geocif-0.1.44}/geocif/ml/stages.py

@@ -25,11 +25,6 @@ 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.43 → geocif-0.1.44/geocif.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.43
+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.43 → 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.43",
+    version="0.1.44",
     zip_safe=False,
 )