From 761d5d2449f7f5226aaf23afd6afc2563e120a41 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 11:20:14 +0000 Subject: [PATCH] Replace multiple `==` checks with `in` --- monai/apps/pathology/transforms/post/array.py | 6 +++--- monai/networks/blocks/patchembedding.py | 2 +- monai/networks/nets/swin_unetr.py | 2 +- tests/test_tile_on_grid.py | 2 +- tests/test_tile_on_grid_dict.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monai/apps/pathology/transforms/post/array.py b/monai/apps/pathology/transforms/post/array.py index 6f8fd09c8a..ec0a7a7476 100644 --- a/monai/apps/pathology/transforms/post/array.py +++ b/monai/apps/pathology/transforms/post/array.py @@ -361,13 +361,13 @@ def _generate_contour_coord(self, current: np.ndarray, previous: np.ndarray) -> p_delta = (current[0] - previous[0], current[1] - previous[1]) - if p_delta == (0.0, 1.0) or p_delta == (0.5, 0.5) or p_delta == (1.0, 0.0): + if p_delta in ((0.0, 1.0), (0.5, 0.5), (1.0, 0.0)): row = int(current[0] + 0.5) col = int(current[1]) - elif p_delta == (0.0, -1.0) or p_delta == (0.5, -0.5): + elif p_delta in ((0.0, -1.0), (0.5, -0.5)): row = int(current[0]) col = int(current[1]) - elif p_delta == (-1, 0.0) or p_delta == (-0.5, -0.5): + elif p_delta in ((-1, 0.0), (-0.5, -0.5)): row = int(current[0]) col = int(current[1] + 0.5) elif p_delta == (-0.5, 0.5): diff --git a/monai/networks/blocks/patchembedding.py b/monai/networks/blocks/patchembedding.py index 89e9a6a24f..d3456872db 100644 --- a/monai/networks/blocks/patchembedding.py +++ b/monai/networks/blocks/patchembedding.py @@ -154,7 +154,7 @@ def __init__( super().__init__() - if not (spatial_dims == 2 or spatial_dims == 3): + if not spatial_dims in (2, 3): raise ValueError("spatial dimension should be 2 or 3.") patch_size = ensure_tuple_rep(patch_size, spatial_dims) diff --git a/monai/networks/nets/swin_unetr.py b/monai/networks/nets/swin_unetr.py index 933ed06f7f..df2c20de34 100644 --- a/monai/networks/nets/swin_unetr.py +++ b/monai/networks/nets/swin_unetr.py @@ -102,7 +102,7 @@ def __init__( patch_size = ensure_tuple_rep(2, spatial_dims) window_size = ensure_tuple_rep(7, spatial_dims) - if not (spatial_dims == 2 or spatial_dims == 3): + if not spatial_dims in (2, 3): raise ValueError("spatial dimension should be 2 or 3.") for m, p in zip(img_size, patch_size): diff --git a/tests/test_tile_on_grid.py b/tests/test_tile_on_grid.py index 09434de5e0..4aca252350 100644 --- a/tests/test_tile_on_grid.py +++ b/tests/test_tile_on_grid.py @@ -107,7 +107,7 @@ def make_image( tiles = np.stack(tiles_list, axis=0) - if (filter_mode == "min" or filter_mode == "max") and len(tiles) > tile_count**2: + if filter_mode in ("min", "max") and len(tiles) > tile_count**2: tiles = tiles[np.argsort(tiles.sum(axis=(1, 2, 3)))] return imlarge, tiles diff --git a/tests/test_tile_on_grid_dict.py b/tests/test_tile_on_grid_dict.py index c6f35fe738..fa94dd0a70 100644 --- a/tests/test_tile_on_grid_dict.py +++ b/tests/test_tile_on_grid_dict.py @@ -116,7 +116,7 @@ def make_image( tiles = np.stack(tiles_list, axis=0) - if (filter_mode == "min" or filter_mode == "max") and len(tiles) > tile_count**2: + if filter_mode in ("min", "max") and len(tiles) > tile_count**2: tiles = tiles[np.argsort(tiles.sum(axis=(1, 2, 3)))] return imlarge, tiles