fimeval 0.1.44__py3-none-any.whl → 0.1.45__py3-none-any.whl

fimeval/ContingencyMap/evaluationFIM.py

@@ -40,7 +40,6 @@ def evaluateFIM(
     Merged = []
     Unique = []
     FAR_values = []
-    Dice_values = []
 
     # Dynamically call the specified method
     method = globals().get(method)
@@ -255,7 +254,6 @@ def evaluateFIM(
                 FPR,
                 merged,
                 FAR,
-                Dice,
             ) = evaluationmetrics(out_image1, out_image2_resized)
 
             # Append values to the lists
@@ -275,7 +273,6 @@ def evaluateFIM(
             Merged.append(merged)
             Unique.append(unique_values)
             FAR_values.append(FAR)
-            Dice_values.append(Dice)
 
     results = {
         "CSI_values": csi_values,
@@ -294,7 +291,6 @@ def evaluateFIM(
         # 'Merged': Merged,
         #  'Unique': Unique
         "FAR_values": FAR_values,
-        "Dice_values": Dice_values,
     }
     for candidate_idx, candidate_path in enumerate(candidate_paths):
         candidate_BASENAME = os.path.splitext(os.path.basename(candidate_path))[0]

fimeval/ContingencyMap/metrics.py

@@ -7,21 +7,21 @@ def evaluationmetrics(out_image1, out_image2):
     unique_values, counts = np.unique(merged, return_counts=True)
     class_pixel_counts = dict(zip(unique_values, counts))
     class_pixel_counts
-    TN = class_pixel_counts[1]
-    FP = class_pixel_counts[2]
-    FN = class_pixel_counts[3]
-    TP = class_pixel_counts[4]
-    TPR = TP / (TP + FN)
-    FNR = FN / (TP + FN)
-    Acc = (TP + TN) / (TP + TN + FP + FN)
-    Prec = TP / (TP + FP)
-    sen = TP / (TP + FN)
-    F1_score = 2 * (Prec * sen) / (Prec + sen)
-    CSI = TP / (TP + FN + FP)
-    POD = TP / (TP + FN)
-    FPR = FP / (FP + TN)
-    FAR = FP / (TP + FP)
-    Dice = 2 * TP / (2 * TP + FP + FN)
+    TN = class_pixel_counts.get(1,0)
+    FP = class_pixel_counts.get(2,0)
+    FN = class_pixel_counts.get(3,0)
+    TP = class_pixel_counts.get(4,0)
+    epsilon = 1e-8
+    TPR = TP / (TP + FN+epsilon)
+    FNR = FN / (TP + FN+epsilon)
+    Acc = (TP + TN) / (TP + TN + FP + FN+epsilon)
+    Prec = TP / (TP + FP+epsilon)
+    sen = TP / (TP + FN+epsilon)
+    F1_score = 2 * (Prec * sen) / (Prec + sen+epsilon)
+    CSI = TP / (TP + FN + FP+epsilon)
+    POD = TP / (TP + FN+epsilon)
+    FPR = FP / (FP + TN+epsilon)
+    FAR = FP / (TP + FP+epsilon)
 
     return (
         unique_values,
@@ -40,5 +40,4 @@ def evaluationmetrics(out_image1, out_image2):
         FPR,
         merged,
         FAR,
-        Dice,
     )

{fimeval-0.1.44.dist-info → fimeval-0.1.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fimeval
-Version: 0.1.44
+Version: 0.1.45
 Summary: A Framework for Automatic Evaluation of Flood Inundation Mapping Predictions Evaluation
 License: GPLv3
 Author: Surface Dynamics Modeling Lab

{fimeval-0.1.44.dist-info → fimeval-0.1.45.dist-info}/RECORD

@@ -2,14 +2,14 @@ fimeval/BuildingFootprint/__init__.py,sha256=oP9YWLdo6ANzSQFxYLv7Ku_26AY5NkLNhZL
 fimeval/BuildingFootprint/evaluationwithBF.py,sha256=59XxVlMLD7Lj7iXirWZpz1p6eDwHOai26Kap7nyDEEQ,14520
 fimeval/ContingencyMap/PWBs3.py,sha256=YAg03jzdplYIstG-pZM1MECse7gYjWrJNKAopjgt3uk,1294
 fimeval/ContingencyMap/__init__.py,sha256=ckps2dyg6aci3TA-3P7oTMcCAcSTz9AA6sndHtZEwdE,259
-fimeval/ContingencyMap/evaluationFIM.py,sha256=cTfVzcV4sVu3n6wZF4NjhSPHzqhrrEbV02cfqkC39Kk,15669
+fimeval/ContingencyMap/evaluationFIM.py,sha256=8oRWG1pcjX3t_i7jtlfYgk4cLQ7BixlkU-0P5cvBQUM,15553
 fimeval/ContingencyMap/methods.py,sha256=kbutfo9FUH-yjvnOXxwLpdErUuebMJ8NjCroNWIYCjo,3299
-fimeval/ContingencyMap/metrics.py,sha256=xVOgcgjDX1hGDPQgLaUCiBtuwH-smXELo5vOKhrujZc,1000
+fimeval/ContingencyMap/metrics.py,sha256=eEv1zAfmIjyg9OWM1b6-i25q_3jEBmeLZ7JeuvxS1QI,1070
 fimeval/ContingencyMap/plotevaluationmetrics.py,sha256=3bKfPKZnMR39dA3teDVpQBeTFKnF9v_2Vku0JNVGggs,3921
 fimeval/ContingencyMap/printcontingency.py,sha256=u46MF2DEo6Kt1w7Xks6BoW1fOO4byy8B0g7RVWYWhkY,5399
 fimeval/__init__.py,sha256=kN114EvzG_BFjd65fKWXg29TqaWvR173EdCN3yj30oc,433
 fimeval/utilis.py,sha256=7S4ef_6rVKKZ1rrCe2ewxuNHapDJmtBcv_1jflteVUw,7386
-fimeval-0.1.44.dist-info/LICENSE.txt,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-fimeval-0.1.44.dist-info/METADATA,sha256=1RsMsX0StXpzxiZpLY84k3jTjY0LnoQQrJIFyTUNDPE,14848
-fimeval-0.1.44.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-fimeval-0.1.44.dist-info/RECORD,,
+fimeval-0.1.45.dist-info/LICENSE.txt,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+fimeval-0.1.45.dist-info/METADATA,sha256=jW53sD-fK0v0godbonnrbe50sdlr0BOcJc2oLNH0TNI,14848
+fimeval-0.1.45.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+fimeval-0.1.45.dist-info/RECORD,,