From b3a563827706e35fec4503852f9fe74389c72549 Mon Sep 17 00:00:00 2001 From: Niels Dekker <N.Dekker@lumc.nl> Date: Thu, 21 Nov 2024 12:33:37 +0100 Subject: [PATCH] STYLE: Remove `p->Initialize()` calls directly after `p = T::New()` For any ITK type `T`, `T::New()` does already initialize the object it returns. Using Notepad++, Replace in Files, doing: Find what: (\w+)([ ]+= .+::New\(\);\r\n)[\r\n]* [ ]+\1->Initialize\(\); Replace with: $1$2 Filters: itk*.* !+\test Directory: D:\src\ITK\Modules [v] Match case (*) Regular expression Manually removed an obsolete comment saying `Clear elements`. --- .../Transform/include/itkBSplineTransformInitializer.hxx | 2 +- .../include/itkN4BiasFieldCorrectionImageFilter.hxx | 4 ++-- .../include/itkDisplacementFieldToBSplineImageFilter.hxx | 2 +- .../itkFastMarchingImageToNodePairContainerAdaptor.hxx | 2 +- .../include/itkWindowConvergenceMonitoringFunction.hxx | 2 +- .../Common/include/itkLandmarkBasedTransformInitializer.hxx | 2 +- .../include/itkLabeledPointSetToPointSetMetricv4.hxx | 4 ++-- .../include/itkBSplineSyNImageRegistrationMethod.hxx | 2 +- .../include/itkImageRegistrationMethodv4.hxx | 2 +- ...meVaryingBSplineVelocityFieldImageRegistrationMethod.hxx | 6 +++--- .../itkBayesianClassifierInitializationImageFilter.hxx | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Modules/Core/Transform/include/itkBSplineTransformInitializer.hxx b/Modules/Core/Transform/include/itkBSplineTransformInitializer.hxx index 0ddbcef2ac15..33ae83275ed5 100644 --- a/Modules/Core/Transform/include/itkBSplineTransformInitializer.hxx +++ b/Modules/Core/Transform/include/itkBSplineTransformInitializer.hxx @@ -86,7 +86,7 @@ BSplineTransformInitializer<TTransform, TImage>::InitializeTransform() const using PointSetType = PointSet<CoordRepType, SpaceDimension>; auto cornerPoints = PointSetType::New(); - cornerPoints->Initialize(); + using PointType = typename PointSetType::PointType; using PointIdentifier = typename PointSetType::PointIdentifier; diff --git a/Modules/Filtering/BiasCorrection/include/itkN4BiasFieldCorrectionImageFilter.hxx b/Modules/Filtering/BiasCorrection/include/itkN4BiasFieldCorrectionImageFilter.hxx index 2841a76b23bc..96b0cf9d679d 100644 --- a/Modules/Filtering/BiasCorrection/include/itkN4BiasFieldCorrectionImageFilter.hxx +++ b/Modules/Filtering/BiasCorrection/include/itkN4BiasFieldCorrectionImageFilter.hxx @@ -499,14 +499,14 @@ N4BiasFieldCorrectionImageFilter<TInputImage, TMaskImage, TOutputImage>::UpdateB const typename ImporterType::OutputImageType * parametricFieldEstimate = importer->GetOutput(); PointSetPointer fieldPoints = PointSetType::New(); - fieldPoints->Initialize(); + auto & pointSTLContainer = fieldPoints->GetPoints()->CastToSTLContainer(); pointSTLContainer.reserve(numberOfIncludedPixels); auto & pointDataSTLContainer = fieldPoints->GetPointData()->CastToSTLContainer(); pointDataSTLContainer.reserve(numberOfIncludedPixels); auto weights = BSplineFilterType::WeightsContainerType::New(); - weights->Initialize(); + auto & weightSTLContainer = weights->CastToSTLContainer(); weightSTLContainer.reserve(numberOfIncludedPixels); diff --git a/Modules/Filtering/DisplacementField/include/itkDisplacementFieldToBSplineImageFilter.hxx b/Modules/Filtering/DisplacementField/include/itkDisplacementFieldToBSplineImageFilter.hxx index 895885b52974..0fa8c97e34e7 100644 --- a/Modules/Filtering/DisplacementField/include/itkDisplacementFieldToBSplineImageFilter.hxx +++ b/Modules/Filtering/DisplacementField/include/itkDisplacementFieldToBSplineImageFilter.hxx @@ -122,7 +122,7 @@ DisplacementFieldToBSplineImageFilter<TInputImage, TInputPointSet, TOutputImage> } auto fieldPoints = InputPointSetType::New(); - fieldPoints->Initialize(); + auto weights = WeightsContainerType::New(); diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingImageToNodePairContainerAdaptor.hxx b/Modules/Filtering/FastMarching/include/itkFastMarchingImageToNodePairContainerAdaptor.hxx index af6888ce1f80..0b72faa25531 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingImageToNodePairContainerAdaptor.hxx +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingImageToNodePairContainerAdaptor.hxx @@ -126,7 +126,7 @@ FastMarchingImageToNodePairContainerAdaptor<TInput, TOutput, TImage>::SetPointsF if (iLabel == Traits::Alive || iLabel == Traits::InitialTrial || iLabel == Traits::Forbidden) { NodePairContainerPointer nodes = NodePairContainerType::New(); - nodes->Initialize(); + using IteratorType = ImageRegionConstIteratorWithIndex<ImageType>; IteratorType it(image, image->GetBufferedRegion()); diff --git a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx index 9154fa8731c1..f088cc953ac5 100644 --- a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx @@ -94,7 +94,7 @@ WindowConvergenceMonitoringFunction<TScalar>::GetConvergenceValue() const -> Rea bspliner->SetNumberOfWorkUnits(1); auto energyProfileWindow = EnergyProfileType::New(); - energyProfileWindow->Initialize(); + for (unsigned int n = 0; n < this->m_WindowSize; ++n) { diff --git a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx index ff299d804523..fa44b1ef8e05 100644 --- a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx +++ b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx @@ -121,7 +121,7 @@ LandmarkBasedTransformInitializer<TTransform, TFixedImage, TMovingImage>::Intern // Set a pointSet from the input landmarks. auto pointSet = PointSetType::New(); - pointSet->Initialize(); + PointsContainerConstIterator fixedIt = this->m_FixedLandmarks.begin(); PointsContainerConstIterator movingIt = this->m_MovingLandmarks.begin(); diff --git a/Modules/Registration/Metricsv4/include/itkLabeledPointSetToPointSetMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkLabeledPointSetToPointSetMetricv4.hxx index 88493f781522..f4fd087328e6 100644 --- a/Modules/Registration/Metricsv4/include/itkLabeledPointSetToPointSetMetricv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkLabeledPointSetToPointSetMetricv4.hxx @@ -130,7 +130,7 @@ typename LabeledPointSetToPointSetMetricv4<TFixedPointSet, TMovingPointSet, TInt GetLabeledFixedPointSet(const LabelType label) const { auto fixedPointSet = FixedPointSetType::New(); - fixedPointSet->Initialize(); + typename FixedPointSetType::PointIdentifier count{}; @@ -156,7 +156,7 @@ typename LabeledPointSetToPointSetMetricv4<TFixedPointSet, TMovingPointSet, TInt GetLabeledMovingPointSet(const LabelType label) const { auto movingPointSet = MovingPointSetType::New(); - movingPointSet->Initialize(); + typename MovingPointSetType::PointIdentifier count{}; diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkBSplineSyNImageRegistrationMethod.hxx b/Modules/Registration/RegistrationMethodsv4/include/itkBSplineSyNImageRegistrationMethod.hxx index aea04ae10f21..cbe4a895d6f9 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkBSplineSyNImageRegistrationMethod.hxx +++ b/Modules/Registration/RegistrationMethodsv4/include/itkBSplineSyNImageRegistrationMethod.hxx @@ -279,7 +279,7 @@ typename BSplineSyNImageRegistrationMethod<TFixedImage, TMovingImage, TOutputTra } auto gradientPointSet = BSplinePointSetType::New(); - gradientPointSet->Initialize(); + if (fixedPointSets[0]->GetNumberOfPoints() > 0) { diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx index 5681c2c71948..6a8e4cd635e1 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx +++ b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx @@ -938,7 +938,7 @@ ImageRegistrationMethodv4<TFixedImage, TMovingImage, TTransform, TVirtualImage, for (SizeValueType n = 0; n < numberOfLocalMetrics; ++n) { auto samplePointSet = MetricSamplePointSetType::New(); - samplePointSet->Initialize(); + using SamplePointType = typename MetricSamplePointSetType::PointType; diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx b/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx index 54664c8a84e0..cb33adaadd83 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx +++ b/Modules/Registration/RegistrationMethodsv4/include/itkTimeVaryingBSplineVelocityFieldImageRegistrationMethod.hxx @@ -150,13 +150,13 @@ TimeVaryingBSplineVelocityFieldImageRegistrationMethod<TFixedImage, // Keep track of velocityFieldPointSet from the previous iteration VelocityFieldPointSetPointer velocityFieldPointSetFromPreviousIteration = VelocityFieldPointSetType::New(); - velocityFieldPointSetFromPreviousIteration->Initialize(); + VelocityFieldPointSetPointer velocityFieldPointSet = VelocityFieldPointSetType::New(); - velocityFieldPointSet->Initialize(); + auto velocityFieldWeights = WeightsContainerType::New(); - velocityFieldWeights->Initialize(); + // Monitor the convergence using ConvergenceMonitoringType = itk::Function::WindowConvergenceMonitoringFunction<RealType>; diff --git a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx index 8454a30e6c06..86636bd5593e 100644 --- a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx +++ b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx @@ -181,7 +181,7 @@ BayesianClassifierInitializationImageFilter<TInputImage, TProbabilityPrecisionTy covarianceEstimatorsContainer->Reserve(m_NumberOfClasses); m_MembershipFunctionContainer = MembershipFunctionContainerType::New(); - m_MembershipFunctionContainer->Initialize(); // Clear elements + // Clear elements for (unsigned int i = 0; i < m_NumberOfClasses; ++i) { meanEstimatorsContainer->InsertElement(i, new typename GaussianMembershipFunctionType::MeanVectorType(1));