geocif 0.1.44__tar.gz → 0.1.46__tar.gz

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

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

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

@@ -114,6 +114,12 @@ class Geocif:
         self.analogous_year_yield_as_feature = self.parser.getboolean(
             "ML", "analogous_year_yield_as_feature"
         )
+        self.plot_map_for_correlation_plot = self.parser.getboolean(
+            "ML", "plot_map_for_correlation_plot"
+        )
+        self.correlation_threshold = self.parser.getfloat(
+            "ML", "correlation_threshold"
+        )
         self.include_lat_lon = self.parser.getboolean("ML", "include_lat_lon")
         self.spatial_autocorrelation = self.parser.getboolean(
             "ML", "spatial_autocorrelation"
@@ -859,8 +865,11 @@ class Geocif:
         dict_kwargs["method"] = self.method
         dict_kwargs["national_correlation"] = self.national_correlation
         dict_kwargs["groupby"] = self.correlation_plot_groupby
+        dict_kwargs["cluster_strategy"] = self.cluster_strategy
         dict_kwargs["dg_country"] = self.dg_country
         dict_kwargs["combined_dict"] = self.combined_dict
+        dict_kwargs["plot_map"] = self.plot_map_for_correlation_plot
+        dict_kwargs["correlation_threshold"] = self.correlation_threshold
 
         if self.spatial_autocorrelation:
             sa.compute_spatial_autocorrelation(self.df_results, **dict_kwargs)

{geocif-0.1.44 → geocif-0.1.46}/geocif/indices_runner.py

@@ -172,6 +172,9 @@ class cei_runner(base.BaseGeo):
             or "zimbabwe_maize" in i[3]
             or "south_africa_maize" in i[3]
             or "mozambique_maize" in i[3]
+            or "united_states_of_america" in i[3]
+               or "russian_federation" in i[3]
+               or "ukraine" in i[3]
         ]
         #                 "malawi" in i[2]]
 

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

@@ -74,18 +74,24 @@ def plot_feature_corr_by_time(df, **kwargs):
     forecast_season = kwargs.get("forecast_season")
     national_correlation = kwargs.get("national_correlation")
     group_by = kwargs.get("groupby")
+    plot_map = kwargs.get("plot_map")
+    region_name = kwargs.get("region_name")
 
     # Setup the figure and gridspec
     fig = plt.figure(figsize=(10, 5))
-    gs = fig.add_gridspec(
-        3, 2, height_ratios=[6, 5, 1], width_ratios=[5, 1.5], hspace=0.6, wspace=0.0
-    )
+    if plot_map:
+        gs = fig.add_gridspec(
+            3, 2, height_ratios=[6, 5, 1], width_ratios=[5, 1.5], hspace=0.6, wspace=0.0
+        )
+    else:
+        gs = fig.add_gridspec(3, 1, height_ratios=[6, 5, 1], hspace=0.6, wspace=0.0)
 
     # Assign subplots
     ax_heatmap = fig.add_subplot(gs[0:2, 0])
-    ax_map = fig.add_subplot(gs[0, 1])
     cbar_ax = fig.add_subplot(gs[2, 0])
-    ax4 = fig.add_subplot(gs[2, 1])
+    if plot_map:
+        ax_map = fig.add_subplot(gs[0, 1])
+        ax4 = fig.add_subplot(gs[2, 1])
 
     # Transpose and reverse the columns of the dataframe
     df_transpose = df.T
@@ -107,43 +113,43 @@ def plot_feature_corr_by_time(df, **kwargs):
     )
     ax_heatmap.tick_params(left=False, bottom=False)
 
-    # Plot the map using GeoPandas
-    dg_country = kwargs.get("dg_country")
-
-    ax_map = dg_country.plot(
-        ax=ax_map,
-        color="white",
-        edgecolor="black",
-        linewidth=1.0,
-        facecolor=None,
-        legend=False,
-    )
-
-    if not national_correlation:
-        id = kwargs["region_id"]
-        dg_region = dg_country[dg_country[group_by] == id]
-        ax_map = dg_region.plot(
-            ax=ax_map, color="blue", edgecolor="blue", linewidth=1.0, legend=False
+    if plot_map:
+        # Plot the map using GeoPandas
+        dg_country = kwargs.get("dg_country")
+
+        ax_map = dg_country.plot(
+            ax=ax_map,
+            color="white",
+            edgecolor="black",
+            linewidth=1.0,
+            facecolor=None,
+            legend=False,
         )
-        # Set title with color blue
-        ax_map.set_title(f"Region: {id}", color="blue")
-
-    # No colorbar for the map
-    ax_map.axis("off")
-    # Remove borders
-    ax_map.spines["top"].set_visible(False)
-    ax_map.spines["right"].set_visible(False)
-    ax_map.spines["bottom"].set_visible(False)
-    ax_map.spines["left"].set_visible(False)
-    # ax4 should not be visible
-    ax4.axis("off")
+
+    id = kwargs["region_id"]
+    if plot_map:
+        if not national_correlation:
+            dg_region = dg_country[dg_country[group_by] == id]
+            ax_map = dg_region.plot(
+                ax=ax_map, color="blue", edgecolor="blue", linewidth=1.0, legend=False
+            )
+            # Set title with color blue
+            ax_map.set_title(f"Region: {id}", color="blue")
+
+        # No colorbar for the map
+        ax_map.axis("off")
+        # Remove borders
+        ax_map.spines["top"].set_visible(False)
+        ax_map.spines["right"].set_visible(False)
+        ax_map.spines["bottom"].set_visible(False)
+        ax_map.spines["left"].set_visible(False)
+        # ax4 should not be visible
+        ax4.axis("off")
 
     # Add colorbar label
     # cbar_ax.set_xlabel("Correlation Coefficient", labelpad=3, size="small")
     cbar_ax.set_title("Correlation Coefficient", loc="left", size="small")
-    ax_heatmap.set_xticklabels(
-        ax_heatmap.get_xticklabels(), size="x-small", rotation=0, fontsize=5
-    )
+    ax_heatmap.set_xticklabels(ax_heatmap.get_xticklabels(), size="x-small", rotation=0, fontsize=5)
     ax_heatmap.set_yticklabels(ax_heatmap.get_yticklabels(), size="x-small", fontsize=5)
     ax_heatmap.set_xlabel("")
     ax_heatmap.set_ylabel(" ")
@@ -151,12 +157,13 @@ def plot_feature_corr_by_time(df, **kwargs):
     cbar_ax.tick_params(axis="both", which="major", labelsize=5)
 
     _country = country.title().replace("_", " ")
-    _crop = crop.title().replace("_", " ")
+    _region_name = region_name.replace("_", " ") if not national_correlation else ""
+    _crop = "Poppy"  # crop.title().replace("_", " ")
     if not national_correlation:
         fname = f"{country}_{crop}_{id}_corr_feature_by_time.png"
     else:
         fname = f"{country}_{crop}_corr_feature_by_time.png"
-    ax_heatmap.set_title(f"{_country}\n{_crop}")
+    ax_heatmap.set_title(f"{_country}, {_crop}\n{_region_name}")
 
     # plt.tight_layout()
     os.makedirs(dir_output, exist_ok=True)
@@ -246,14 +253,14 @@ def all_correlated_feature_by_time(df, **kwargs):
     Returns:
 
     """
-    THRESHOLD = 0.1
     national_correlation = kwargs.get("national_correlation")
     group_by = kwargs.get("groupby")
     combined_dict = kwargs.get("combined_dict")
+    THRESHOLD = kwargs.get("correlation_threshold")
 
     dict_selected_features = {}
     dict_best_cei = {}
-    breakpoint()
+
     if not national_correlation:
         groups = df.groupby(group_by)
         for region_id, group in tqdm(
@@ -297,6 +304,8 @@ def all_correlated_feature_by_time(df, **kwargs):
                 )
 
                 kwargs["region_id"] = region_id
+                _region_names = "_".join([str(x) for x in group['Region'].unique()])
+                kwargs["region_name"] = _region_names
                 plot_feature_corr_by_time(df_tmp, **kwargs)
                 # For each element in dict_best_cei, add the type of the cei
             else:

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

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

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

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