-
Notifications
You must be signed in to change notification settings - Fork 1.4k
9 intensity normalisation transform #25
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
41fd036
[DLMED] implement intensity normalization transform
Nic-Ma e31ec10
9 part a adding test intensity normalisation transform (#33)
wyli 70e675d
Merge branch 'master' into 9-intensity-normalisation-transform
wyli a2a4e23
[DLMED] simplify intensity normalization transform for MVP
Nic-Ma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| # Copyright 2020 MONAI Consortium | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import numpy as np | ||
| import monai | ||
|
|
||
| export = monai.utils.export("monai.data.transforms") | ||
|
|
||
|
|
||
| @export | ||
| class IntensityNormalizer: | ||
| """Normalize input based on provided args, using calculated mean and std if not provided | ||
| (shape of subtrahend and divisor must match. if 0, entire volume uses same subtrahend and | ||
| divisor, otherwise the shape can have dimension 1 for channels). | ||
| Current implementation can only support 'channel_last' format data. | ||
|
|
||
| Args: | ||
| subtrahend (ndarray): the amount to subtract by (usually the mean) | ||
| divisor (ndarray): the amount to divide by (usually the standard deviation) | ||
| dtype: output data format | ||
| """ | ||
|
|
||
| def __init__(self, subtrahend=None, divisor=None, dtype=np.float32): | ||
| if subtrahend is not None or divisor is not None: | ||
| assert isinstance(subtrahend, np.ndarray) and isinstance(divisor, np.ndarray), \ | ||
| 'subtrahend and divisor must be set in pair and in numpy array.' | ||
| self.subtrahend = subtrahend | ||
| self.divisor = divisor | ||
| self.dtype = dtype | ||
|
|
||
| def __call__(self, img): | ||
| if self.subtrahend is not None and self.divisor is not None: | ||
| img -= self.subtrahend | ||
| img /= self.divisor | ||
| else: | ||
| img -= np.mean(img) | ||
| img /= np.std(img) | ||
|
|
||
| if self.dtype != img.dtype: | ||
| img = img.astype(self.dtype) | ||
| return img |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # Copyright 2020 MONAI Consortium | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| import unittest | ||
|
|
||
| import numpy as np | ||
|
|
||
| from monai.data.transforms.intensity_normalizer import IntensityNormalizer | ||
| from tests.utils import NumpyImageTestCase2D | ||
|
|
||
|
|
||
| class IntensityNormTestCase(NumpyImageTestCase2D): | ||
|
|
||
| def test_image_normalizer_default(self): | ||
| normalizer = IntensityNormalizer() | ||
| normalised = normalizer(self.imt) | ||
| expected = (self.imt - np.mean(self.imt)) / np.std(self.imt) | ||
| self.assertTrue(np.allclose(normalised, expected)) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| unittest.main() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally you don't need a main section in the test case scripts, you can run tests from the root directory with
It doesn't hurt to be here though.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! @atbenmurray could you please update the contribution guidelines about running all unit tests and single unit test . PR for new features should include new unit tests and inherit test case base classes.