geocif 0.2.44__tar.gz → 0.2.46__tar.gz

{geocif-0.2.44/geocif.egg-info → geocif-0.2.46}/PKG-INFO

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

{geocif-0.2.44 → geocif-0.2.46}/geocif/cei/indices.py

@@ -67,7 +67,7 @@ def standardize_dataframe(df: pd.DataFrame, vi_var: str) -> pd.DataFrame:
     if "time" not in df.columns:
         # Use year + day of year if no time column
         df["time"] = pd.to_datetime(
-            df["year"].astype(str) + df["JD"].astype(str),
+            df["year"].astype(str) + df["Doy"].astype(str),
             format="%Y%j"
         )
     else:

{geocif-0.2.44 → geocif-0.2.46}/geocif/geocif.py

@@ -845,6 +845,7 @@ class Geocif:
             if self.model_name in ["gam", "linear"]:
                 for col in self.X_train.columns:
                     if self.X_train[col].isnull().any():
+                        breakpoint()
                         median = self.X_train[col].median()
                         self.X_train[col].fillna(median, inplace=True)
 

{geocif-0.2.44 → geocif-0.2.46}/geocif/indices_runner_angola.py

@@ -12,7 +12,7 @@ warnings.filterwarnings("ignore")
 from .cei import indices
 from geoprepare import base
 
-country = "angola"
+country = "algeria"
 
 
 def remove_duplicates(lst):

{geocif-0.2.44 → geocif-0.2.46}/geocif/playground/aa.py

@@ -2,28 +2,30 @@ import geopandas as gpd
 import pandas as pd
 import matplotlib.pyplot as plt
 import matplotlib as mpl
-
+from pathlib import Path
 
 import pandas as pd
 
-# Step 1: Read the CSV file
-input_file_path = r"C:\Users\ritvik\Downloads\observed_adjusted_detrended_woreda_yield (1).csv"
-df = pd.read_csv(input_file_path)
+DATA_DIR = Path(r"C:\Users\ritvik\Downloads\exported_all_db")
 
-# Step 2: Remove rows that are completely empty (all columns are NaN)
-df_cleaned = df.dropna(how='all')
+# Grab all maize CSV files (skip 'models.csv')
+csv_paths = sorted(DATA_DIR.glob("*_maize.csv"))
 
-# Step 3: Write the cleaned data back to a new CSV file
-output_file_path = r"C:\Users\ritvik\Downloads\observed_adjusted_detrended_woreda_yield_cleaned.csv"
-df_cleaned.to_csv(output_file_path, index=False)
+dfs = []
+for fp in csv_paths:
+    df = pd.read_csv(fp)
+    # Build the 'Country Region' column
+    df["Country Region"] = (
+        df["Country"].str.strip() + "_" + df["Region"].str.strip()
+    ).str.replace(r"\s+", "_", regex=True).str.lower()
+    dfs.append(df)
 
-# (Optional) Look at the first few rows of the cleaned DataFrame
-df_cleaned.head()
+# Concatenate everything
+df = pd.concat(dfs, ignore_index=True)
 
-breakpoint()
 # --- 1. Read data ---
 dg = gpd.read_file(r"D:\Users\ritvik\projects\GEOGLAM\safrica.shp")
-df = pd.read_csv(r"D:\Users\ritvik\projects\GEOGLAM\geocif_march_2025.csv")
+# df = pd.read_csv(r"D:\Users\ritvik\projects\GEOGLAM\geocif_march_2025.csv")
 
 # --- 2. Create the new "Country Region" column ---
 dg['Country Region'] = (
@@ -42,6 +44,15 @@ dg['Country Region'] = (
 # --- 3. Merge shapefile with CSV ---
 merged = dg.merge(df, left_on='Country Region', right_on='Country Region', how='right')
 
+# Compute '% Anomaly (2013-2017)' and '% Anomaly (2018-2022)' as (value - mean) / mean * 100
+merged['% Anomaly (2013-2017)'] = (
+    merged["Predicted Yield (tn per ha)"] - merged['Median Yield (tn per ha) (2013-2017)']
+) / merged['Median Yield (tn per ha) (2013-2017)'] * 100
+merged['% Anomaly (2018-2022)'] = (
+    merged["Predicted Yield (tn per ha)"] - merged['Median Yield (tn per ha) (2018-2022)']
+) / merged['Median Yield (tn per ha) (2018-2022)'] * 100
+
+
 # --- 4. Rename columns ---
 merged.rename(
     columns={
@@ -52,8 +63,12 @@ merged.rename(
 )
 
 # Optional: Write out merged shapefile
-merged.to_file(r"D:\Users\ritvik\projects\GEOGLAM\safrica_geocif_march_2025.shp")
+merged.to_file(r"D:\Users\ritvik\projects\GEOGLAM\safrica_geocif_may_2025.shp")
+
+# Output to CSV and exclude geometry
+merged.drop(columns='geometry').to_csv(r"D:\Users\ritvik\projects\GEOGLAM\safrica_geocif_may_2025.csv", index=False)
 
+breakpoint()
 # --- 5. Plot ---
 fig, ax = plt.subplots(1, 2, figsize=(20, 10))
 

{geocif-0.2.44 → geocif-0.2.46/geocif.egg-info}/PKG-INFO

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

{geocif-0.2.44 → geocif-0.2.46}/setup.py

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