Replace var.Fill(x) with MakeFilled<T>(x)
#4924
Merged
Conversation
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
github-actions
bot
added
area:Core
Simply filled the elements of m_ShrinkFactorsPerLevel directly.
Using Notepad++, Replace in Files, doing:
Find what: ^( [ ]+)([^ ].*)[ ]+(\w+);[\r\n]+\1\3\.Fill\(
Replace with: $1auto $3 = MakeFilled<$2>\(
Filters: itk*.h;itk*.hxx;itk*.cxx
Directory: D:\src\ITK\Modules
[v] Match case
(*) Regular expression
Excluded "itkVectorMeanImageFunction.hxx", because it may try to fill a
`VariableLengthVector` (which is not supported by `MakeFilled`).
Follow-up to pull request InsightSoftwareConsortium#4891
commit d6c9eed
"STYLE: Replace Fill calls with `auto var = itk::MakeFilled<T>` in tests"
N-Dekker
force-pushed
the
Replace-Fill-with-MakeFilled
branch
from
1c43f34 to
612e6b0
Compare
dzenanz
approved these changes
Nov 1, 2024
Contributor
Author
|
Note to self: After this PR, I hope I have some time to do follow-ups on the ITK SW Guide, examples, etc., as suggested by Jon at #4887 (review) |
hjmjohnson
reviewed
Nov 2, 2024
|
|
||
| typename NeighborhoodIteratorType::RadiusType radius; | ||
| radius.Fill(1); | ||
| auto radius = MakeFilled<typename NeighborhoodIteratorType::RadiusType>(1); |
Member
There was a problem hiding this comment.
Should these now be "const auto" ?
I'm approving, and think this PR should not be held up to add const, but it might be another benefit of using MakeFilled.
Contributor
Author
There was a problem hiding this comment.
Should these now be "const auto" ?
Good question @hjmjohnson Actually maybe even "constexpr auto"!!! However, it's a bit risky to just blindly add const or constexpr to all such cases, as those variables might need to be modified later on. So I'm hoping that this can be achieved by a follow-up PR, using some intelligent code analysis tool, which checks that those variables aren't modified after their initialization 😃
Thanks for your approval!
hjmjohnson
approved these changes
Nov 2, 2024
N-Dekker
added a commit
to N-Dekker/ITK
that referenced
this pull request
Nov 4, 2024
Suggests evaluating its value at compile-time, rather than at runtime.
Found by regular expressions:
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(-?\d+\);)
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(\d.0\);)
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(false\);)
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(true\);)
Inspired by a comment by Hans Johnson at
InsightSoftwareConsortium#4924 (comment)
hjmjohnson
pushed a commit
that referenced
this pull request
Nov 5, 2024
Suggests evaluating its value at compile-time, rather than at runtime.
Found by regular expressions:
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(-?\d+\);)
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(\d.0\);)
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(false\);)
^( [ ]+)(auto \w+[ ]+= MakeFilled<.+>\(true\);)
Inspired by a comment by Hans Johnson at
#4924 (comment)
N-Dekker
added a commit
to SuperElastix/elastix
that referenced
this pull request
Nov 15, 2024
- Following ITK pull request InsightSoftwareConsortium/ITK#4924 commit InsightSoftwareConsortium/ITK@6cb6bf9
N-Dekker
added a commit
to SuperElastix/elastix
that referenced
this pull request
Nov 15, 2024
- Following ITK pull request InsightSoftwareConsortium/ITK#4924 commit InsightSoftwareConsortium/ITK@6cb6bf9
N-Dekker
added a commit
to SuperElastix/elastix
that referenced
this pull request
Nov 15, 2024
- Following ITK pull request InsightSoftwareConsortium/ITK#4924 commit InsightSoftwareConsortium/ITK@6cb6bf9
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
auto var = itk::MakeFilled<T>in tests #4891Also removed the local
shrinkFactorsvariable from the default-constructor ofImageRegistrationMethodv4, and instead, simply "filled" the elements of itsm_ShrinkFactorsPerLeveldirectly.