From 324eaf15d17dc1000df14aa9ba4f6e79d9ab1c15 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Wed, 27 Nov 2024 19:38:28 +0100 Subject: [PATCH] STYLE: Replace CoordRepType with CoordinateType in tests Did Replace in Files on "itk*Test*.cxx" and "itk*Test*.h". --- ...BSplineInterpolationWeightFunctionTest.cxx | 12 ++++---- .../Core/Common/test/itkBoundingBoxTest.cxx | 4 +-- .../Core/Common/test/itkCrossHelperTest.cxx | 8 ++--- Modules/Core/Common/test/itkPointSetGTest.cxx | 9 +++--- Modules/Core/Common/test/itkPointSetTest.cxx | 8 ++--- ...itkBSplineInterpolateImageFunctionTest.cxx | 10 +++---- ...fferenceImageFunctionOnVectorSpeedTest.cxx | 4 +-- ...ralDifferenceImageFunctionOnVectorTest.cxx | 6 ++-- ...entralDifferenceImageFunctionSpeedTest.cxx | 4 +-- .../itkCentralDifferenceImageFunctionTest.cxx | 4 +-- ...ageAdaptorInterpolateImageFunctionTest.cxx | 4 +-- .../ImageFunction/test/itkInterpolateTest.cxx | 6 ++-- ...geGaussianInterpolateImageFunctionTest.cxx | 4 +-- .../itkLinearInterpolateImageFunctionTest.cxx | 12 ++++---- ...stNeighborInterpolateImageFunctionTest.cxx | 8 ++--- .../itkRGBInterpolateImageFunctionTest.cxx | 4 +-- .../itkVectorInterpolateImageFunctionTest.cxx | 4 +-- ...stNeighborExtrapolateImageFunctionTest.cxx | 4 +-- ...ndowedSincInterpolateImageFunctionTest.cxx | 18 +++++------ .../test/itkMeshSourceGraftOutputTest.cxx | 2 +- .../Mesh/test/itkMeshSpatialObjectIOTest.cxx | 4 +-- Modules/Core/Mesh/test/itkMeshTest.cxx | 6 ++-- .../Mesh/test/itkQuadrilateralCellTest.cxx | 18 +++++------ Modules/Core/Mesh/test/itkSimplexMeshTest.cxx | 4 +-- .../Core/Mesh/test/itkTriangleCellTest.cxx | 16 +++++----- .../itkQuadEdgeMeshEulerOperatorsTestHelper.h | 8 ++--- .../test/itkQuadEdgeMeshAddFaceTest1.cxx | 2 +- .../test/itkQuadEdgeMeshPolygonCellTest.cxx | 4 +-- .../test/itkMeshSpatialObjectTest.cxx | 4 +-- .../test/itkTransformsSetParametersTest.cxx | 14 ++++----- .../ImageGrid/test/itkResampleImageTest.cxx | 6 ++-- .../ImageGrid/test/itkResampleImageTest2.cxx | 10 +++---- .../test/itkResampleImageTest2Streaming.cxx | 10 +++---- .../ImageGrid/test/itkResampleImageTest3.cxx | 6 ++-- .../ImageGrid/test/itkResampleImageTest4.cxx | 6 ++-- .../ImageGrid/test/itkResampleImageTest5.cxx | 6 ++-- .../ImageGrid/test/itkResampleImageTest6.cxx | 6 ++-- .../ImageGrid/test/itkResampleImageTest7.cxx | 6 ++-- .../ImageGrid/test/itkResampleImageTest8.cxx | 4 +-- ...asedArray3DSpecialCoordinatesImageTest.cxx | 2 +- .../test/itkVTKPolyDataMeshIOGTest.cxx | 30 +++++++++---------- .../test/itkPolygonCellTest.cxx | 4 +-- .../test/itkTriangleHelperTest.cxx | 6 ++-- .../Review/test/itkImageFunctionTest.cxx | 8 ++--- .../itkGPUDemonsRegistrationFilterTest2.cxx | 4 +-- ...DistancePointSetMetricRegistrationTest.cxx | 14 ++++----- .../itkExpectationBasedPointSetMetricTest.cxx | 2 +- .../test/itkImageToImageMetricv4Test.cxx | 4 +-- .../itkCurvatureRegistrationFilterTest.cxx | 4 +-- .../test/itkDemonsRegistrationFilterTest.cxx | 4 +-- ...feomorphicDemonsRegistrationFilterTest.cxx | 4 +-- ...eomorphicDemonsRegistrationFilterTest2.cxx | 4 +-- ...tricForcesDemonsRegistrationFilterTest.cxx | 4 +-- ...tkLevelSetMotionRegistrationFilterTest.cxx | 4 +-- ...esolutionPDEDeformableRegistrationTest.cxx | 4 +-- ...tricForcesDemonsRegistrationFilterTest.cxx | 4 +-- .../itkSimplexMeshWithFloatCoordRepTest.cxx | 4 +-- 57 files changed, 193 insertions(+), 192 deletions(-) diff --git a/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx b/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx index 71b1cb7c64a..01f739df312 100644 --- a/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx +++ b/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx @@ -45,14 +45,14 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) { { // Creating a local scope - using CoordRepType = double; + using CoordinateType = double; constexpr unsigned int SpaceDimension = 1; constexpr unsigned int SplineOrder = 2; std::cout << "Testing SpaceDimension= " << SpaceDimension; std::cout << " and SplineOrder= " << SplineOrder << std::endl; - using FunctionType = itk::BSplineInterpolationWeightFunction; + using FunctionType = itk::BSplineInterpolationWeightFunction; using ContinuousIndexType = FunctionType::ContinuousIndexType; using IndexType = FunctionType::IndexType; using WeightsType = FunctionType::WeightsType; @@ -145,14 +145,14 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) std::cout << "Test passed. " << std::endl; } { // Creating a local scope - using CoordRepType = double; + using CoordinateType = double; constexpr unsigned int SpaceDimension = 1; constexpr unsigned int SplineOrder = 3; std::cout << "Testing SpaceDimension= " << SpaceDimension; std::cout << " and SplineOrder= " << SplineOrder << std::endl; - using FunctionType = itk::BSplineInterpolationWeightFunction; + using FunctionType = itk::BSplineInterpolationWeightFunction; using ContinuousIndexType = FunctionType::ContinuousIndexType; using IndexType = FunctionType::IndexType; using WeightsType = FunctionType::WeightsType; @@ -234,13 +234,13 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) } { // Creating a local scope - using CoordRepType = double; + using CoordinateType = double; constexpr unsigned int SpaceDimension = 3; constexpr unsigned int SplineOrder = 3; std::cout << "Testing SpaceDimension= " << SpaceDimension; std::cout << " and SplineOrder= " << SplineOrder << std::endl; - using FunctionType = itk::BSplineInterpolationWeightFunction; + using FunctionType = itk::BSplineInterpolationWeightFunction; using ContinuousIndexType = FunctionType::ContinuousIndexType; using IndexType = FunctionType::IndexType; using WeightsType = FunctionType::WeightsType; diff --git a/Modules/Core/Common/test/itkBoundingBoxTest.cxx b/Modules/Core/Common/test/itkBoundingBoxTest.cxx index df25459fd89..f80c0b7bb1c 100644 --- a/Modules/Core/Common/test/itkBoundingBoxTest.cxx +++ b/Modules/Core/Common/test/itkBoundingBoxTest.cxx @@ -40,7 +40,7 @@ itkBoundingBoxTest(int, char *[]) const BB::BoundsArrayType & bounds = myBox->GetBounds(); for (unsigned int i = 0; i < bounds.Size(); ++i) { - if (itk::Math::NotExactlyEquals(bounds[i], BB::CoordRepType{})) + if (itk::Math::NotExactlyEquals(bounds[i], BB::CoordinateType{})) { std::cerr << "Bounding Box initialization test failed" << std::endl; std::cerr << bounds << std::endl; @@ -54,7 +54,7 @@ itkBoundingBoxTest(int, char *[]) BB::PointType center = myBox->GetCenter(); for (unsigned int i = 0; i < 1; ++i) { - if (itk::Math::NotExactlyEquals(center[i], BB::CoordRepType{})) + if (itk::Math::NotExactlyEquals(center[i], BB::CoordinateType{})) { std::cerr << "Empty Box GetCenter initialization test failed" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkCrossHelperTest.cxx b/Modules/Core/Common/test/itkCrossHelperTest.cxx index 866e38af785..2d1459f290f 100644 --- a/Modules/Core/Common/test/itkCrossHelperTest.cxx +++ b/Modules/Core/Common/test/itkCrossHelperTest.cxx @@ -28,11 +28,11 @@ itkCrossHelperTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) constexpr unsigned int Dimension3D = 3; constexpr unsigned int Dimension4D = 4; - using CoordRepType = double; + using CoordinateType = double; - using Vector2DType = itk::Vector; - using Vector3DType = itk::Vector; - using Vector4DType = itk::Vector; + using Vector2DType = itk::Vector; + using Vector3DType = itk::Vector; + using Vector4DType = itk::Vector; using Cross2DType = itk::CrossHelper; Cross2DType cross2d; diff --git a/Modules/Core/Common/test/itkPointSetGTest.cxx b/Modules/Core/Common/test/itkPointSetGTest.cxx index f06e8b8a2c6..d166f25e277 100644 --- a/Modules/Core/Common/test/itkPointSetGTest.cxx +++ b/Modules/Core/Common/test/itkPointSetGTest.cxx @@ -30,7 +30,7 @@ template void TestSetPointsByCoordinates(TPointSet & pointSet) { - using CoordRepType = typename TPointSet::CoordRepType; + using CoordinateType = typename TPointSet::CoordinateType; static constexpr auto PointDimension = TPointSet::PointDimension; @@ -38,15 +38,16 @@ TestSetPointsByCoordinates(TPointSet & pointSet) { // SetPointsByCoordinates is expected to throw an exception when the specified number of coordinates is not a // multiple of PointDimension. - EXPECT_THROW(pointSet.SetPointsByCoordinates(std::vector(numberOfCoordinates)), itk::ExceptionObject); + EXPECT_THROW(pointSet.SetPointsByCoordinates(std::vector(numberOfCoordinates)), + itk::ExceptionObject); } for (const unsigned int numberOfPoints : { 2, 1, 0 }) { - std::vector coordinates(numberOfPoints * PointDimension); + std::vector coordinates(numberOfPoints * PointDimension); // Just make sure that all coordinates have different values, for the purpose of the test. - std::iota(coordinates.begin(), coordinates.end(), CoordRepType()); + std::iota(coordinates.begin(), coordinates.end(), CoordinateType()); { const auto modifiedTime = pointSet.GetMTime(); pointSet.SetPointsByCoordinates(coordinates); diff --git a/Modules/Core/Common/test/itkPointSetTest.cxx b/Modules/Core/Common/test/itkPointSetTest.cxx index 33eb81f4bdb..a57e672db3e 100644 --- a/Modules/Core/Common/test/itkPointSetTest.cxx +++ b/Modules/Core/Common/test/itkPointSetTest.cxx @@ -43,7 +43,7 @@ itkPointSetTest(int, char *[]) /** * Define the 3d geometric positions for 8 points in a cube. */ - PointSet::CoordRepType testPointCoords[3]; + PointSet::CoordinateType testPointCoords[3]; /** * Create the point set through its object factory. @@ -67,9 +67,9 @@ itkPointSetTest(int, char *[]) { for (int i = 0; i < numOfPoints; ++i) { - testPointCoords[0] = (PointSet::CoordRepType)vnl_sample_uniform(-1.0, 1.0); - testPointCoords[1] = (PointSet::CoordRepType)vnl_sample_uniform(-1.0, 1.0); - testPointCoords[2] = (PointSet::CoordRepType)vnl_sample_uniform(-1.0, 1.0); + testPointCoords[0] = (PointSet::CoordinateType)vnl_sample_uniform(-1.0, 1.0); + testPointCoords[1] = (PointSet::CoordinateType)vnl_sample_uniform(-1.0, 1.0); + testPointCoords[2] = (PointSet::CoordinateType)vnl_sample_uniform(-1.0, 1.0); pset->SetPoint(i, PointType(testPointCoords)); } } diff --git a/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx index 2857414ddd3..499a14c464d 100644 --- a/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx @@ -35,7 +35,7 @@ using InputPixelType = double; -using CoordRepType = itk::SpacePrecisionType; +using CoordinateType = itk::SpacePrecisionType; // Set up for 1D Images enum @@ -46,7 +46,7 @@ enum using ImageType1D = itk::Image; using ImageTypePtr1D = ImageType1D::Pointer; using SizeType1D = ImageType1D::SizeType; -using InterpolatorType1D = itk::BSplineInterpolateImageFunction; +using InterpolatorType1D = itk::BSplineInterpolateImageFunction; // using IndexType1D = InterpolatorType1D::IndexType; using PointType1D = InterpolatorType1D::PointType; using ContinuousIndexType1D = InterpolatorType1D::ContinuousIndexType; @@ -62,7 +62,7 @@ enum using ImageType2D = itk::Image; using ImageTypePtr2D = ImageType2D::Pointer; using SizeType2D = ImageType2D::SizeType; -using InterpolatorType2D = itk::BSplineInterpolateImageFunction; +using InterpolatorType2D = itk::BSplineInterpolateImageFunction; // using IndexType2D = InterpolatorType2D::IndexType; using PointType2D = InterpolatorType2D::PointType; using ContinuousIndexType2D = InterpolatorType2D::ContinuousIndexType; @@ -78,13 +78,13 @@ enum using ImageType3D = itk::Image; using ImageTypePtr3D = ImageType3D::Pointer; using SizeType3D = ImageType3D::SizeType; -using InterpolatorType3D = itk::BSplineInterpolateImageFunction; +using InterpolatorType3D = itk::BSplineInterpolateImageFunction; using IndexType3D = InterpolatorType3D::IndexType; using PointType3D = InterpolatorType3D::PointType; using ContinuousIndexType3D = InterpolatorType3D::ContinuousIndexType; using ImageIntegerType3D = itk::Image; -using InterpolatorIntegerType3D = itk::BSplineInterpolateImageFunction; +using InterpolatorIntegerType3D = itk::BSplineInterpolateImageFunction; using IndexIntegerType3D = InterpolatorIntegerType3D::IndexType; using PointIntegerType3D = InterpolatorIntegerType3D::PointType; using ContinuousIntegerIndexType3D = InterpolatorIntegerType3D::ContinuousIndexType; diff --git a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorSpeedTest.cxx b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorSpeedTest.cxx index 607fca4cba0..166fdacb2ef 100644 --- a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorSpeedTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorSpeedTest.cxx @@ -64,10 +64,10 @@ itkCentralDifferenceImageFunctionOnVectorSpeedTestRun(char * argv[]) } // set up central difference calculator - using CoordRepType = float; + using CoordinateType = float; using DerivativeType = itk::Matrix; - using FunctionType = itk::CentralDifferenceImageFunction; + using FunctionType = itk::CentralDifferenceImageFunction; using OutputType = typename FunctionType::OutputType; auto function = FunctionType::New(); diff --git a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx index a3428f96752..4bf24587c9d 100644 --- a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx @@ -79,10 +79,10 @@ itkCentralDifferenceImageFunctionOnVectorTestRun() } // set up central difference calculator - using CoordRepType = float; + using CoordinateType = float; using DerivativeType = itk::Matrix; - using FunctionType = itk::CentralDifferenceImageFunction; + using FunctionType = itk::CentralDifferenceImageFunction; using OutputType = typename FunctionType::OutputType; using OutputValueType = typename FunctionType::OutputValueType; @@ -352,7 +352,7 @@ itkCentralDifferenceImageFunctionOnVectorTestRun() // Test with incorrectly-sized output type using BadDerivativeType = itk::Matrix; - using BadFunctionType = itk::CentralDifferenceImageFunction; + using BadFunctionType = itk::CentralDifferenceImageFunction; auto badFunction = BadFunctionType::New(); ITK_TRY_EXPECT_EXCEPTION(badFunction->SetInputImage(image)); diff --git a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionSpeedTest.cxx b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionSpeedTest.cxx index 940015d12d3..e74d4b01e1a 100644 --- a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionSpeedTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionSpeedTest.cxx @@ -63,8 +63,8 @@ itkCentralDifferenceImageFunctionSpeedTest(int argc, char * argv[]) } // set up central difference calculator - using CoordRepType = float; - using FunctionType = itk::CentralDifferenceImageFunction; + using CoordinateType = float; + using FunctionType = itk::CentralDifferenceImageFunction; using OutputType = FunctionType::OutputType; auto function = FunctionType::New(); diff --git a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx index fc06816de0d..a9d26a93481 100644 --- a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx @@ -51,8 +51,8 @@ itkCentralDifferenceImageFunctionTest(int, char *[]) } // set up central difference calculator - using CoordRepType = float; - using FunctionType = itk::CentralDifferenceImageFunction; + using CoordinateType = float; + using FunctionType = itk::CentralDifferenceImageFunction; using OutputType = FunctionType::OutputType; using OutputValueType = FunctionType::OutputValueType; diff --git a/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx index d2514baf978..2ae68554502 100644 --- a/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx @@ -49,9 +49,9 @@ enum using ImageType = itk::Image; using ImageAdaptorType = itk::ImageAdaptor; -using CoordRepType = itk::SpacePrecisionType; +using CoordinateType = itk::SpacePrecisionType; -using InterpolatorType = itk::LinearInterpolateImageFunction; +using InterpolatorType = itk::LinearInterpolateImageFunction; using IndexType = InterpolatorType::IndexType; using PointType = ImageType::PointType; using ContinuousIndexType = InterpolatorType::ContinuousIndexType; diff --git a/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx b/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx index 2c7fbda065a..cda7b45935e 100644 --- a/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx +++ b/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx @@ -25,13 +25,13 @@ using SizeType = itk::Size<3>; using ImageType = itk::Image; -using CoordRepType = itk::SpacePrecisionType; -using InterpolatorType = itk::LinearInterpolateImageFunction; +using CoordinateType = itk::SpacePrecisionType; +using InterpolatorType = itk::LinearInterpolateImageFunction; using IndexType = InterpolatorType::IndexType; using PointType = InterpolatorType::PointType; using ContinuousIndexType = InterpolatorType::ContinuousIndexType; -using NNInterpolatorType = itk::NearestNeighborInterpolateImageFunction; +using NNInterpolatorType = itk::NearestNeighborInterpolateImageFunction; namespace { diff --git a/Modules/Core/ImageFunction/test/itkLabelImageGaussianInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkLabelImageGaussianInterpolateImageFunctionTest.cxx index d7540df8f07..6ac38c94c72 100644 --- a/Modules/Core/ImageFunction/test/itkLabelImageGaussianInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkLabelImageGaussianInterpolateImageFunctionTest.cxx @@ -33,7 +33,7 @@ itkLabelImageGaussianInterpolateImageFunctionTest(int, char *[]) using SizeType = RegionType::SizeType; using IndexType = ImageType::IndexType; - using CoordRepType = float; + using CoordinateType = float; // The ImageSizeToCompute constexpr double FOV = 10.0; @@ -84,7 +84,7 @@ itkLabelImageGaussianInterpolateImageFunctionTest(int, char *[]) } } - using InterpolatorType = itk::LabelImageGaussianInterpolateImageFunction; + using InterpolatorType = itk::LabelImageGaussianInterpolateImageFunction; auto interpolator = InterpolatorType::New(); interpolator->SetInputImage(small_image); { diff --git a/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx index 709656dc7f3..4256a7dae61 100644 --- a/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx @@ -40,17 +40,17 @@ RunLinearInterpolateTest() using SizeType = typename RegionType::SizeType; using IndexType = typename ImageType::IndexType; - using CoordRepType = float; - using ContinuousIndexType = typename itk::ContinuousIndex; + using CoordinateType = float; + using ContinuousIndexType = typename itk::ContinuousIndex; using AccumulatorType = typename ContinuousIndexType::ValueType; - using PointType = typename itk::Point; + using PointType = typename itk::Point; - using InterpolatorType = typename itk::LinearInterpolateImageFunction; - using VectorInterpolatorType = typename itk::LinearInterpolateImageFunction; + using InterpolatorType = typename itk::LinearInterpolateImageFunction; + using VectorInterpolatorType = typename itk::LinearInterpolateImageFunction; using VariableVectorInterpolatorType = - typename itk::LinearInterpolateImageFunction; + typename itk::LinearInterpolateImageFunction; using InterpolatedVectorType = typename VectorInterpolatorType::OutputType; using InterpolatedVariableVectorType = typename VariableVectorInterpolatorType::OutputType; diff --git a/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx index 526da2d21ef..e55502bc692 100644 --- a/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkNearestNeighborInterpolateImageFunctionTest.cxx @@ -44,11 +44,11 @@ itkNearestNeighborInterpolateImageFunctionTest(int, char *[]) using PointType = itk::Point; - using CoordRepType = float; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; - using VectorInterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = float; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using VectorInterpolatorType = itk::NearestNeighborInterpolateImageFunction; using VariableVectorInterpolatorType = - itk::NearestNeighborInterpolateImageFunction; + itk::NearestNeighborInterpolateImageFunction; using InterpolatedVectorType = VectorInterpolatorType::OutputType; using InterpolatedVariableVectorType = VariableVectorInterpolatorType::OutputType; diff --git a/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx index f76dbc7a17b..02e2feddad8 100644 --- a/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx @@ -34,8 +34,8 @@ enum }; // RGB is a vector of dimension 3 using PixelType = itk::RGBPixel; using ImageType = itk::Image; -using CoordRepType = itk::SpacePrecisionType; -using InterpolatorType = itk::VectorLinearInterpolateImageFunction; +using CoordinateType = itk::SpacePrecisionType; +using InterpolatorType = itk::VectorLinearInterpolateImageFunction; using IndexType = InterpolatorType::IndexType; using PointType = InterpolatorType::PointType; using ContinuousIndexType = InterpolatorType::ContinuousIndexType; diff --git a/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx index b4ddee38ac6..5cfbb5c1b54 100644 --- a/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx @@ -30,8 +30,8 @@ enum }; using PixelType = itk::Vector; using ImageType = itk::Image; -using CoordRepType = itk::SpacePrecisionType; -using InterpolatorType = itk::VectorLinearInterpolateImageFunction; +using CoordinateType = itk::SpacePrecisionType; +using InterpolatorType = itk::VectorLinearInterpolateImageFunction; using IndexType = InterpolatorType::IndexType; using PointType = InterpolatorType::PointType; using ContinuousIndexType = InterpolatorType::ContinuousIndexType; diff --git a/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx index 20fe3c14e81..0e9d0465281 100644 --- a/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx @@ -31,9 +31,9 @@ enum }; using PixelType = itk::Vector; using ImageType = itk::Image; -using CoordRepType = itk::SpacePrecisionType; +using CoordinateType = itk::SpacePrecisionType; -using InterpolatorType = itk::VectorLinearInterpolateNearestNeighborExtrapolateImageFunction; +using InterpolatorType = itk::VectorLinearInterpolateNearestNeighborExtrapolateImageFunction; using IndexType = InterpolatorType::IndexType; using PointType = InterpolatorType::PointType; diff --git a/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx index a92c5073bc3..8280a7ebeb3 100644 --- a/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx @@ -37,12 +37,12 @@ enum using PixelType = unsigned char; using ImageType = itk::Image; -using CoordRepType = itk::SpacePrecisionType; +using CoordinateType = itk::SpacePrecisionType; using WindowFunctionType = itk::Function::HammingWindowFunction<2>; using BoundaryConditionType = itk::ConstantBoundaryCondition; using InterpolatorType = - itk::WindowedSincInterpolateImageFunction; + itk::WindowedSincInterpolateImageFunction; using IndexType = InterpolatorType::IndexType; using PointType = InterpolatorType::PointType; @@ -139,7 +139,7 @@ itkWindowedSincInterpolateImageFunctionTest(int, char *[]) using PointType = SincInterpolate::PointType; using OutputType = SincInterpolate::OutputType; using ContinuousIndexType = SincInterpolate::ContinuousIndexType; - using CoordRepType = SincInterpolate::CoordRepType; + using CoordinateType = SincInterpolate::CoordinateType; using InterpolatorType = SincInterpolate::InterpolatorType; @@ -204,7 +204,7 @@ itkWindowedSincInterpolateImageFunctionTest(int, char *[]) // an integer position inside the image { - CoordRepType darray[3] = { 10, 20, 40 }; + CoordinateType darray[3] = { 10, 20, 40 }; output = OutputType(70); cindex = ContinuousIndexType(darray); passed = SincInterpolate::TestContinuousIndex(interp, cindex, true, output); @@ -225,7 +225,7 @@ itkWindowedSincInterpolateImageFunctionTest(int, char *[]) // position at the image border { - CoordRepType darray[3] = { 0, 20, 40 }; + CoordinateType darray[3] = { 0, 20, 40 }; output = OutputType(60); cindex = ContinuousIndexType(darray); passed = SincInterpolate::TestContinuousIndex(interp, cindex, true, output); @@ -246,8 +246,8 @@ itkWindowedSincInterpolateImageFunctionTest(int, char *[]) // position near image border { - double epsilon = 1.0e-10; - CoordRepType darray[3] = { 19 - epsilon, 20, 40 }; + double epsilon = 1.0e-10; + CoordinateType darray[3] = { 19 - epsilon, 20, 40 }; output = OutputType(79); cindex = ContinuousIndexType(darray); passed = SincInterpolate::TestContinuousIndex(interp, cindex, true, output); @@ -268,7 +268,7 @@ itkWindowedSincInterpolateImageFunctionTest(int, char *[]) // position outside the image { - CoordRepType darray[3] = { 20, 20, 40 }; + CoordinateType darray[3] = { 20, 20, 40 }; output = OutputType(1); cindex = ContinuousIndexType(darray); passed = SincInterpolate::TestContinuousIndex(interp, cindex, false, output); @@ -289,7 +289,7 @@ itkWindowedSincInterpolateImageFunctionTest(int, char *[]) // at non-integer position { - CoordRepType darray[3] = { 5.25, 12.5, 42.0 }; + CoordinateType darray[3] = { 5.25, 12.5, 42.0 }; output = OutputType(59.75); cindex = ContinuousIndexType(darray); passed = SincInterpolate::TestContinuousIndex(interp, cindex, true, output); diff --git a/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx b/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx index 821d8239b06..528d4b843fb 100644 --- a/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx +++ b/Modules/Core/Mesh/test/itkMeshSourceGraftOutputTest.cxx @@ -41,7 +41,7 @@ class MeshSourceGraftOutputFilter : public MeshToMeshFilter; BoundingBox::Pointer bbox(BoundingBox::New()); diff --git a/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx b/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx index ac148024e1f..297872509da 100644 --- a/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx +++ b/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx @@ -43,16 +43,16 @@ itkQuadrilateralCellTest(int, char *[]) class QuadrilateralHelper : public QuadrilateralCellType { using Superclass = QuadrilateralCellType; - using CoordRepType = Superclass::CoordRepType; + using CoordinateType = Superclass::CoordinateType; using PointsContainer = Superclass::PointsContainer; using InterpolationWeightType = Superclass::InterpolationWeightType; public: bool - EvaluatePosition(CoordRepType * inputPoint, + EvaluatePosition(CoordinateType * inputPoint, PointsContainer * points, - CoordRepType * closestPoint, - CoordRepType pcoord[], + CoordinateType * closestPoint, + CoordinateType pcoord[], double * distance, InterpolationWeightType * weights) override { @@ -88,8 +88,8 @@ itkQuadrilateralCellTest(int, char *[]) */ constexpr unsigned int Dimension = 3; // Test points are on a plane at an angle (3^2 + 4^2 = 5^2) with xy plane - MeshType::CoordRepType testPointCoords[numberOfPoints][Dimension] = { { 0, 0, 0 }, { 10, 0, 0 }, { 0, 8, 6 }, - { 10, 8, 6 }, { 0, 16, 12 }, { 10, 16, 12 } }; + MeshType::CoordinateType testPointCoords[numberOfPoints][Dimension] = { { 0, 0, 0 }, { 10, 0, 0 }, { 0, 8, 6 }, + { 10, 8, 6 }, { 0, 16, 12 }, { 10, 16, 12 } }; /** * Add our test points to the mesh. @@ -147,10 +147,10 @@ itkQuadrilateralCellTest(int, char *[]) // // Test the EvaluatePosition() method of the QuadrilateralCell // - QuadrilateralCellType::CoordRepType inputPoint[3]; + QuadrilateralCellType::CoordinateType inputPoint[3]; QuadrilateralCellType::PointsContainer * points = mesh->GetPoints(); - QuadrilateralCellType::CoordRepType closestPoint[3]; - QuadrilateralCellType::CoordRepType pcoords[2]; // Quadrilateral has 2 parametric coordinates + QuadrilateralCellType::CoordinateType closestPoint[3]; + QuadrilateralCellType::CoordinateType pcoords[2]; // Quadrilateral has 2 parametric coordinates double distance; QuadrilateralCellType::InterpolationWeightType weights[4]; diff --git a/Modules/Core/Mesh/test/itkSimplexMeshTest.cxx b/Modules/Core/Mesh/test/itkSimplexMeshTest.cxx index cea9b39aa02..0b9810fd162 100644 --- a/Modules/Core/Mesh/test/itkSimplexMeshTest.cxx +++ b/Modules/Core/Mesh/test/itkSimplexMeshTest.cxx @@ -41,8 +41,8 @@ itkSimplexMeshTest(int, char *[]) /** * Define the 3d geometric positions for 8 points in a cube. */ - SimplexMeshType::CoordRepType testPointCoords[8][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 0, 9 }, { 0, 0, 9 }, - { 0, 9, 0 }, { 9, 9, 0 }, { 9, 9, 9 }, { 0, 9, 9 } }; + SimplexMeshType::CoordinateType testPointCoords[8][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 0, 9 }, { 0, 0, 9 }, + { 0, 9, 0 }, { 9, 9, 0 }, { 9, 9, 9 }, { 0, 9, 9 } }; /** diff --git a/Modules/Core/Mesh/test/itkTriangleCellTest.cxx b/Modules/Core/Mesh/test/itkTriangleCellTest.cxx index 09887133fc3..926e4fece35 100644 --- a/Modules/Core/Mesh/test/itkTriangleCellTest.cxx +++ b/Modules/Core/Mesh/test/itkTriangleCellTest.cxx @@ -45,16 +45,16 @@ itkTriangleCellTest(int, char *[]) class TriangleHelper : public TriangleCellType { using Superclass = TriangleCellType; - using CoordRepType = Superclass::CoordRepType; + using CoordinateType = Superclass::CoordinateType; using PointsContainer = Superclass::PointsContainer; using InterpolationWeightType = Superclass::InterpolationWeightType; public: bool - EvaluatePosition(CoordRepType * inputPoint, + EvaluatePosition(CoordinateType * inputPoint, PointsContainer * points, - CoordRepType * closestPoint, - CoordRepType pcoord[], + CoordinateType * closestPoint, + CoordinateType pcoord[], double * distance, InterpolationWeightType * weights) override { @@ -88,7 +88,7 @@ itkTriangleCellTest(int, char *[]) /** * Define the 3d geometric positions for 4 points in a square. */ - MeshType::CoordRepType testPointCoords[numberOfPoints][3] = { + MeshType::CoordinateType testPointCoords[numberOfPoints][3] = { { 0, 0, 0 }, { 10, 0, 0 }, { 10, 10, 0 }, { 0, 10, 0 } }; @@ -152,10 +152,10 @@ itkTriangleCellTest(int, char *[]) // // Exercise the EvaluatePosition() method of the TriangleCell // - TriangleCellType::CoordRepType inputPoint[3]; + TriangleCellType::CoordinateType inputPoint[3]; TriangleCellType::PointsContainer * points = mesh->GetPoints(); - TriangleCellType::CoordRepType closestPoint[3]; - TriangleCellType::CoordRepType pcoords[3]; + TriangleCellType::CoordinateType closestPoint[3]; + TriangleCellType::CoordinateType pcoords[3]; double distance; TriangleCellType::InterpolationWeightType weights[3]; diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorsTestHelper.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorsTestHelper.h index 7d3ad658c9a..8ad48d58e89 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorsTestHelper.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshEulerOperatorsTestHelper.h @@ -49,16 +49,16 @@ std::vector GeneratePointCoordinates(const unsigned int iN) { using PointType = typename TMesh::PointType; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordinateType; std::vector oPt(iN * iN); for (unsigned int i = 0; i < iN; ++i) { for (unsigned int j = 0; j < iN; ++j) { - oPt[i * iN + j][0] = static_cast(j); - oPt[i * iN + j][1] = static_cast(i); - oPt[i * iN + j][2] = static_cast(0.); + oPt[i * iN + j][0] = static_cast(j); + oPt[i * iN + j][1] = static_cast(i); + oPt[i * iN + j][2] = static_cast(0.); } } diff --git a/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshAddFaceTest1.cxx b/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshAddFaceTest1.cxx index c812f9feeb0..89320cfd34a 100644 --- a/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshAddFaceTest1.cxx +++ b/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshAddFaceTest1.cxx @@ -70,7 +70,7 @@ itkQuadEdgeMeshAddFaceTest1(int argc, char * argv[]) constexpr int NumPoints = 7; PointIdentifier pid[NumPoints]; - PointType::CoordRepType a = std::sqrt(3.0) / 2.0; + PointType::CoordinateType a = std::sqrt(3.0) / 2.0; using ValueArrayType = PointType::ValueArrayType; diff --git a/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshPolygonCellTest.cxx b/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshPolygonCellTest.cxx index e6ebd5ba648..f66427cc86f 100644 --- a/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshPolygonCellTest.cxx +++ b/Modules/Core/QuadEdgeMesh/test/itkQuadEdgeMeshPolygonCellTest.cxx @@ -68,8 +68,8 @@ itkQuadEdgeMeshPolygonCellTest(int, char *[]) /** * Define the 3d geometric positions for 8 points in a cube. */ - MeshType::CoordRepType testPointCoords[8][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 0, 9 }, { 0, 0, 9 }, - { 0, 9, 0 }, { 9, 9, 0 }, { 9, 9, 9 }, { 0, 9, 9 } }; + MeshType::CoordinateType testPointCoords[8][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 0, 9 }, { 0, 0, 9 }, + { 0, 9, 0 }, { 9, 9, 0 }, { 9, 9, 9 }, { 0, 9, 9 } }; /** * Add our test points to the mesh. diff --git a/Modules/Core/SpatialObjects/test/itkMeshSpatialObjectTest.cxx b/Modules/Core/SpatialObjects/test/itkMeshSpatialObjectTest.cxx index 745b17b9ba5..c6fbb822462 100644 --- a/Modules/Core/SpatialObjects/test/itkMeshSpatialObjectTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkMeshSpatialObjectTest.cxx @@ -38,7 +38,7 @@ itkMeshSpatialObjectTest(int, char *[]) // Create an itkMesh auto mesh = MeshType::New(); - MeshType::CoordRepType testPointCoords[4][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 9, 0 }, { 0, 0, 9 } }; + MeshType::CoordinateType testPointCoords[4][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 9, 0 }, { 0, 0, 9 } }; MeshType::PointIdentifier tetraPoints[4] = { 0, 1, 2, 3 }; @@ -140,7 +140,7 @@ itkMeshSpatialObjectTest(int, char *[]) // Create an itkMesh auto meshTriangle = MeshType::New(); - MeshType::CoordRepType testTrianglePointCoords[4][3] = { + MeshType::CoordinateType testTrianglePointCoords[4][3] = { { 50, 50, 64 }, { 50, 100, 64 }, { 100, 50, 64 }, { 100, 100, 64 } }; diff --git a/Modules/Core/Transform/test/itkTransformsSetParametersTest.cxx b/Modules/Core/Transform/test/itkTransformsSetParametersTest.cxx index e3976667d4c..7c4257ae2eb 100644 --- a/Modules/Core/Transform/test/itkTransformsSetParametersTest.cxx +++ b/Modules/Core/Transform/test/itkTransformsSetParametersTest.cxx @@ -55,17 +55,17 @@ TestKernelTransform(const char * name, KernelType *) sourceLandmarks->GetPoints()->Reserve(4); // Generate some random coordinates - typename KernelPointSetType::CoordRepType randomCoords[3]; + typename KernelPointSetType::CoordinateType randomCoords[3]; for (int i = 0; i < 4; ++i) { - randomCoords[0] = (typename KernelPointSetType::CoordRepType)vnl_sample_uniform(-1.0, 1.0); - randomCoords[1] = (typename KernelPointSetType::CoordRepType)vnl_sample_uniform(-1.0, 1.0); - randomCoords[2] = (typename KernelPointSetType::CoordRepType)vnl_sample_uniform(-1.0, 1.0); + randomCoords[0] = (typename KernelPointSetType::CoordinateType)vnl_sample_uniform(-1.0, 1.0); + randomCoords[1] = (typename KernelPointSetType::CoordinateType)vnl_sample_uniform(-1.0, 1.0); + randomCoords[2] = (typename KernelPointSetType::CoordinateType)vnl_sample_uniform(-1.0, 1.0); targetLandmarks->GetPoints()->SetElement(i, randomCoords); - randomCoords[0] = (typename KernelPointSetType::CoordRepType)vnl_sample_uniform(-1.0, 1.0); - randomCoords[1] = (typename KernelPointSetType::CoordRepType)vnl_sample_uniform(-1.0, 1.0); - randomCoords[2] = (typename KernelPointSetType::CoordRepType)vnl_sample_uniform(-1.0, 1.0); + randomCoords[0] = (typename KernelPointSetType::CoordinateType)vnl_sample_uniform(-1.0, 1.0); + randomCoords[1] = (typename KernelPointSetType::CoordinateType)vnl_sample_uniform(-1.0, 1.0); + randomCoords[2] = (typename KernelPointSetType::CoordinateType)vnl_sample_uniform(-1.0, 1.0); sourceLandmarks->GetPoints()->SetElement(i, randomCoords); } diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest.cxx index 25c9c561c2b..b9d36ea3409 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest.cxx @@ -36,10 +36,10 @@ itkResampleImageTest(int, char *[]) using ImagePointerType = ImageType::Pointer; using ImageRegionType = ImageType::RegionType; using ImageSizeType = ImageType::SizeType; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using AffineTransformType = itk::AffineTransform; + using InterpolatorType = itk::LinearInterpolateImageFunction; // Create and configure an image diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx index af565afb6c9..4d6d56c2c31 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2.cxx @@ -81,12 +81,12 @@ itkResampleImageTest2(int argc, char * argv[]) using PixelType = unsigned char; using ImageType = itk::Image; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; - using NonlinearAffineTransformType = NonlinearAffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; - using ExtrapolatorType = itk::NearestNeighborExtrapolateImageFunction; + using AffineTransformType = itk::AffineTransform; + using NonlinearAffineTransformType = NonlinearAffineTransform; + using InterpolatorType = itk::LinearInterpolateImageFunction; + using ExtrapolatorType = itk::NearestNeighborExtrapolateImageFunction; using ReaderType = itk::ImageFileReader; using WriterType = itk::ImageFileWriter; diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx index 7445cb8436f..580c6bad285 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest2Streaming.cxx @@ -76,12 +76,12 @@ itkResampleImageTest2Streaming(int argc, char * argv[]) using PixelType = unsigned char; using ImageType = itk::Image; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; - using NonlinearAffineTransformType = NonlinearAffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; - using ExtrapolatorType = itk::NearestNeighborExtrapolateImageFunction; + using AffineTransformType = itk::AffineTransform; + using NonlinearAffineTransformType = NonlinearAffineTransform; + using InterpolatorType = itk::LinearInterpolateImageFunction; + using ExtrapolatorType = itk::NearestNeighborExtrapolateImageFunction; using ReaderType = itk::ImageFileReader; using WriterType = itk::ImageFileWriter; diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest3.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest3.cxx index c2a499d2ca1..13097afd18c 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest3.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest3.cxx @@ -47,10 +47,10 @@ itkResampleImageTest3(int argc, char * argv[]) using PixelType = unsigned char; using ImageType = itk::Image; - using CoordRepType = double; + using CoordinateType = double; - using TransformType = itk::IdentityTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using TransformType = itk::IdentityTransform; + using InterpolatorType = itk::LinearInterpolateImageFunction; using ReaderType = itk::ImageFileReader; using WriterType = itk::ImageFileWriter; diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest4.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest4.cxx index b37c3f2caac..69cf8ffca0a 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest4.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest4.cxx @@ -37,11 +37,11 @@ itkResampleImageTest4(int argc, char * argv[]) using ImageRegionType = ImageType::RegionType; using ImageSizeType = ImageType::SizeType; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; + using AffineTransformType = itk::AffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using InterpolatorType = itk::LinearInterpolateImageFunction; float scaling = 10.0; diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest5.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest5.cxx index 2d3bd13b50c..9f97484a87f 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest5.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest5.cxx @@ -47,10 +47,10 @@ itkResampleImageTest5(int argc, char * argv[]) using ImageRegionType = ImageType::RegionType; using ImageSizeType = ImageType::SizeType; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using AffineTransformType = itk::AffineTransform; + using InterpolatorType = itk::LinearInterpolateImageFunction; using WriterType = itk::ImageFileWriter; float scaling = std::stod(argv[1]); diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest6.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest6.cxx index 0a8657e7fca..c404c39b6b7 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest6.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest6.cxx @@ -50,10 +50,10 @@ itkResampleImageTest6(int argc, char * argv[]) using ImageRegionType = ImageType::RegionType; using ImageSizeType = ImageType::SizeType; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using AffineTransformType = itk::AffineTransform; + using InterpolatorType = itk::LinearInterpolateImageFunction; using WriterType = itk::ImageFileWriter; float scaling = std::stod(argv[1]); diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest7.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest7.cxx index 6dc138c1dd4..7c41e64025e 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest7.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest7.cxx @@ -41,11 +41,11 @@ itkResampleImageTest7(int, char *[]) using ImageRegionType = ImageType::RegionType; using ImageSizeType = ImageType::SizeType; - using CoordRepType = double; + using CoordinateType = double; - using AffineTransformType = itk::AffineTransform; + using AffineTransformType = itk::AffineTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using InterpolatorType = itk::LinearInterpolateImageFunction; // Create and configure an image ImagePointerType image = ImageType::New(); diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx index fd8f15c1092..8d5e868bb01 100644 --- a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx @@ -133,10 +133,10 @@ itkResampleImageTest8(int, char *[]) using OutputImageIndexType = OutputImageType::IndexType; using OutputImageSizeType = OutputImageType::SizeType; - using CoordRepType = double; + using CoordinateType = double; using TransformType = ProjectTransform; - using InterpolatorType = itk::LinearInterpolateImageFunction; + using InterpolatorType = itk::LinearInterpolateImageFunction; std::cout << "Input Image Type\n"; diff --git a/Modules/Filtering/ImageGrid/test/itkResamplePhasedArray3DSpecialCoordinatesImageTest.cxx b/Modules/Filtering/ImageGrid/test/itkResamplePhasedArray3DSpecialCoordinatesImageTest.cxx index 5af3e66ae9c..ad8912cdf70 100644 --- a/Modules/Filtering/ImageGrid/test/itkResamplePhasedArray3DSpecialCoordinatesImageTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkResamplePhasedArray3DSpecialCoordinatesImageTest.cxx @@ -37,7 +37,7 @@ using ImagePointerType = ImageType::Pointer; using ImageRegionType = ImageType::RegionType; using ImageSizeType = ImageType::SizeType; using ImageIndexType = ImageType::IndexType; -using CoordRepType = double; +using CoordinateType = double; int diff --git a/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx b/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx index 5db03045d49..8d27e7b1f25 100644 --- a/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx +++ b/Modules/IO/MeshVTK/test/itkVTKPolyDataMeshIOGTest.cxx @@ -117,25 +117,25 @@ TEST(VTKPolyDataMeshIO, LosslessWriteAndReadOfPoints) // Generate various input points that have finite coordinate values. const auto inputPoints = [] { using PointType = typename MeshType::PointType; - using CoordRepType = typename MeshType::CoordRepType; - using NumericLimits = std::numeric_limits; + using CoordinateType = typename MeshType::CoordinateType; + using NumericLimits = std::numeric_limits; std::vector points; std::mt19937 randomNumberEngine; - const auto smallRandomValue = std::uniform_real_distribution{}(randomNumberEngine); + const auto smallRandomValue = std::uniform_real_distribution{}(randomNumberEngine); const auto largeRandomValue = - std::uniform_real_distribution{ CoordRepType{ 1 }, NumericLimits::max() }(randomNumberEngine); + std::uniform_real_distribution{ CoordinateType{ 1 }, NumericLimits::max() }(randomNumberEngine); // Include random and boundary values with the test input. - for (const CoordRepType coordValue : { smallRandomValue, - largeRandomValue, - CoordRepType{ 0 }, - NumericLimits::denorm_min(), - NumericLimits::min(), - NumericLimits::epsilon(), - CoordRepType{ 1 }, - NumericLimits::max(), - NumericLimits::infinity() }) + for (const CoordinateType coordValue : { smallRandomValue, + largeRandomValue, + CoordinateType{ 0 }, + NumericLimits::denorm_min(), + NumericLimits::min(), + NumericLimits::epsilon(), + CoordinateType{ 1 }, + NumericLimits::max(), + NumericLimits::infinity() }) { points.push_back(itk::MakeFilled(coordValue)); points.push_back(itk::MakeFilled(-coordValue)); @@ -161,11 +161,11 @@ TEST(VTKPolyDataMeshIO, SupportWriteAndReadOfNaNCoordValues) { using MeshType = itk::Mesh; using PointType = typename MeshType::PointType; - using CoordRepType = typename MeshType::CoordRepType; + using CoordinateType = typename MeshType::CoordinateType; Expect_lossless_writing_and_reading_of_points( "VTKPolyDataMeshIOGTest_SupportWriteAndReadOfNaNCoordValues.vtk", - { itk::MakeFilled(std::numeric_limits::quiet_NaN()) }, + { itk::MakeFilled(std::numeric_limits::quiet_NaN()) }, writeAsBinary); } } diff --git a/Modules/Nonunit/IntegratedTest/test/itkPolygonCellTest.cxx b/Modules/Nonunit/IntegratedTest/test/itkPolygonCellTest.cxx index f345cfe8205..7e1753b82ea 100644 --- a/Modules/Nonunit/IntegratedTest/test/itkPolygonCellTest.cxx +++ b/Modules/Nonunit/IntegratedTest/test/itkPolygonCellTest.cxx @@ -65,8 +65,8 @@ itkPolygonCellTest(int, char *[]) /** * Define the 3d geometric positions for 8 points in a cube. */ - MeshType::CoordRepType testPointCoords[8][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 0, 9 }, { 0, 0, 9 }, - { 0, 9, 0 }, { 9, 9, 0 }, { 9, 9, 9 }, { 0, 9, 9 } }; + MeshType::CoordinateType testPointCoords[8][3] = { { 0, 0, 0 }, { 9, 0, 0 }, { 9, 0, 9 }, { 0, 0, 9 }, + { 0, 9, 0 }, { 9, 9, 0 }, { 9, 9, 9 }, { 0, 9, 9 } }; /** * Add our test points to the mesh. diff --git a/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx b/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx index 5ff2e901afb..e33c8af5855 100644 --- a/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx +++ b/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx @@ -23,8 +23,8 @@ int itkTriangleHelperTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) { constexpr unsigned int Dimension = 3; - using CoordRepType = double; - using PointType = itk::Point; + using CoordinateType = double; + using PointType = itk::Point; using VectorType = PointType::VectorType; using TriangleHelperType = itk::TriangleHelper; @@ -126,7 +126,7 @@ itkTriangleHelperTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) return EXIT_FAILURE; } - CoordRepType area = TriangleHelperType::ComputeArea(a, Org, b); + CoordinateType area = TriangleHelperType::ComputeArea(a, Org, b); if (itk::Math::abs(area - 0.25) > 1e-6) { std::cout << "TriangleHelperType::ComputeArea( a, Org, b ) FAILED" << std::endl; diff --git a/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx b/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx index e266deb132a..8e6ab8372dc 100644 --- a/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx +++ b/Modules/Nonunit/Review/test/itkImageFunctionTest.cxx @@ -111,16 +111,16 @@ itkImageFunctionTest(int, char *[]) using SizeType = RegionType::SizeType; using IndexType = ImageType::IndexType; - using CoordRepType = float; - using ContinuousIndexType = itk::ContinuousIndex; - using PointType = itk::Point; + using CoordinateType = float; + using ContinuousIndexType = itk::ContinuousIndex; + using PointType = itk::Point; using IndexNumericTraits = itk::NumericTraits; using ContinuousIndexNumericTraits = itk::NumericTraits; using PointNumericTraits = itk::NumericTraits; - using FunctionType = itk::TestImageFunction; + using FunctionType = itk::TestImageFunction; auto image = ImageType::New(); diff --git a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx index 03daf6aed09..9c09ba0db87 100644 --- a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx +++ b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest2.cxx @@ -239,8 +239,8 @@ itkGPUDemonsRegistrationFilterTest2(int argc, char * argv[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); warper->SetInput(moving); diff --git a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx index 1598d267c4c..1002fe0079a 100644 --- a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx @@ -75,7 +75,7 @@ itkEuclideanDistancePointSetMetricRegistrationTestRun(unsigned int { using PointSetType = TPointSet; using PointType = typename PointSetType::PointType; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordinateType; auto fixedPoints = PointSetType::New(); @@ -85,20 +85,20 @@ itkEuclideanDistancePointSetMetricRegistrationTestRun(unsigned int float theta = itk::Math::pi / static_cast(180.0) * static_cast(1.0); PointType fixedPoint; - fixedPoint[0] = static_cast(0.0); - fixedPoint[1] = static_cast(0.0); + fixedPoint[0] = static_cast(0.0); + fixedPoint[1] = static_cast(0.0); fixedPoints->SetPoint(0, fixedPoint); fixedPoint[0] = pointMax; - fixedPoint[1] = static_cast(0.0); + fixedPoint[1] = static_cast(0.0); fixedPoints->SetPoint(1, fixedPoint); fixedPoint[0] = pointMax; fixedPoint[1] = pointMax; fixedPoints->SetPoint(2, fixedPoint); - fixedPoint[0] = static_cast(0.0); + fixedPoint[0] = static_cast(0.0); fixedPoint[1] = pointMax; fixedPoints->SetPoint(3, fixedPoint); - fixedPoint[0] = pointMax / static_cast(2.0); - fixedPoint[1] = pointMax / static_cast(2.0); + fixedPoint[0] = pointMax / static_cast(2.0); + fixedPoint[1] = pointMax / static_cast(2.0); fixedPoints->SetPoint(4, fixedPoint); unsigned int numberOfPoints = fixedPoints->GetNumberOfPoints(); diff --git a/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx b/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx index d939e358caa..f2effa77621 100644 --- a/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx @@ -77,7 +77,7 @@ itkExpectationBasedPointSetMetricTestRun() ITK_EXERCISE_BASIC_OBJECT_METHODS(metric, ExpectationBasedPointSetToPointSetMetricv4, PointSetToPointSetMetricv4); - typename PointSetMetricType::CoordRepType pointSetSigma = 1.0; + typename PointSetMetricType::CoordinateType pointSetSigma = 1.0; metric->SetPointSetSigma(pointSetSigma); ITK_TEST_SET_GET_VALUE(pointSetSigma, metric->GetPointSetSigma()); diff --git a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx index 2fcae9c1a00..803eefcc3ff 100644 --- a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx @@ -627,8 +627,8 @@ itkImageToImageMetricv4Test(int, char ** const) using PointSetType = ImageToImageMetricv4TestMetricType::FixedSampledPointSetType; using PointType = PointSetType::PointType; - PointSetType::CoordRepType testPointCoords[2]; - PointSetType::Pointer pset(PointSetType::New()); + PointSetType::CoordinateType testPointCoords[2]; + PointSetType::Pointer pset(PointSetType::New()); std::cout << "Creating point set..." << std::endl; DimensionSizeType ind = 0; diff --git a/Modules/Registration/PDEDeformable/test/itkCurvatureRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkCurvatureRegistrationFilterTest.cxx index 5c68c49318f..119bbb95c4e 100644 --- a/Modules/Registration/PDEDeformable/test/itkCurvatureRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkCurvatureRegistrationFilterTest.cxx @@ -198,8 +198,8 @@ itkCurvatureRegistrationFilterTest(int, char *[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx index 30165927092..7bb1b05d8a5 100644 --- a/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx @@ -251,8 +251,8 @@ itkDemonsRegistrationFilterTest(int, char *[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx index ee103647500..684aa5ee5a3 100644 --- a/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx @@ -276,8 +276,8 @@ itkDiffeomorphicDemonsRegistrationFilterTest(int argc, char * argv[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest2.cxx b/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest2.cxx index 3fd8586026d..224a86cd091 100644 --- a/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest2.cxx +++ b/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest2.cxx @@ -180,8 +180,8 @@ itkDiffeomorphicDemonsRegistrationFilterTest2(int argc, char * argv[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); const ImageType * fixed = fixedReader->GetOutput(); diff --git a/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx index 9c875632f8b..81a714826bc 100644 --- a/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx @@ -244,8 +244,8 @@ itkFastSymmetricForcesDemonsRegistrationFilterTest(int, char *[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx index 65229527b84..b7ad6d83d24 100644 --- a/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx @@ -254,8 +254,8 @@ itkLevelSetMotionRegistrationFilterTest(int argc, char * argv[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); warper->SetInput(moving); diff --git a/Modules/Registration/PDEDeformable/test/itkMultiResolutionPDEDeformableRegistrationTest.cxx b/Modules/Registration/PDEDeformable/test/itkMultiResolutionPDEDeformableRegistrationTest.cxx index ee4e5e59237..aea7d6538f9 100644 --- a/Modules/Registration/PDEDeformable/test/itkMultiResolutionPDEDeformableRegistrationTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkMultiResolutionPDEDeformableRegistrationTest.cxx @@ -305,8 +305,8 @@ itkMultiResolutionPDEDeformableRegistrationTest(int argc, char * argv[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx index 46988e67d73..2ded6885610 100644 --- a/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx @@ -207,8 +207,8 @@ itkSymmetricForcesDemonsRegistrationFilterTest(int, char *[]) using WarperType = itk::WarpImageFilter; auto warper = WarperType::New(); - using CoordRepType = WarperType::CoordRepType; - using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; + using CoordinateType = WarperType::CoordinateType; + using InterpolatorType = itk::NearestNeighborInterpolateImageFunction; auto interpolator = InterpolatorType::New(); diff --git a/Modules/Segmentation/DeformableMesh/test/itkSimplexMeshWithFloatCoordRepTest.cxx b/Modules/Segmentation/DeformableMesh/test/itkSimplexMeshWithFloatCoordRepTest.cxx index 693ec517dc3..73b5b772cf2 100644 --- a/Modules/Segmentation/DeformableMesh/test/itkSimplexMeshWithFloatCoordRepTest.cxx +++ b/Modules/Segmentation/DeformableMesh/test/itkSimplexMeshWithFloatCoordRepTest.cxx @@ -24,8 +24,8 @@ itkSimplexMeshWithFloatCoordRepTest(int, char *[]) constexpr unsigned int Dimension = 3; using PixelType = float; - using CoordRepType = float; - using MeshTraits = itk::DefaultDynamicMeshTraits; + using CoordinateType = float; + using MeshTraits = itk::DefaultDynamicMeshTraits; using MeshType = itk::SimplexMesh; using DeformType = itk::DeformableSimplexMesh3DFilter;