Setting default to nan in case of one ref or prediction empty for distance metrics

Author: Carole Sudre

MetricsReloaded/metrics/pairwise_measures.py

@@ -1200,6 +1200,7 @@ def measured_distance(self):
         and masd
 
         """
+     
         if "hd_perc" in self.dict_args.keys():
             perc = self.dict_args["hd_perc"]
         else:
@@ -1209,7 +1210,7 @@ def measured_distance(self):
             warnings.warn("Prediction and reference empty - distances set to 0")
             return 0, 0, 0, 0
         if np.sum(self.pred) == 0 and np.sum(self.ref)>0:
-            warnings.warn("Prediction empty but reference not empty - need to set to worse case")
+            warnings.warn("Prediction empty but reference not empty - need to set to worse case in aggregation")
             return np.nan, np.nan, np.nan, np.nan
         if np.sum(self.ref) == 0 and np.sum(self.pred)>0:
             warnings.warn('Prediction not empty but reference empty - non existing output - need be set to WORSE case in aggregation')
@@ -1220,7 +1221,7 @@ def measured_distance(self):
             ref_border,
             pred_border,
         ) = self.border_distance()
-        print(ref_border_dist)
+        # print(ref_border_dist)
         average_distance = (np.sum(ref_border_dist) + np.sum(pred_border_dist)) / (
             np.sum(pred_border + ref_border)
         )

test/test_metrics/test_pairwise_measures.py

@@ -834,6 +834,30 @@ def test_hausdorff_distance_5c():
         hausdorff_distance_perc, expected_hausdorff_distance_perc, atol=0.01
     )
 
+def test_distance_empty_ref():
+    ppm1 = PM(pred29_1, ref29_1*0)
+    hd, hd_perc, masd, assd = ppm1.measured_distance()
+    assert np.isnan(hd)
+    assert np.isnan(hd_perc)
+    assert np.isnan(masd)
+    assert np.isnan(assd)
+
+def test_distance_empty_pred():
+    ppm1 = PM(pred29_1*0, ref29_1)
+    hd, hd_perc, masd, assd = ppm1.measured_distance()
+    assert np.isnan(hd)
+    assert np.isnan(hd_perc)
+    assert np.isnan(masd)
+    assert np.isnan(assd)
+
+
+def test_distance_empty_pred_and_ref():
+    ppm1 = PM(pred29_1*0, ref29_1*0)
+    hd, hd_perc, masd, assd = ppm1.measured_distance()
+    assert hd == 0
+    assert hd_perc == 0
+    assert masd == 0
+    assert assd == 0
 
 def test_boundary_iou():
     """