From 5fa92ff2c739dbb4cbe20659a688c9e0b19374ba Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Wed, 14 Apr 2021 23:47:45 +0800 Subject: [PATCH 1/3] [DLMED] enhance unit tests Signed-off-by: Nic Ma --- tests/test_map_label_value.py | 17 ++++++++++++++++- ...ency_inferer.py => test_saliency_inferer.py} | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) rename tests/{test_sailency_inferer.py => test_saliency_inferer.py} (97%) diff --git a/tests/test_map_label_value.py b/tests/test_map_label_value.py index 98412ab800..0d032510fb 100644 --- a/tests/test_map_label_value.py +++ b/tests/test_map_label_value.py @@ -58,9 +58,24 @@ np.array([["label0", "label2"], ["label2", "label1"]]), ] +TEST_CASE_8 = [ + {"orig_labels": ["label3", "label2", "label1"], "target_labels": ["label1", "label2", "label3"], "dtype": "str"}, + np.array([["label3", "label1"], ["label1", "label2"]]), + np.array([["label1", "label3"], ["label3", "label2"]]), +] + class TestMapLabelValue(unittest.TestCase): - @parameterized.expand([TEST_CASE_1, TEST_CASE_2, TEST_CASE_3, TEST_CASE_4, TEST_CASE_5, TEST_CASE_6, TEST_CASE_7]) + @parameterized.expand([ + TEST_CASE_1, + TEST_CASE_2, + TEST_CASE_3, + TEST_CASE_4, + TEST_CASE_5, + TEST_CASE_6, + TEST_CASE_7, + TEST_CASE_8, + ]) def test_shape(self, input_param, input_data, expected_value): result = MapLabelValue(**input_param)(input_data) np.testing.assert_equal(result, expected_value) diff --git a/tests/test_sailency_inferer.py b/tests/test_saliency_inferer.py similarity index 97% rename from tests/test_sailency_inferer.py rename to tests/test_saliency_inferer.py index 276bc7816c..416b7170ae 100644 --- a/tests/test_sailency_inferer.py +++ b/tests/test_saliency_inferer.py @@ -25,7 +25,7 @@ TEST_CASE_3 = ["GradCAMpp"] -class TestGradientClassActivationMap(unittest.TestCase): +class TestSaliencyInferer(unittest.TestCase): @parameterized.expand([TEST_CASE_1, TEST_CASE_2, TEST_CASE_3]) def test_shape(self, cam_name): model = DenseNet( From 70fa20e95eef6c2ed9835a69d5afd7729aa31f65 Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Thu, 15 Apr 2021 00:38:31 +0800 Subject: [PATCH 2/3] [DLMED] add more check Signed-off-by: Nic Ma --- monai/transforms/utility/array.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/monai/transforms/utility/array.py b/monai/transforms/utility/array.py index 8f060eed13..6232b15d02 100644 --- a/monai/transforms/utility/array.py +++ b/monai/transforms/utility/array.py @@ -777,6 +777,9 @@ def __init__(self, orig_labels: Sequence, target_labels: Sequence, dtype: DtypeL """ if len(orig_labels) != len(target_labels): raise ValueError("orig_labels and target_labels must have the same length.") + if all([o == z for o, z in zip(orig_labels, target_labels)]): + raise ValueError("orig_labels and target_labels are exactly the same, should be different to map.") + self.orig_labels = orig_labels self.target_labels = target_labels self.dtype = dtype From 84108f5658747dbad8185bab8f7ffe233604462b Mon Sep 17 00:00:00 2001 From: monai-bot Date: Wed, 14 Apr 2021 16:42:48 +0000 Subject: [PATCH 3/3] [MONAI] python code formatting Signed-off-by: monai-bot --- tests/test_map_label_value.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/test_map_label_value.py b/tests/test_map_label_value.py index 0d032510fb..ff1d7d1eef 100644 --- a/tests/test_map_label_value.py +++ b/tests/test_map_label_value.py @@ -66,16 +66,18 @@ class TestMapLabelValue(unittest.TestCase): - @parameterized.expand([ - TEST_CASE_1, - TEST_CASE_2, - TEST_CASE_3, - TEST_CASE_4, - TEST_CASE_5, - TEST_CASE_6, - TEST_CASE_7, - TEST_CASE_8, - ]) + @parameterized.expand( + [ + TEST_CASE_1, + TEST_CASE_2, + TEST_CASE_3, + TEST_CASE_4, + TEST_CASE_5, + TEST_CASE_6, + TEST_CASE_7, + TEST_CASE_8, + ] + ) def test_shape(self, input_param, input_data, expected_value): result = MapLabelValue(**input_param)(input_data) np.testing.assert_equal(result, expected_value)