fimeval 0.1.55__tar.gz → 0.1.56__tar.gz

{fimeval-0.1.55 → fimeval-0.1.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fimeval
-Version: 0.1.55
+Version: 0.1.56
 Summary: A Framework for Automatic Evaluation of Flood Inundation Mapping Predictions Evaluation
 Author: Surface Dynamics Modeling Lab
 Author-email: Supath Dhital <sdhital@crimson.ua.edu>, Dipshika Devi <ddevi@ua.edu>

{fimeval-0.1.55 → fimeval-0.1.56}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fimeval"
-version = "0.1.55"
+version = "0.1.56"
 description = "A Framework for Automatic Evaluation of Flood Inundation Mapping Predictions Evaluation"
 readme = "README.md"
 requires-python = ">=3.10"

{fimeval-0.1.55 → fimeval-0.1.56}/src/fimeval/BuildingFootprint/evaluationwithBF.py

@@ -8,6 +8,7 @@ from plotly.subplots import make_subplots
 import plotly.graph_objects as go
 import seaborn as sns
 import matplotlib.pyplot as plt
+import matplotlib.gridspec as gridspec
 
 
 def Changeintogpkg(input_path, output_dir, layer_name):
@@ -21,8 +22,8 @@ def Changeintogpkg(input_path, output_dir, layer_name):
         output_gpkg = os.path.join(output_dir, f"{layer_name}.gpkg")
         gdf.to_file(output_gpkg, driver="GPKG")
         return output_gpkg
-    
-    
+
+
 def GetFloodedBuildingCountInfo(
     building_fp_path,
     study_area_path,
@@ -76,8 +77,12 @@ def GetFloodedBuildingCountInfo(
 
     count_centroids_in_contingency(contingency_map)
 
-    centroid_counts["Candidate"] = centroid_counts["True Positive"] + centroid_counts["False Positive"]
-    centroid_counts["Benchmark"] = centroid_counts["True Positive"] + centroid_counts["False Negative"]
+    centroid_counts["Candidate"] = (
+        centroid_counts["True Positive"] + centroid_counts["False Positive"]
+    )
+    centroid_counts["Benchmark"] = (
+        centroid_counts["True Positive"] + centroid_counts["False Negative"]
+    )
 
     total_buildings = len(clipped_buildings)
     percentages = {
@@ -93,7 +98,9 @@ def GetFloodedBuildingCountInfo(
     FAR = FP / (TP + FP) if (TP + FP) > 0 else 0
     POD = TP / (TP + FN) if (TP + FN) > 0 else 0
     if centroid_counts["Benchmark"] > 0:
-        BDR = (centroid_counts["Candidate"] - centroid_counts["Benchmark"]) / centroid_counts["Benchmark"]
+        BDR = (
+            centroid_counts["Candidate"] - centroid_counts["Benchmark"]
+        ) / centroid_counts["Benchmark"]
     else:
         BDR = 0
 
@@ -122,7 +129,9 @@ def GetFloodedBuildingCountInfo(
         ],
     }
     counts_df = pd.DataFrame(counts_data)
-    csv_file_path = os.path.join(save_dir, "EvaluationMetrics", f"BuildingCounts_{basename}.csv")
+    csv_file_path = os.path.join(
+        save_dir, "EvaluationMetrics", f"BuildingCounts_{basename}.csv"
+    )
     os.makedirs(os.path.dirname(csv_file_path), exist_ok=True)
     counts_df.to_csv(csv_file_path, index=False)
 
@@ -135,98 +144,146 @@ def GetFloodedBuildingCountInfo(
     ]
 
     fig = make_subplots(
-        rows=1, cols=2,
-        subplot_titles=("Building Counts on Different FIMs", "Contingency Flooded Building Counts"),
+        rows=1,
+        cols=2,
+        subplot_titles=(
+            "Building Counts on Different FIMs",
+            "Contingency Flooded Building Counts",
+        ),
     )
 
     fig.add_trace(
         go.Bar(
-            x=["Candidate"], y=[centroid_counts["Candidate"]],
-            text=[f"{centroid_counts['Candidate']}"], textposition="auto",
-            marker_color="#1c83eb", marker_line_color="black", marker_line_width=1,
+            x=["Candidate"],
+            y=[centroid_counts["Candidate"]],
+            text=[f"{centroid_counts['Candidate']}"],
+            textposition="auto",
+            marker_color="#1c83eb",
+            marker_line_color="black",
+            marker_line_width=1,
             name=f"Candidate ({percentages['Candidate']:.2f}%)",
         ),
-        row=1, col=1,
+        row=1,
+        col=1,
     )
     fig.add_trace(
         go.Bar(
-            x=["Benchmark"], y=[centroid_counts["Benchmark"]],
-            text=[f"{centroid_counts['Benchmark']}"], textposition="auto",
-            marker_color="#a4490e", marker_line_color="black", marker_line_width=1,
+            x=["Benchmark"],
+            y=[centroid_counts["Benchmark"]],
+            text=[f"{centroid_counts['Benchmark']}"],
+            textposition="auto",
+            marker_color="#a4490e",
+            marker_line_color="black",
+            marker_line_width=1,
             name=f"Benchmark ({percentages['Benchmark']:.2f}%)",
         ),
-        row=1, col=1,
+        row=1,
+        col=1,
     )
 
     for i, label in enumerate(third_raster_labels):
         fig.add_trace(
             go.Bar(
-                x=[label], y=[third_raster_counts[i]],
-                text=[f"{third_raster_counts[i]}"], textposition="auto",
+                x=[label],
+                y=[third_raster_counts[i]],
+                text=[f"{third_raster_counts[i]}"],
+                textposition="auto",
                 marker_color=["#ff5733", "#ffc300", "#28a745"][i],
-                marker_line_color="black", marker_line_width=1,
+                marker_line_color="black",
+                marker_line_width=1,
                 name=f"{label} ({percentages[label]:.2f}%)",
             ),
-            row=1, col=2,
+            row=1,
+            col=2,
         )
 
     fig.update_layout(
         title="Flooded Building Counts",
         xaxis_title="Inundation Surface",
         yaxis_title="Flooded Building Counts",
-        width=1100, height=400,
-        plot_bgcolor="rgba(0,0,0,0)", paper_bgcolor="rgba(0,0,0,0)",
-        showlegend=True, font=dict(family="Arial", size=18, color="black"),
+        width=1100,
+        height=400,
+        plot_bgcolor="rgba(0,0,0,0)",
+        paper_bgcolor="rgba(0,0,0,0)",
+        showlegend=True,
+        font=dict(family="Arial", size=18, color="black"),
     )
     fig.show()
 
-    # Seaborn for static PNG saving only
-    df_left = pd.DataFrame({
-        "Category": ["Candidate", "Benchmark"],
-        "Count": [centroid_counts["Candidate"], centroid_counts["Benchmark"]],
-    })
-    df_right = pd.DataFrame({
-        "Category": third_raster_labels,
-        "Count": third_raster_counts,
-    })
+    # Seaborn for static PNG
+    df_left = pd.DataFrame(
+        {
+            "Category": ["Candidate", "Benchmark"],
+            "Count": [centroid_counts["Candidate"], centroid_counts["Benchmark"]],
+        }
+    )
+    df_right = pd.DataFrame(
+        {
+            "Category": third_raster_labels,
+            "Count": third_raster_counts,
+        }
+    )
 
     sns.set_theme(style="whitegrid")
-    fig_sb, axes = plt.subplots(1, 2, figsize=(8, 3), constrained_layout=True)
+
+    fig_sb = plt.figure(figsize=(10, 3), constrained_layout=True)
+    gs = gridspec.GridSpec(1, 3, figure=fig_sb, width_ratios=[1, 1, 0.4])
+
+    ax0 = fig_sb.add_subplot(gs[0, 0])
+    ax1 = fig_sb.add_subplot(gs[0, 1])
+    ax_leg = fig_sb.add_subplot(gs[0, 2])
+    ax_leg.axis("off")
 
     def style_axes(ax, title_text, xlab, show_ylabel: bool):
-        # Adding a bit of padding so bar labels don’t overlap with the title
-        ax.set_title(title_text, fontsize=16, pad=20)
-        ax.set_xlabel(xlab, fontsize=14, color="black")
+        ax.set_title(title_text, fontsize=14, pad=15)
+        ax.set_xlabel(xlab, fontsize=13, color="black")
         if show_ylabel:
-            ax.set_ylabel("Flooded Building Counts", fontsize=14, color="black")
+            ax.set_ylabel("Flooded Building Counts", fontsize=13, color="black")
         else:
             ax.set_ylabel("")
 
-        # Thicker black left/bottom spines
         for spine in ("left", "bottom"):
             ax.spines[spine].set_linewidth(1.5)
             ax.spines[spine].set_color("black")
 
         sns.despine(ax=ax, right=True, top=True)
-        ax.tick_params(axis="x", labelsize=12, colors="black")
-        ax.tick_params(axis="y", labelsize=12, colors="black")
+        ax.tick_params(axis="x", labelsize=11, colors="black")
+        ax.tick_params(axis="y", labelsize=11, colors="black")
 
     # Left panel
-    ax0 = axes[0]
-    sns.barplot(data=df_left, x="Category", y="Count", ax=ax0,
-                palette=["#1c83eb", "#a4490e"])
-    style_axes(ax0, "Building Counts on Different FIMs", "Inundation Surface", show_ylabel=True)
+    colors_left = ["#1c83eb", "#a4490e"]
+    sns.barplot(data=df_left, x="Category", y="Count", ax=ax0, palette=colors_left)
+    style_axes(ax0, "Building Counts on Different FIMs", "Inundation Surface", True)
     for c in ax0.containers:
-        ax0.bar_label(c, fmt="%.0f", label_type="edge", padding=3, fontsize=14, color="black")
+        ax0.bar_label(
+            c, fmt="%.0f", label_type="edge", padding=3, fontsize=12, color="black"
+        )
 
     # Right panel
-    ax1 = axes[1]
-    sns.barplot(data=df_right, x="Category", y="Count", ax=ax1,
-                palette=["#ff5733", "#ffc300", "#28a745"])
-    style_axes(ax1, "Contingency Flooded Building Counts", "Category", show_ylabel=False)
+    colors_right = ["#ff5733", "#ffc300", "#28a745"]
+    sns.barplot(data=df_right, x="Category", y="Count", ax=ax1, palette=colors_right)
+    style_axes(ax1, "Contingency Flooded Building Counts", "Category", False)
     for c in ax1.containers:
-        ax1.bar_label(c, fmt="%.0f", label_type="edge", padding=3, fontsize=14, color="black")
+        ax1.bar_label(
+            c, fmt="%.0f", label_type="edge", padding=3, fontsize=12, color="black"
+        )
 
+    # Combined legend
+    all_labels = ["Candidate", "Benchmark"] + third_raster_labels
+    all_colors = colors_left + colors_right
+    legend_handles = [
+        plt.Line2D(
+            [0],
+            [0],
+            marker="s",
+            color="w",
+            markerfacecolor=all_colors[i],
+            markersize=12,
+            label=f"{all_labels[i]} ({percentages[all_labels[i]]:.2f}%)",
+        )
+        for i in range(len(all_labels))
+    ]
+    ax_leg.legend(handles=legend_handles, fontsize=12, loc="center left", frameon=True)
     plot_dir = os.path.join(save_dir, "FinalPlots")
     os.makedirs(plot_dir, exist_ok=True)
     output_path = os.path.join(plot_dir, f"BuildingCounts_{basename}.png")
@@ -236,8 +293,6 @@ def GetFloodedBuildingCountInfo(
     print(f"PNG were saved in : {output_path}")
 
 
-    
-
 def process_TIFF(
     tif_files, contingency_files, building_footprint, boundary, method_path
 ):

{fimeval-0.1.55 → fimeval-0.1.56}/src/fimeval/ContingencyMap/evaluationFIM.py

@@ -277,7 +277,8 @@ def evaluateFIM(
                                 out_transform1,
                             )
                             merged = out_image1 + out_image2_resized
-
+                            merged[merged==7] = 5 
+                            
             # Get Evaluation Metrics
             (
                 unique_values,

{fimeval-0.1.55 → fimeval-0.1.56}/src/fimeval/ContingencyMap/plotevaluationmetrics.py

@@ -12,19 +12,21 @@ def PlotMetrics(csv_path, method_path):
 
     # Keep only the desired metrics
     metrics = metrics_df.loc[
-        metrics_df["Metrics"].isin([
-            "CSI_values", "POD_values", "Acc_values", "Prec_values", "F1_values"
-        ])
+        metrics_df["Metrics"].isin(
+            ["CSI_values", "POD_values", "Acc_values", "Prec_values", "F1_values"]
+        )
     ].copy()
 
     # Rename for presentation
-    metrics["Metrics"] = metrics["Metrics"].replace({
-        "CSI_values": "CSI",
-        "POD_values": "POD",
-        "Acc_values": "Accuracy",
-        "Prec_values": "Precision",
-        "F1_values": "F1 Score",
-    })
+    metrics["Metrics"] = metrics["Metrics"].replace(
+        {
+            "CSI_values": "CSI",
+            "POD_values": "POD",
+            "Acc_values": "Accuracy",
+            "Prec_values": "Precision",
+            "F1_values": "F1 Score",
+        }
+    )
 
     value_columns = metrics.select_dtypes(include="number").columns
 
@@ -44,7 +46,7 @@ def PlotMetrics(csv_path, method_path):
             color="Metrics",
             orientation="h",
             color_discrete_sequence=px.colors.qualitative.Set2,
-            title=f"Performance Metrics"
+            title=f"Performance Metrics",
         )
         fig_plotly.update_traces(texttemplate="%{text:.2f}", textposition="outside")
         fig_plotly.update_layout(
@@ -67,34 +69,36 @@ def PlotMetrics(csv_path, method_path):
             data=metrics,
             x=value_column,
             y="Metrics",
-            hue="Metrics", 
+            hue="Metrics",
             palette="Set2",
             ax=ax,
             dodge=False,
-            legend=False
+            legend=False,
         )
 
         # Annotate bars
         for container in ax.containers:
-            ax.bar_label(container, fmt='%.2f', label_type='edge', fontsize=14)
+            ax.bar_label(container, fmt="%.2f", label_type="edge", fontsize=14)
 
         # Styling
         ax.set_title("Performance Metrics", fontsize=16)
-        ax.set_xlabel("Score", fontsize=16, color="black")   # just bigger, not bold
+        ax.set_xlabel("Score", fontsize=16, color="black")  # just bigger, not bold
         ax.set_ylabel("Metrics", fontsize=16, color="black")
 
-        ax.set_xticks([i/10 for i in range(0, 11, 2)])
-        ax.set_xticklabels([f"{i/10:.1f}" for i in range(0, 11, 2)], fontsize=14, color="black")
+        ax.set_xticks([i / 10 for i in range(0, 11, 2)])
+        ax.set_xticklabels(
+            [f"{i/10:.1f}" for i in range(0, 11, 2)], fontsize=14, color="black"
+        )
 
         # Increase y-tick label font size
         ax.tick_params(axis="y", labelsize=12, colors="black")
         ax.tick_params(axis="x", labelsize=14, colors="black")
 
         # Force spines black + thicker
-        ax.spines['left'].set_linewidth(1.5)
-        ax.spines['bottom'].set_linewidth(1.5)
-        ax.spines['left'].set_color("black")
-        ax.spines['bottom'].set_color("black")
+        ax.spines["left"].set_linewidth(1.5)
+        ax.spines["bottom"].set_linewidth(1.5)
+        ax.spines["left"].set_color("black")
+        ax.spines["bottom"].set_color("black")
 
         sns.despine(right=True, top=True)
 

{fimeval-0.1.55 → fimeval-0.1.56}/src/fimeval.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fimeval
-Version: 0.1.55
+Version: 0.1.56
 Summary: A Framework for Automatic Evaluation of Flood Inundation Mapping Predictions Evaluation
 Author: Surface Dynamics Modeling Lab
 Author-email: Supath Dhital <sdhital@crimson.ua.edu>, Dipshika Devi <ddevi@ua.edu>

{fimeval-0.1.55 → fimeval-0.1.56}/tests/test_evaluationfim.py

@@ -3,12 +3,10 @@ from pathlib import Path
 
 Main_dir = (
     # "../docs/sampledata"
-    "/Users/supath/Downloads/MSResearch/FIMpef/fimpef/docs/sampledata"
 )
 PWD_dir = "./path/to/PWB"
 output_dir = (
     # "./path/to/output"  # This is the output directory where the results will be saved
-    "/Users/supath/Downloads/MSResearch/FIMpef/fimpef/docs/output"
 )
 target_crs = "EPSG:5070"  # Target CRS for reprojecting the FIMs, need to be in EPSG code of Projected CRS
 target_resolution = 10  # This will be in meters, if it passes the FIMS will be resampled to this resolution else, it will find the coarser resolution among all FIMS for this case and use that to resample!