Updating test distance to map figure 2.10

Author: Carole Sudre

MetricsReloaded/metrics/pairwise_measures.py

@@ -1170,6 +1170,7 @@ def normalised_surface_distance(self):
         if "nsd" in self.dict_args.keys():
             tau = self.dict_args["nsd"]
         else:
+            warnings.warn('No value set up for NSD tolerance - default to 1')
             tau = 1
         dist_ref, dist_pred, border_ref, border_pred = self.border_distance()
         reg_ref = np.where(
@@ -1178,8 +1179,11 @@ def normalised_surface_distance(self):
         reg_pred = np.where(
             dist_pred <= tau, np.ones_like(dist_pred), np.zeros_like(dist_pred)
         )
+        # print(np.sum(border_pred),np.sum(reg_ref),np.sum(border_ref),np.sum(reg_pred))
+        # print(np.sum(border_pred*reg_ref),np.sum(border_ref*reg_pred))
         numerator = np.sum(border_pred * reg_ref) + np.sum(border_ref * reg_pred)
         denominator = np.sum(border_ref) + np.sum(border_pred)
+        # print(numerator, denominator, tau)
         return numerator / denominator
 
     def measured_distance(self):

test/test_metrics/test_pairwise_measures.py

@@ -751,7 +751,25 @@ def test_masd_s210():
     assert_allclose(masd_1,expected_masd1,atol=0.01)
     assert_allclose(masd_2,expected_masd2,atol=0.01)
 
+def test_assd_s210():
+    assd_1 = ppm210_1.measured_average_distance()
+    assd_2 = ppm210_2.measured_average_distance()
+    expected_assd1 = 1.10
+    expected_assd2 = 1.05
+    assert_allclose(assd_1, expected_assd1,atol=0.01)
+    assert_allclose(assd_2, expected_assd2,atol=0.01)
 
+def test_nsd_s210():
+    """
+    Using Figure 2.10 as illustrative example
+    """
+    nsd_1 = ppm210_1.normalised_surface_distance()
+    nsd_2 = ppm210_2.normalised_surface_distance()
+    expected_nsd1 = 0.75
+    expected_nsd2 = 0.875
+    print(nsd_1,nsd_2)
+    assert_allclose(nsd_1,expected_nsd1,atol=0.01)
+    assert_allclose(nsd_2,expected_nsd2,atol=0.01)
 
 def test_hd():
     f20_ref = np.zeros([14, 14])