Skip to content

3648 Enhance correct centers for crop #3652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nic-Ma merged 10 commits into from
Jan 13, 2022
Merged

3648 Enhance correct centers for crop #3652

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
42a45e0
Merge pull request #19 from Project-MONAI/master
Nic-Ma Feb 1, 2021
cd16a13
Merge pull request #32 from Project-MONAI/master
Nic-Ma Feb 24, 2021
6f87afd
Merge pull request #180 from Project-MONAI/dev
Nic-Ma Jul 22, 2021
f398298
Merge pull request #214 from Project-MONAI/dev
Nic-Ma Sep 8, 2021
26f2206
Merge pull request #348 from Project-MONAI/dev
Nic-Ma Jan 12, 2022
daaf0ec
[DLMED] add missing doc-string
Nic-Ma Jan 12, 2022
702580b
Merge pull request #350 from Nic-Ma/3645-add-doc-string
Nic-Ma Jan 13, 2022
1e68968
[DLMED] enhance correct centers
Nic-Ma Jan 13, 2022
77409d5
Merge branch 'dev' into enhance-correct-centers
Nic-Ma Jan 13, 2022
ab0ae3b
Merge branch 'dev' into enhance-correct-centers
Nic-Ma Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions monai/transforms/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def weighted_patch_samples(


def correct_crop_centers(
centers: Union[NdarrayOrTensor, List[NdarrayOrTensor]],
centers: List[int],
spatial_size: Union[Sequence[int], int],
label_spatial_shape: Sequence[int],
allow_smaller: bool = False,
Expand Down Expand Up @@ -446,8 +446,7 @@ def correct_crop_centers(
valid_end[i] += 1
valid_centers = []
for c, v_s, v_e in zip(centers, valid_start, valid_end):
_c = int(convert_data_type(c, np.ndarray)[0]) # type: ignore
center_i = min(max(_c, v_s), v_e - 1)
center_i = min(max(c, v_s), v_e - 1)
valid_centers.append(int(center_i))
return valid_centers

Expand Down Expand Up @@ -503,7 +502,7 @@ def generate_pos_neg_label_crop_centers(
indices_to_use = fg_indices if rand_state.rand() < pos_ratio else bg_indices
random_int = rand_state.randint(len(indices_to_use))
idx = indices_to_use[random_int]
center = unravel_index(idx, label_spatial_shape)
center = unravel_index(idx, label_spatial_shape).tolist()
# shift center to range of valid centers
centers.append(correct_crop_centers(center, spatial_size, label_spatial_shape, allow_smaller))

Expand Down Expand Up @@ -558,10 +557,9 @@ def generate_label_classes_crop_centers(
# randomly select the indices of a class based on the ratios
indices_to_use = indices[i]
random_int = rand_state.randint(len(indices_to_use))
center = unravel_index(indices_to_use[random_int], label_spatial_shape)
center = unravel_index(indices_to_use[random_int], label_spatial_shape).tolist()
# shift center to range of valid centers
center_ori = list(center)
centers.append(correct_crop_centers(center_ori, spatial_size, label_spatial_shape, allow_smaller))
centers.append(correct_crop_centers(center, spatial_size, label_spatial_shape, allow_smaller))

return centers

Expand Down