STYLE: Modernize source from unmerged branches

hjmjohnson · hjmjohnson · commit a61433a1ea32 · 2026-04-13T05:51:01.000-05:00
Cherry-picked and squashed from Hans Johnson's unmerged branches: - af03b1f STYLE: Add itkVirtualGetNameOfClassMacro + itkOverrideGetNameOfClassMacro - f889ad3 STYLE: Replace itkStaticConstMacro with static constexpr - 559674c STYLE: CoordRepType -> CoordinateType code readability - 53b0943 COMP: Remove inclusion of .hxx files as headers - d1aa10d STYLE: Prefer itk::Math::abs for consistency Co-Authored-By: Hans J. Johnson <hans-johnson@uiowa.edu>
diff --git a/include/itkContinuousBorderWarpImageFilter.h b/include/itkContinuousBorderWarpImageFilter.h
@@ -71,7 +71,7 @@ class ContinuousBorderWarpImageFilter : public WarpImageFilter<TInputImage, TOut
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(ContinuousBorderWarpImageFilter, WarpImageFilter);
+  itkOverrideGetNameOfClassMacro(ContinuousBorderWarpImageFilter);
 
   /** Typedef to describe the output image region type. */
   using OutputImageRegionType = typename Superclass::OutputImageRegionType;
diff --git a/include/itkContinuousBorderWarpImageFilter.hxx b/include/itkContinuousBorderWarpImageFilter.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkContinuousBorderWarpImageFilter_hxx
 #define itkContinuousBorderWarpImageFilter_hxx
-#include "itkContinuousBorderWarpImageFilter.h"
 
 namespace itk
 {
diff --git a/include/itkVariationalDiffeomorphicRegistrationFilter.h b/include/itkVariationalDiffeomorphicRegistrationFilter.h
@@ -95,7 +95,7 @@ class VariationalDiffeomorphicRegistrationFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalDiffeomorphicRegistrationFilter, VariationalRegistrationFilter);
+  itkOverrideGetNameOfClassMacro(VariationalDiffeomorphicRegistrationFilter);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalDiffeomorphicRegistrationFilter.hxx b/include/itkVariationalDiffeomorphicRegistrationFilter.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalDiffeomorphicRegistrationFilter_hxx
 #define itkVariationalDiffeomorphicRegistrationFilter_hxx
-#include "itkVariationalDiffeomorphicRegistrationFilter.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/include/itkVariationalRegistrationCurvatureRegularizer.h b/include/itkVariationalRegistrationCurvatureRegularizer.h
@@ -75,7 +75,7 @@ class VariationalRegistrationCurvatureRegularizer : public VariationalRegistrati
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationCurvatureRegularizer, VariationalRegistrationRegularizer);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationCurvatureRegularizer);
 
   /** Dimensionality of input and output data is assumed to be the same. */
   static constexpr unsigned int ImageDimension = TDisplacementField::ImageDimension;
diff --git a/include/itkVariationalRegistrationDemonsFunction.h b/include/itkVariationalRegistrationDemonsFunction.h
@@ -69,7 +69,7 @@ class VariationalRegistrationDemonsFunction
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(VariationalRegistrationDemonsFunction, VariationalRegistrationFunction);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationDemonsFunction);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalRegistrationDemonsFunction.hxx b/include/itkVariationalRegistrationDemonsFunction.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVariationalRegistrationDemonsFunction_hxx
 #define itkVariationalRegistrationDemonsFunction_hxx
 
-#include "itkVariationalRegistrationDemonsFunction.h"
 #include "itkMath.h"
 
 namespace itk
diff --git a/include/itkVariationalRegistrationDiffusionRegularizer.h b/include/itkVariationalRegistrationDiffusionRegularizer.h
@@ -63,7 +63,7 @@ class VariationalRegistrationDiffusionRegularizer : public VariationalRegistrati
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationDiffusionRegularizer, VariationalRegistrationRegularizer);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationDiffusionRegularizer);
 
   /** Dimensionality of input and output data is assumed to be the same. */
   static constexpr unsigned int ImageDimension = TDisplacementField::ImageDimension;
diff --git a/include/itkVariationalRegistrationDiffusionRegularizer.hxx b/include/itkVariationalRegistrationDiffusionRegularizer.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalRegistrationDiffusionRegularizer_hxx
 #define itkVariationalRegistrationDiffusionRegularizer_hxx
-#include "itkVariationalRegistrationDiffusionRegularizer.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/include/itkVariationalRegistrationElasticRegularizer.h b/include/itkVariationalRegistrationElasticRegularizer.h
@@ -71,7 +71,7 @@ class VariationalRegistrationElasticRegularizer : public VariationalRegistration
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationElasticRegularizer, VariationalRegistrationRegularizer);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationElasticRegularizer);
 
   /** Dimensionality of input and output data is assumed to be the same. */
   static constexpr unsigned int ImageDimension = TDisplacementField::ImageDimension;
diff --git a/include/itkVariationalRegistrationElasticRegularizer.hxx b/include/itkVariationalRegistrationElasticRegularizer.hxx
@@ -444,7 +444,7 @@ VariationalRegistrationElasticRegularizer<TDisplacementField>::ThreadedSolveElas
       detD = d11 * d22 * d33 - d11 * d23 * d23 - d12 * d12 * d33 + d12 * d13 * d23 + d12 * d13 * d23 - d13 * d13 * d22;
 
       // Calculate the inverse values
-      if (fabs(detD) < 1e-15)
+      if (itk::Math::abs(detD) < 1e-15)
       {
         // If determinant is (close to) zero, inverse is zero
         m_ComplexBuffer[0][i][0] = 0;
@@ -552,7 +552,7 @@ VariationalRegistrationElasticRegularizer<TDisplacementField>::ThreadedSolveElas
       detD = d11 * d22 - d12 * d12;
 
       // Calculate the inverse values
-      if (fabs(detD) < 1e-15)
+      if (itk::Math::abs(detD) < 1e-15)
       {
         // If determinant is (close to) zero, inverse is zero
         m_ComplexBuffer[0][i][0] = 0;
diff --git a/include/itkVariationalRegistrationFastNCCFunction.h b/include/itkVariationalRegistrationFastNCCFunction.h
@@ -79,7 +79,7 @@ class VariationalRegistrationFastNCCFunction
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(VariationalRegistrationFastNCCFunction, VariationalRegistrationNCCFunction);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationFastNCCFunction);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalRegistrationFastNCCFunction.hxx b/include/itkVariationalRegistrationFastNCCFunction.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVariationalRegistrationFastNCCFunction_hxx
 #define itkVariationalRegistrationFastNCCFunction_hxx
 
-#include "itkVariationalRegistrationFastNCCFunction.h"
 #include "itkMacro.h"
 #include "itkMath.h"
 
diff --git a/include/itkVariationalRegistrationFilter.h b/include/itkVariationalRegistrationFilter.h
@@ -111,7 +111,7 @@ class VariationalRegistrationFilter : public DenseFiniteDifferenceImageFilter<TD
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationFilter, DenseFiniteDifferenceImageFilter);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationFilter);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalRegistrationFilter.hxx b/include/itkVariationalRegistrationFilter.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalRegistrationFilter_hxx
 #define itkVariationalRegistrationFilter_hxx
-#include "itkVariationalRegistrationFilter.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/include/itkVariationalRegistrationFunction.h b/include/itkVariationalRegistrationFunction.h
@@ -63,7 +63,7 @@ class VariationalRegistrationFunction : public FiniteDifferenceFunction<TDisplac
   using TimeStepType = typename Superclass::TimeStepType;
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationFunction, FiniteDifferenceFunction);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationFunction);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalRegistrationFunction.hxx b/include/itkVariationalRegistrationFunction.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVariationalRegistrationFunction_hxx
 #define itkVariationalRegistrationFunction_hxx
 
-#include "itkVariationalRegistrationFunction.h"
 
 namespace itk
 {
diff --git a/include/itkVariationalRegistrationGaussianRegularizer.h b/include/itkVariationalRegistrationGaussianRegularizer.h
@@ -59,7 +59,7 @@ class VariationalRegistrationGaussianRegularizer : public VariationalRegistratio
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationGaussianRegularizer, VariationalRegistrationRegularizer);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationGaussianRegularizer);
 
   /** Dimensionality of input and output data is assumed to be the same. */
   static constexpr unsigned int ImageDimension = TDisplacementField::ImageDimension;
diff --git a/include/itkVariationalRegistrationGaussianRegularizer.hxx b/include/itkVariationalRegistrationGaussianRegularizer.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalRegistrationGaussianRegularizer_hxx
 #define itkVariationalRegistrationGaussianRegularizer_hxx
-#include "itkVariationalRegistrationGaussianRegularizer.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/include/itkVariationalRegistrationLogger.hxx b/include/itkVariationalRegistrationLogger.hxx
@@ -19,7 +19,6 @@
 #define itkVariationalRegistrationLogger_hxx
 
 #include "itkMath.h"
-#include "itkVariationalRegistrationLogger.h"
 
 #include "itkVariationalRegistrationFilter.h"
 #include "itkVariationalRegistrationMultiResolutionFilter.h"
diff --git a/include/itkVariationalRegistrationMultiResolutionFilter.h b/include/itkVariationalRegistrationMultiResolutionFilter.h
@@ -93,7 +93,7 @@ class VariationalRegistrationMultiResolutionFilter : public ImageToImageFilter<T
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(VariationalRegistrationMultiResolutionFilter, ImageToImageFilter);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationMultiResolutionFilter);
 
   /** Fixed image type. */
   using FixedImageType = TFixedImage;
@@ -119,7 +119,7 @@ class VariationalRegistrationMultiResolutionFilter : public ImageToImageFilter<T
   using MaskImageConstPointer = typename MaskImageType::ConstPointer;
 
   /** Internal float image type. */
-  using FloatImageType = Image<TRealType, itkGetStaticConstMacro(ImageDimension)>;
+  using FloatImageType = Image<TRealType, Self::ImageDimension>;
 
   /** The internal registration type. */
   using RegistrationType = VariationalRegistrationFilter<FixedImageType, MovingImageType, DisplacementFieldType>;
diff --git a/include/itkVariationalRegistrationMultiResolutionFilter.hxx b/include/itkVariationalRegistrationMultiResolutionFilter.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalRegistrationMultiResolutionFilter_hxx
 #define itkVariationalRegistrationMultiResolutionFilter_hxx
-#include "itkVariationalRegistrationMultiResolutionFilter.h"
 
 #include "itkRecursiveGaussianImageFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/include/itkVariationalRegistrationNCCFunction.h b/include/itkVariationalRegistrationNCCFunction.h
@@ -78,7 +78,7 @@ class VariationalRegistrationNCCFunction
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(VariationalRegistrationNCCFunction, VariationalRegistrationFunction);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationNCCFunction);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalRegistrationNCCFunction.hxx b/include/itkVariationalRegistrationNCCFunction.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVariationalRegistrationNCCFunction_hxx
 #define itkVariationalRegistrationNCCFunction_hxx
 
-#include "itkVariationalRegistrationNCCFunction.h"
 #include "itkMacro.h"
 #include "itkMath.h"
 
diff --git a/include/itkVariationalRegistrationRegularizer.h b/include/itkVariationalRegistrationRegularizer.h
@@ -59,7 +59,7 @@ class VariationalRegistrationRegularizer : public InPlaceImageFilter<TDisplaceme
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalRegistrationRegularizer, InPlaceImageFilter);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationRegularizer);
 
   static constexpr unsigned int ImageDimension = TDisplacementField::ImageDimension;
 
diff --git a/include/itkVariationalRegistrationRegularizer.hxx b/include/itkVariationalRegistrationRegularizer.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalRegistrationRegularizer_hxx
 #define itkVariationalRegistrationRegularizer_hxx
-#include "itkVariationalRegistrationRegularizer.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/include/itkVariationalRegistrationSSDFunction.h b/include/itkVariationalRegistrationSSDFunction.h
@@ -66,7 +66,7 @@ class VariationalRegistrationSSDFunction
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(VariationalRegistrationSSDFunction, VariationalRegistrationFunction);
+  itkOverrideGetNameOfClassMacro(VariationalRegistrationSSDFunction);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalRegistrationSSDFunction.hxx b/include/itkVariationalRegistrationSSDFunction.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVariationalRegistrationSSDFunction_hxx
 #define itkVariationalRegistrationSSDFunction_hxx
 
-#include "itkVariationalRegistrationSSDFunction.h"
 #include "itkMath.h"
 
 namespace itk
diff --git a/include/itkVariationalRegistrationStopCriterion.hxx b/include/itkVariationalRegistrationStopCriterion.hxx
@@ -18,7 +18,6 @@
 #ifndef itkVariationalRegistrationStopCriterion_hxx
 #define itkVariationalRegistrationStopCriterion_hxx
 
-#include "itkVariationalRegistrationStopCriterion.h"
 
 #include "itkMath.h"
 
@@ -267,12 +266,12 @@ VariationalRegistrationStopCriterion<TRegistrationFilter, TMRFilter>::SetNextMet
 
   if (m_LineFittingUseAbsoluteValues)
   {
-    absValue = std::fabs(value);
+    absValue = itk::Math::abs(value);
   }
   else if (value < 0)
   {
     itkWarningMacro(<< "Metric value is < 0");
-    absValue = std::fabs(value);
+    absValue = itk::Math::abs(value);
   }
 
   if (m_ElapsedIterations == 0 || m_MaxMetricValue < 0)
@@ -411,7 +410,7 @@ VariationalRegistrationStopCriterion<TRegistrationFilter, TMRFilter>::CheckStopR
     }
 
     // Check if regression line slope is above threshold.
-    if (std::fabs(m) < m_RegressionLineSlopeThreshold)
+    if (itk::Math::abs(m) < m_RegressionLineSlopeThreshold)
     {
       // If max distance check should be performed, check if the maximal
       // distance of a value to the regression line is above a threshold.
@@ -422,7 +421,7 @@ VariationalRegistrationStopCriterion<TRegistrationFilter, TMRFilter>::CheckStopR
         double dist = 0.0;
         for (int k = 0; k < m_NumberOfFittingIterations; k++)
         {
-          dist = std::fabs(m_DistanceArrayForFitting[k] - (m * m_IterationArray[k] + b));
+          dist = itk::Math::abs(m_DistanceArrayForFitting[k] - (m * m_IterationArray[k] + b));
 
           // If distance check is above threshold, return false
           if (dist > m_MaxDistanceToRegressionLine)
diff --git a/include/itkVariationalSymmetricDiffeomorphicRegistrationFilter.h b/include/itkVariationalSymmetricDiffeomorphicRegistrationFilter.h
@@ -104,7 +104,7 @@ class VariationalSymmetricDiffeomorphicRegistrationFilter
   itkNewMacro(Self);
 
   /** Run-time type information (and related methods) */
-  itkTypeMacro(VariationalSymmetricDiffeomorphicRegistrationFilter, VariationalDiffeomorphicRegistrationFilter);
+  itkOverrideGetNameOfClassMacro(VariationalSymmetricDiffeomorphicRegistrationFilter);
 
   /** Get image dimension. */
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
diff --git a/include/itkVariationalSymmetricDiffeomorphicRegistrationFilter.hxx b/include/itkVariationalSymmetricDiffeomorphicRegistrationFilter.hxx
@@ -17,7 +17,6 @@
  *=========================================================================*/
 #ifndef itkVariationalSymmetricDiffeomorphicRegistrationFilter_hxx
 #define itkVariationalSymmetricDiffeomorphicRegistrationFilter_hxx
-#include "itkVariationalSymmetricDiffeomorphicRegistrationFilter.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/test/VariationalRegistrationFilterTest.cxx b/test/VariationalRegistrationFilterTest.cxx
@@ -224,8 +224,8 @@ VariationalRegistrationFilterTest(int, char *[])
   using WarperType = itk::ContinuousBorderWarpImageFilter<ImageType, ImageType, FieldType>;
   WarperType::Pointer warper = WarperType::New();
 
-  using CoordRepType = WarperType::CoordRepType;
-  using InterpolatorType = itk::NearestNeighborInterpolateImageFunction<ImageType, CoordRepType>;
+  using CoordinateType = WarperType::CoordinateType;
+  using InterpolatorType = itk::NearestNeighborInterpolateImageFunction<ImageType, CoordinateType>;
   InterpolatorType::Pointer interpolator = InterpolatorType::New();
 
   warper->SetInput(moving);
diff --git a/test/VariationalRegistrationMultiResolutionFilterTest.cxx b/test/VariationalRegistrationMultiResolutionFilterTest.cxx
@@ -237,8 +237,8 @@ VariationalRegistrationMultiResolutionFilterTest(int, char *[])
   using WarperType = itk::ContinuousBorderWarpImageFilter<ImageType, ImageType, FieldType>;
   WarperType::Pointer warper = WarperType::New();
 
-  using CoordRepType = WarperType::CoordRepType;
-  using InterpolatorType = itk::NearestNeighborInterpolateImageFunction<ImageType, CoordRepType>;
+  using CoordinateType = WarperType::CoordinateType;
+  using InterpolatorType = itk::NearestNeighborInterpolateImageFunction<ImageType, CoordinateType>;
   InterpolatorType::Pointer interpolator = InterpolatorType::New();
 
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`=========================================================================/`
`18`	`18`	`#ifndef itkContinuousBorderWarpImageFilter_hxx`
`19`	`19`	`#define itkContinuousBorderWarpImageFilter_hxx`
`20`		`-#include "itkContinuousBorderWarpImageFilter.h"`
`21`	`20`
`22`	`21`	`namespace itk`
`23`	`22`	`{`