Skip to content
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

Jump to bottom

Specify "fill value" directly with variable declarations and during construction of temporaries #1194

Merged
merged 3 commits into from
Jul 10, 2024
Merged

Specify "fill value" directly with variable declarations and during construction of temporaries #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6d6f6f
STYLE: Specify "fill value" directly with variable declarations
N-Dekker Jul 9, 2024
f773948
STYLE: Remove redundant Fill(0) MultiResolutionImageRegistrationMethod2
N-Dekker Jul 10, 2024
f5f3f9f
STYLE: Specify fill value (0) when constructing temporary DerivativeType
N-Dekker Jul 10, 2024
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
3 changes: 1 addition & 2 deletions Common/itkComputePreconditionerUsingDisplacementDistribution.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ ComputePreconditionerUsingDisplacementDistribution<TFixedImage, TTransform>::Com
JacobianType jacjjacj(outdim, outdim);
const double sqrt2 = std::sqrt(static_cast<double>(2.0));
std::vector<double> localStepSizeSquared(numberOfParameters, 0.0);
ParametersType binCount(numberOfParameters);
binCount.Fill(0.0);
ParametersType binCount(numberOfParameters, 0.0);

/** Loop over all voxels in the sample container. */
for (const auto & sample : *sampleContainer)
Expand Down
8 changes: 0 additions & 8 deletions Common/itkMultiResolutionImageRegistrationMethod2.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,6 @@ MultiResolutionImageRegistrationMethod2<TFixedImage, TMovingImage>::MultiResolut

this->m_Stop = false;

this->m_InitialTransformParameters = ParametersType(0);
this->m_InitialTransformParametersOfNextLevel = ParametersType(0);
this->m_LastTransformParameters = ParametersType(0);

this->m_InitialTransformParameters.Fill(0.0f);
this->m_InitialTransformParametersOfNextLevel.Fill(0.0f);
this->m_LastTransformParameters.Fill(0.0f);

this->ProcessObject::SetNthOutput(0, TransformOutputType::New().GetPointer());

} // end Constructor
Expand Down
3 changes: 1 addition & 2 deletions Components/Interpolators/RayCastInterpolator/elxRayCastInterpolator.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ RayCastInterpolator<TElastix>::BeforeRegistration()
this->m_CombinationTransform->SetUseComposition(true);

unsigned int numberofparameters = this->m_Elastix->GetElxTransformBase()->GetAsITKBaseType()->GetNumberOfParameters();
TransformParametersType preParameters(numberofparameters);
preParameters.Fill(0.0);
TransformParametersType preParameters(numberofparameters, 0.0);

for (unsigned int i = 0; i < numberofparameters; ++i)
{
Expand Down
6 changes: 2 additions & 4 deletions ...cs/AdvancedMattesMutualInformation/itkParzenWindowMutualInformationImageToImageMetric.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,7 @@ ParzenWindowMutualInformationImageToImageMetric<TFixedImage, TMovingImage>::Comp
if (this->GetUseJacobianPreconditioning())
{
jacobianPreconditioner = DerivativeType(nzji.size());
preconditioningDivisor = DerivativeType(this->GetNumberOfParameters());
preconditioningDivisor.Fill(0.0);
preconditioningDivisor = DerivativeType(this->GetNumberOfParameters(), 0.0);
}

/** Get a handle to the sample container. */
Expand Down Expand Up @@ -431,8 +430,7 @@ ParzenWindowMutualInformationImageToImageMetric<TFixedImage, TMovingImage>::Thre
if (this->GetUseJacobianPreconditioning())
{
jacobianPreconditioner = DerivativeType(nzji.size());
preconditioningDivisor = DerivativeType(this->GetNumberOfParameters());
preconditioningDivisor.Fill(0.0);
preconditioningDivisor = DerivativeType(this->GetNumberOfParameters(), 0.0);
}

/** Get a handle to the sample container. */
Expand Down
3 changes: 1 addition & 2 deletions ...nts/Optimizers/AdaptiveStochasticGradientDescent/elxAdaptiveStochasticGradientDescent.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,7 @@ AdaptiveStochasticGradientDescent<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/AdaptiveStochasticLBFGS/elxAdaptiveStochasticLBFGS.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,7 @@ AdaptiveStochasticLBFGS<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions ...daptiveStochasticVarianceReducedGradient/elxAdaptiveStochasticVarianceReducedGradient.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,7 @@ AdaptiveStochasticVarianceReducedGradient<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/CMAEvolutionStrategy/elxCMAEvolutionStrategy.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ CMAEvolutionStrategy<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/ConjugateGradient/elxConjugateGradient.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ ConjugateGradient<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/ConjugateGradientFRPR/elxConjugateGradientFRPR.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,7 @@ ConjugateGradientFRPR<TElastix>::SetInitialPosition(const ParametersType & param

if ((scales.Size()) != paramsize)
{
ScalesType newscales(paramsize);
newscales.Fill(1.0);
ScalesType newscales(paramsize, 1.0);
this->SetScales(newscales);
}

Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/FiniteDifferenceGradientDescent/elxFiniteDifferenceGradientDescent.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,7 @@ FiniteDifferenceGradientDescent<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/Powell/elxPowell.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,7 @@ Powell<TElastix>::SetInitialPosition(const ParametersType & param)

if ((scales.Size()) != paramsize)
{
ScalesType newscales(paramsize);
newscales.Fill(1.0);
ScalesType newscales(paramsize, 1.0);
this->SetScales(newscales);
}

Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/QuasiNewtonLBFGS/elxQuasiNewtonLBFGS.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ QuasiNewtonLBFGS<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/RSGDEachParameterApart/elxRSGDEachParameterApart.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@ RSGDEachParameterApart<TElastix>::SetInitialPosition(const ParametersType & para

if ((scales.Size()) != paramsize)
{
ScalesType newscales(paramsize);
newscales.Fill(1.0);
ScalesType newscales(paramsize, 1.0);
this->SetScales(newscales);
}

Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/RegularStepGradientDescent/elxRegularStepGradientDescent.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ RegularStepGradientDescent<TElastix>::SetInitialPosition(const ParametersType &

if ((scales.Size()) != paramsize)
{
ScalesType newscales(paramsize);
newscales.Fill(1.0);
ScalesType newscales(paramsize, 1.0);
this->SetScales(newscales);
}

Expand Down
6 changes: 2 additions & 4 deletions Components/Optimizers/Simplex/elxSimplex.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ Simplex<TElastix>::BeforeEachResolution()
{
unsigned int numberofparameters =
this->m_Elastix->GetElxTransformBase()->GetAsITKBaseType()->GetNumberOfParameters();
ParametersType initialsimplexdelta(numberofparameters);
initialsimplexdelta.Fill(1);
ParametersType initialsimplexdelta(numberofparameters, 1);

for (unsigned int i = 0; i < numberofparameters; ++i)
{
Expand Down Expand Up @@ -168,8 +167,7 @@ Simplex<TElastix>::SetInitialPosition(const ParametersType & param)

if ((scales.Size()) != paramsize)
{
ScalesType newscales(paramsize);
newscales.Fill(1.0);
ScalesType newscales(paramsize, 1.0);
this->SetScales(newscales);
}

Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/SimultaneousPerturbation/elxSimultaneousPerturbation.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,7 @@ SimultaneousPerturbation<TElastix>::SetInitialPosition(const ParametersType & pa

if ((scales.Size()) != paramsize)
{
ScalesType newscales(paramsize);
newscales.Fill(1.0);
ScalesType newscales(paramsize, 1.0);
this->SetScales(newscales);
}

Expand Down
3 changes: 1 addition & 2 deletions Components/Optimizers/StandardGradientDescent/elxStandardGradientDescent.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,7 @@ StandardGradientDescent<TElastix>::StartOptimization()
const ScalesType & scales = this->GetScales();
if (scales.GetSize() == this->GetInitialPosition().GetSize())
{
ScalesType unit_scales(scales.GetSize());
unit_scales.Fill(1.0);
ScalesType unit_scales(scales.GetSize(), 1.0);
if (scales != unit_scales)
{
/** only then: */
Expand Down
3 changes: 1 addition & 2 deletions ...ents/ResampleInterpolators/RayCastResampleInterpolator/elxRayCastResampleInterpolator.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ RayCastResampleInterpolator<TElastix>::InitializeRayCastInterpolator()

this->m_PreTransform = EulerTransformType::New();
unsigned int numberofparameters = this->m_PreTransform->GetNumberOfParameters();
TransformParametersType preParameters(numberofparameters);
preParameters.Fill(0.0);
TransformParametersType preParameters(numberofparameters, 0.0);

for (unsigned int i = 0; i < numberofparameters; ++i)
{
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/AdvancedAffineTransform/elxAdvancedAffineTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,7 @@ AdvancedAffineTransformElastix<TElastix>::SetScales()
{
/** Create the new scales. */
const NumberOfParametersType numberOfParameters = this->GetNumberOfParameters();
ScalesType newscales(numberOfParameters);
newscales.Fill(1.0);
ScalesType newscales(numberOfParameters, 1.0);

/** Check if automatic scales estimation is desired. */
bool automaticScalesEstimation = false;
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/AdvancedBSplineTransform/elxAdvancedBSplineTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,7 @@ AdvancedBSplineTransform<TElastix>::InitializeTransform()
this->m_BSplineTransform->SetGridDirection(gridDirection);

/** Set initial parameters for the first resolution to 0.0. */
ParametersType initialParameters(this->GetNumberOfParameters());
initialParameters.Fill(0.0);
ParametersType initialParameters(this->GetNumberOfParameters(), 0.0);
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParametersOfNextLevel(initialParameters);

} // end InitializeTransform()
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/AffineDTITransform/elxAffineDTITransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ AffineDTITransformElastix<TElastix>::SetScales()
{
/** Create the new scales. */
const NumberOfParametersType numberOfParameters = this->GetNumberOfParameters();
ScalesType newscales(numberOfParameters);
newscales.Fill(1.0);
ScalesType newscales(numberOfParameters, 1.0);

/** Always estimate scales automatically */
log::info("Scales are estimated automatically.");
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/AffineLogTransform/elxAffineLogTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ AffineLogTransformElastix<TElastix>::SetScales()
log::info("SetScales");
/** Create the new scales. */
const NumberOfParametersType numberOfParameters = this->GetNumberOfParameters();
ScalesType newscales(numberOfParameters);
newscales.Fill(1.0);
ScalesType newscales(numberOfParameters, 1.0);

/** Always estimate scales automatically */
log::info("Scales are estimated automatically.");
Expand Down
9 changes: 3 additions & 6 deletions ...s/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ BSplineTransformWithDiffusion<TElastix>::BeforeRegistration()
this->m_BSplineTransform->SetGridOrigin(gridorigin);

/** Task 2 - Give the registration an initial parameter-array. */
ParametersType dummyInitialParameters(this->GetNumberOfParameters());
dummyInitialParameters.Fill(0.0);
ParametersType dummyInitialParameters(this->GetNumberOfParameters(), 0.0);

/** Put parameters in the registration. */
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParameters(dummyInitialParameters);
Expand Down Expand Up @@ -664,8 +663,7 @@ BSplineTransformWithDiffusion<TElastix>::SetInitialGrid(bool upsampleGridOption)
this->m_BSplineTransform->SetGridOrigin(gridorigin);

/** Set initial parameters to 0.0. */
ParametersType initialParameters(this->GetNumberOfParameters());
initialParameters.Fill(0.0);
ParametersType initialParameters(this->GetNumberOfParameters(), 0.0);
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParametersOfNextLevel(initialParameters);

} // end SetInitialGrid()
Expand Down Expand Up @@ -1258,8 +1256,7 @@ BSplineTransformWithDiffusion<TElastix>::DiffuseDeformationField()
/** ------------- 6: Reset the current transform parameters of the optimizer. ------------- */

/** Create a vector of zeros in order to reset the B-spline transform. */
ParametersType dummyParameters(this->GetNumberOfParameters());
dummyParameters.Fill(0.0);
ParametersType dummyParameters(this->GetNumberOfParameters(), 0.0);
this->SetParameters(dummyParameters);

/** Reset the optimizer.
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/BSplineStackTransform/elxBSplineStackTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,7 @@ BSplineStackTransform<TElastix>::InitializeTransform()
m_StackTransform->SetAllSubTransforms(*m_DummySubTransform);

/** Set initial parameters for the first resolution to 0.0. */
ParametersType initialParameters(this->GetNumberOfParameters());
initialParameters.Fill(0.0);
ParametersType initialParameters(this->GetNumberOfParameters(), 0.0);
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParametersOfNextLevel(initialParameters);

} // end InitializeTransform()
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/EulerTransform/elxEulerTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,7 @@ EulerTransformElastix<TElastix>::SetScales()
{
/** Create the new scales. */
const NumberOfParametersType numberOfParameters = this->GetNumberOfParameters();
ScalesType newscales(numberOfParameters);
newscales.Fill(1.0);
ScalesType newscales(numberOfParameters, 1.0);

/** Check if automatic scales estimation is desired. */
bool automaticScalesEstimation = false;
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/MultiBSplineTransformWithNormal/elxMultiBSplineTransformWithNormal.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,7 @@ MultiBSplineTransformWithNormal<TElastix>::InitializeTransform()
this->m_MultiBSplineTransformWithNormal->UpdateLocalBases();

/** Set initial parameters for the first resolution to 0.0. */
ParametersType initialParameters(this->GetNumberOfParameters());
initialParameters.Fill(0.0);
ParametersType initialParameters(this->GetNumberOfParameters(), 0.0);
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParametersOfNextLevel(initialParameters);

} // end InitializeTransform()
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/RecursiveBSplineTransform/elxRecursiveBSplineTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,7 @@ RecursiveBSplineTransform<TElastix>::InitializeTransform()
this->m_BSplineTransform->SetGridDirection(gridDirection);

/** Set initial parameters for the first resolution to 0.0. */
ParametersType initialParameters(this->GetNumberOfParameters());
initialParameters.Fill(0.0);
ParametersType initialParameters(this->GetNumberOfParameters(), 0.0);
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParametersOfNextLevel(initialParameters);

} // end InitializeTransform()
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/SimilarityTransform/elxSimilarityTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ SimilarityTransformElastix<TElastix>::SetScales()
{
/** Create the new scales. */
const NumberOfParametersType numberOfParameters = this->GetNumberOfParameters();
ScalesType newscales(numberOfParameters);
newscales.Fill(1.0);
ScalesType newscales(numberOfParameters, 1.0);

/** Check if automatic scales estimation is desired. */
bool automaticScalesEstimation = false;
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/TranslationStackTransform/elxTranslationStackTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ TranslationStackTransform<TElastix>::InitializeTransform()
m_StackTransform->SetAllSubTransforms(*m_DummySubTransform);

/** Set initial parameters for the first resolution to 0.0. */
ParametersType initialParameters(this->GetNumberOfParameters());
initialParameters.Fill(0.0);
ParametersType initialParameters(this->GetNumberOfParameters(), 0.0);
this->m_Registration->GetAsITKBaseType()->SetInitialTransformParametersOfNextLevel(initialParameters);

} // end InitializeTransform()
Expand Down
3 changes: 1 addition & 2 deletions Components/Transforms/WeightedCombinationTransform/elxWeightedCombinationTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ WeightedCombinationTransformElastix<TElastix>::SetScales()
{
/** Create the new scales. */
const NumberOfParametersType numberOfParameters = this->GetNumberOfParameters();
ScalesType newscales(numberOfParameters);
newscales.Fill(1.0);
ScalesType newscales(numberOfParameters, 1.0);

/** Check if automatic scales estimation is desired. */
bool automaticScalesEstimation = false;
Expand Down
Loading