diff --git a/Examples/RegistrationITKv4/ImageRegistration11.cxx b/Examples/RegistrationITKv4/ImageRegistration11.cxx index 6ae77815973..0f0b4e75f04 100644 --- a/Examples/RegistrationITKv4/ImageRegistration11.cxx +++ b/Examples/RegistrationITKv4/ImageRegistration11.cxx @@ -85,7 +85,7 @@ class CommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; diff --git a/Examples/RegistrationITKv4/ImageRegistration14.cxx b/Examples/RegistrationITKv4/ImageRegistration14.cxx index fb3b7aceab8..450972547fb 100644 --- a/Examples/RegistrationITKv4/ImageRegistration14.cxx +++ b/Examples/RegistrationITKv4/ImageRegistration14.cxx @@ -76,7 +76,7 @@ class CommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; diff --git a/Examples/RegistrationITKv4/ImageRegistration15.cxx b/Examples/RegistrationITKv4/ImageRegistration15.cxx index b919809b6bd..cc8070794d2 100644 --- a/Examples/RegistrationITKv4/ImageRegistration15.cxx +++ b/Examples/RegistrationITKv4/ImageRegistration15.cxx @@ -75,7 +75,7 @@ class CommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; diff --git a/Modules/Core/Common/include/itkBSplineKernelFunction.h b/Modules/Core/Common/include/itkBSplineKernelFunction.h index 094d5d85a8a..b13fb4624ec 100644 --- a/Modules/Core/Common/include/itkBSplineKernelFunction.h +++ b/Modules/Core/Common/include/itkBSplineKernelFunction.h @@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT BSplineKernelFunction : public KernelFunctionBase &, const TRealValueType & u) { - const TRealValueType absValue = itk::Math::abs(u); + const TRealValueType absValue = itk::Math::Absolute(u); if (absValue < TRealValueType{ 0.5 }) { return TRealValueType{ 1.0 }; @@ -117,7 +117,7 @@ class ITK_TEMPLATE_EXPORT BSplineKernelFunction : public KernelFunctionBase &, const TRealValueType & u) { - const TRealValueType absValue = itk::Math::abs(u); + const TRealValueType absValue = itk::Math::Absolute(u); if (absValue < TRealValueType{ 1.0 }) { return TRealValueType{ 1.0 } - absValue; @@ -130,7 +130,7 @@ class ITK_TEMPLATE_EXPORT BSplineKernelFunction : public KernelFunctionBase &, const TRealValueType & u) { - const TRealValueType absValue = itk::Math::abs(u); + const TRealValueType absValue = itk::Math::Absolute(u); if (absValue < TRealValueType{ 0.5 }) { const TRealValueType sqrValue = itk::Math::sqr(absValue); @@ -153,7 +153,7 @@ class ITK_TEMPLATE_EXPORT BSplineKernelFunction : public KernelFunctionBase &, const TRealValueType & u) { - const TRealValueType absValue = itk::Math::abs(u); + const TRealValueType absValue = itk::Math::Absolute(u); if (absValue < TRealValueType{ 1.0 }) { const TRealValueType sqrValue = itk::Math::sqr(absValue); diff --git a/Modules/Core/Common/include/itkBresenhamLine.hxx b/Modules/Core/Common/include/itkBresenhamLine.hxx index 6da54e2aaa9..e7c16312130 100644 --- a/Modules/Core/Common/include/itkBresenhamLine.hxx +++ b/Modules/Core/Common/include/itkBresenhamLine.hxx @@ -49,7 +49,7 @@ BresenhamLine::BuildLine(LType Direction, IdentifierType length) -> IndexType overflowIncrement; for (unsigned int i = 0; i < VDimension; ++i) { - auto distance = static_cast(itk::Math::abs(LastIndex[i])); + auto distance = static_cast(itk::Math::Absolute(LastIndex[i])); if (distance > maxDistance) { maxDistance = distance; @@ -113,7 +113,7 @@ BresenhamLine::BuildLine(IndexType p0, IndexType p1) -> IndexArray { point0[i] = p0[i]; point1[i] = p1[i]; - const IdentifierType distance = itk::Math::abs(p0[i] - p1[i]) + 1; + const IdentifierType distance = itk::Math::Absolute(p0[i] - p1[i]) + 1; if (distance > maxDistance) { maxDistance = distance; diff --git a/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.hxx b/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.hxx index f04bcd0a853..98acd07fb5b 100644 --- a/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.hxx +++ b/Modules/Core/Common/include/itkFiniteCylinderSpatialFunction.hxx @@ -102,7 +102,7 @@ FiniteCylinderSpatialFunction::Evaluate(const InputType & po FloatingPointExceptions::SetEnabled(saveFPEState); } - if (itk::Math::abs(distanceFromCenter) <= (halfAxisLength) && + if (itk::Math::Absolute(distanceFromCenter) <= (halfAxisLength) && m_Radius >= std::sqrt(Math::sqr(pointVector.GetNorm()) - Math::sqr(distanceFromCenter))) { return 1; diff --git a/Modules/Core/Common/include/itkFrustumSpatialFunction.hxx b/Modules/Core/Common/include/itkFrustumSpatialFunction.hxx index 9cc805fd6d1..49d157c1f8c 100644 --- a/Modules/Core/Common/include/itkFrustumSpatialFunction.hxx +++ b/Modules/Core/Common/include/itkFrustumSpatialFunction.hxx @@ -62,7 +62,7 @@ FrustumSpatialFunction::Evaluate(const InputType & position) // Check planes along Y const double angleY = std::atan2(dy, distanceXZ); - if (itk::Math::abs(angleY) > m_ApertureAngleY * deg2rad) + if (itk::Math::Absolute(angleY) > m_ApertureAngleY * deg2rad) { return 0; } @@ -89,7 +89,7 @@ FrustumSpatialFunction::Evaluate(const InputType & position) // Check planes along X const double angleX = std::atan2(dx, distanceYZ); - if (itk::Math::abs(angleX) > m_ApertureAngleX * deg2rad) + if (itk::Math::Absolute(angleX) > m_ApertureAngleX * deg2rad) { return 0; } diff --git a/Modules/Core/Common/include/itkGaussianDerivativeOperator.hxx b/Modules/Core/Common/include/itkGaussianDerivativeOperator.hxx index 583804eab53..250cf395d4f 100644 --- a/Modules/Core/Common/include/itkGaussianDerivativeOperator.hxx +++ b/Modules/Core/Common/include/itkGaussianDerivativeOperator.hxx @@ -163,7 +163,7 @@ GaussianDerivativeOperator::ModifiedBesselI0(dou { double accumulator = NAN; - const double d = itk::Math::abs(y); + const double d = itk::Math::Absolute(y); if (d < 3.75) { double m = y / 3.75; @@ -191,7 +191,7 @@ double GaussianDerivativeOperator::ModifiedBesselI1(double y) { double accumulator = NAN; - const double d = itk::Math::abs(y); + const double d = itk::Math::Absolute(y); if (d < 3.75) { double m = y / 3.75; @@ -236,7 +236,7 @@ GaussianDerivativeOperator::ModifiedBesselI(int return 0.0; } - const double toy = 2.0 / itk::Math::abs(y); + const double toy = 2.0 / itk::Math::Absolute(y); double qip = accumulator = 0.0; double qi = 1.0; for (int j = 2 * (n + static_cast(DIGITS * std::sqrt(static_cast(n)))); j > 0; j--) @@ -244,7 +244,7 @@ GaussianDerivativeOperator::ModifiedBesselI(int const double qim = qip + j * toy * qi; qip = qi; qi = qim; - if (itk::Math::abs(qi) > 1.0e10) + if (itk::Math::Absolute(qi) > 1.0e10) { accumulator *= 1.0e-10; qi *= 1.0e-10; diff --git a/Modules/Core/Common/include/itkGaussianOperator.hxx b/Modules/Core/Common/include/itkGaussianOperator.hxx index 5aa580cd3a8..53c686aeb0f 100644 --- a/Modules/Core/Common/include/itkGaussianOperator.hxx +++ b/Modules/Core/Common/include/itkGaussianOperator.hxx @@ -75,7 +75,7 @@ template double GaussianOperator::ModifiedBesselI0(double y) { - const double d = itk::Math::abs(y); + const double d = itk::Math::Absolute(y); double accumulator = NAN; if (d < 3.75) @@ -104,7 +104,7 @@ template double GaussianOperator::ModifiedBesselI1(double y) { - const double d = itk::Math::abs(y); + const double d = itk::Math::Absolute(y); double accumulator = NAN; if (d < 3.75) @@ -151,7 +151,7 @@ GaussianOperator::ModifiedBesselI(int n, double return 0.0; } - const double toy = 2.0 / itk::Math::abs(y); + const double toy = 2.0 / itk::Math::Absolute(y); double qip = 0.0; double accumulator = 0.0; double qi = 1.0; @@ -161,7 +161,7 @@ GaussianOperator::ModifiedBesselI(int n, double const double qim = qip + j * toy * qi; qip = qi; qi = qim; - if (itk::Math::abs(qi) > 1.0e10) + if (itk::Math::Absolute(qi) > 1.0e10) { accumulator *= 1.0e-10; qi *= 1.0e-10; diff --git a/Modules/Core/Common/include/itkHexahedronCell.hxx b/Modules/Core/Common/include/itkHexahedronCell.hxx index 4dc07d8a174..2d6fe6121ea 100644 --- a/Modules/Core/Common/include/itkHexahedronCell.hxx +++ b/Modules/Core/Common/include/itkHexahedronCell.hxx @@ -402,7 +402,7 @@ HexahedronCell::EvaluatePosition(CoordinateType * x, // spell-check-disable // d=vtkMath::Determinant3x3(rcol,scol,tcol); // spell-check-enable - if (itk::Math::abs(d) < 1.e-20) + if (itk::Math::Absolute(d) < 1.e-20) { return false; } @@ -443,16 +443,16 @@ HexahedronCell::EvaluatePosition(CoordinateType * x, } // check for convergence - if (((itk::Math::abs(pcoords[0] - params[0])) < ITK_HEX_CONVERGED) && - ((itk::Math::abs(pcoords[1] - params[1])) < ITK_HEX_CONVERGED) && - ((itk::Math::abs(pcoords[2] - params[2])) < ITK_HEX_CONVERGED)) + if (((itk::Math::Absolute(pcoords[0] - params[0])) < ITK_HEX_CONVERGED) && + ((itk::Math::Absolute(pcoords[1] - params[1])) < ITK_HEX_CONVERGED) && + ((itk::Math::Absolute(pcoords[2] - params[2])) < ITK_HEX_CONVERGED)) { converged = 1; } // Test for bad divergence (S.Hirschberg 11.12.2001) - else if ((itk::Math::abs(pcoords[0]) > ITK_DIVERGED) || (itk::Math::abs(pcoords[1]) > ITK_DIVERGED) || - (itk::Math::abs(pcoords[2]) > ITK_DIVERGED)) + else if ((itk::Math::Absolute(pcoords[0]) > ITK_DIVERGED) || (itk::Math::Absolute(pcoords[1]) > ITK_DIVERGED) || + (itk::Math::Absolute(pcoords[2]) > ITK_DIVERGED)) { return false; } diff --git a/Modules/Core/Common/include/itkImageBase.hxx b/Modules/Core/Common/include/itkImageBase.hxx index 9b6e92cf990..d0428454da9 100644 --- a/Modules/Core/Common/include/itkImageBase.hxx +++ b/Modules/Core/Common/include/itkImageBase.hxx @@ -398,7 +398,7 @@ ImageBase::IsCongruentImageGeometry(const ImageBase * otherImag // tolerance for origin and spacing depends on the size of pixel // tolerance for directions a fraction of the unit cube. const SpacePrecisionType coordinateTol = - itk::Math::abs(coordinateTolerance * this->GetSpacing()[0]); // use first dimension spacing + itk::Math::Absolute(coordinateTolerance * this->GetSpacing()[0]); // use first dimension spacing return this->GetOrigin().GetVnlVector().is_equal(otherImage->GetOrigin().GetVnlVector(), coordinateTol) && this->GetSpacing().GetVnlVector().is_equal(otherImage->GetSpacing().GetVnlVector(), coordinateTol) && diff --git a/Modules/Core/Common/include/itkImageSink.hxx b/Modules/Core/Common/include/itkImageSink.hxx index 0e062454195..763e65b848e 100644 --- a/Modules/Core/Common/include/itkImageSink.hxx +++ b/Modules/Core/Common/include/itkImageSink.hxx @@ -203,7 +203,7 @@ ImageSink::VerifyInputInformation() const // tolerance for origin and spacing depends on the size of pixel // tolerance for directions a fraction of the unit cube. const SpacePrecisionType coordinateTol = - itk::Math::abs(this->m_CoordinateTolerance * inputPtr1->GetSpacing()[0]); // use first dimension spacing + itk::Math::Absolute(this->m_CoordinateTolerance * inputPtr1->GetSpacing()[0]); // use first dimension spacing if (!inputPtr1->GetOrigin().GetVnlVector().is_equal(inputPtrN->GetOrigin().GetVnlVector(), coordinateTol) || !inputPtr1->GetSpacing().GetVnlVector().is_equal(inputPtrN->GetSpacing().GetVnlVector(), coordinateTol) || diff --git a/Modules/Core/Common/include/itkImageToImageFilter.hxx b/Modules/Core/Common/include/itkImageToImageFilter.hxx index e6c6d6aeb4c..1b8784235ca 100644 --- a/Modules/Core/Common/include/itkImageToImageFilter.hxx +++ b/Modules/Core/Common/include/itkImageToImageFilter.hxx @@ -182,7 +182,7 @@ ImageToImageFilter::VerifyInputInformation() const // tolerance for origin and spacing depends on the size of pixel // tolerance for directions a fraction of the unit cube. const SpacePrecisionType coordinateTol = - itk::Math::abs(this->m_CoordinateTolerance * inputPtr1->GetSpacing()[0]); // use first dimension spacing + itk::Math::Absolute(this->m_CoordinateTolerance * inputPtr1->GetSpacing()[0]); // use first dimension spacing if (!inputPtr1->IsCongruentImageGeometry(inputPtrN, m_CoordinateTolerance, m_DirectionTolerance)) { diff --git a/Modules/Core/Common/include/itkLineConstIterator.hxx b/Modules/Core/Common/include/itkLineConstIterator.hxx index 2f0e54000d0..e0b0e95ed08 100644 --- a/Modules/Core/Common/include/itkLineConstIterator.hxx +++ b/Modules/Core/Common/include/itkLineConstIterator.hxx @@ -39,7 +39,7 @@ LineConstIterator::LineConstIterator(const ImageType * imagePtr, unsigned int maxDistanceDimension = 0; for (unsigned int i = 0; i < TImage::ImageDimension; ++i) { - const IndexValueType distance = itk::Math::abs(difference[i]); + const IndexValueType distance = itk::Math::Absolute(difference[i]); if (distance > maxDistance) { maxDistance = distance; diff --git a/Modules/Core/Common/include/itkMath.h b/Modules/Core/Common/include/itkMath.h index 0507d3dcbe2..805f241bd75 100644 --- a/Modules/Core/Common/include/itkMath.h +++ b/Modules/Core/Common/include/itkMath.h @@ -860,10 +860,16 @@ using vnl_math::squared_magnitude; * @brief Returns the absolute value of a number. * * This function provides a c++17 implementation of the vnl_math::abs absolute value functionality. - * safe_abs preserves backward compatibility with vnl_math::abs that was originally used in ITK. + * itk::Absolute() preserves backward compatibility with vnl_math::abs that was originally used in ITK. * - * Where std::abs returns the absolute value in the same type as the input, itk::safe_abs - * returns the absolute value in the unsigned equivalent of the input type. + * Key differences between itk::Absolute() and std::abs() + * - Where std::abs() returns the absolute value in the same type as the + * input, itk::Absolute() returns the absolute value in the unsigned + * equivalent of the input type. + * - std::abs() is undefined when converting the minimum storage value of unsigned + * integers to positive values. itk::Absolute() typecasts to a larger storage type + * before taking the absolute value to prevent overflow failures. This is used in + * all cases except 'signed long long' where there is no larger storage type. * * @tparam T The type of the input number. * @param x The input number. @@ -871,7 +877,7 @@ using vnl_math::squared_magnitude; */ template constexpr auto -safe_abs(T x) noexcept +Absolute(T x) noexcept { if constexpr (std::is_same_v) { @@ -937,23 +943,23 @@ safe_abs(T x) noexcept } template auto -safe_abs(const std::complex & x) noexcept +Absolute(const std::complex & x) noexcept { // std::abs(std::complex) is not constexpr in in any proposed c++ standard return std::abs(x); } - -// itk::Math::abs has different behavior than std::abs. The use of +#if !defined(ITK_FUTURE_LEGACY_REMOVE) +// itk::Math::Absolute has different behavior than std::abs. The use of // abs() in the ITK context without namespace resolution can be confusing // The abs() version is provided for backwards compatibility. template auto abs(T x) noexcept { - return safe_abs(x); + return Absolute(x); } - +#endif } // namespace itk::Math diff --git a/Modules/Core/Common/include/itkNumericTraits.h b/Modules/Core/Common/include/itkNumericTraits.h index 16ce69396e2..a1e552ab9ab 100644 --- a/Modules/Core/Common/include/itkNumericTraits.h +++ b/Modules/Core/Common/include/itkNumericTraits.h @@ -69,7 +69,7 @@ class NumericTraits : public std::numeric_limits /** Return the type that can be printed. */ using PrintType = T; - /** Return value of itk::Math::abs(). */ + /** Return value of itk::Math::Absolute(). */ using AbsType = T; /** Accumulation of addition and multiplication. */ diff --git a/Modules/Core/Common/include/itkQuadrilateralCell.hxx b/Modules/Core/Common/include/itkQuadrilateralCell.hxx index 00e5f8deb4d..32b8845cc10 100644 --- a/Modules/Core/Common/include/itkQuadrilateralCell.hxx +++ b/Modules/Core/Common/include/itkQuadrilateralCell.hxx @@ -337,7 +337,7 @@ QuadrilateralCell::EvaluatePosition(CoordinateType * x, // spell-check-disable // d=vtkMath::Determinant2x2(rcol,scol); // spell-check-enable - if (itk::Math::abs(d) < 1.e-20) + if (itk::Math::Absolute(d) < 1.e-20) { return false; } @@ -366,14 +366,14 @@ QuadrilateralCell::EvaluatePosition(CoordinateType * x, } // check for convergence - if (((itk::Math::abs(pcoords[0] - params[0])) < ITK_QUAD_CONVERGED) && - ((itk::Math::abs(pcoords[1] - params[1])) < ITK_QUAD_CONVERGED)) + if (((itk::Math::Absolute(pcoords[0] - params[0])) < ITK_QUAD_CONVERGED) && + ((itk::Math::Absolute(pcoords[1] - params[1])) < ITK_QUAD_CONVERGED)) { converged = 1; } // Test for bad divergence (S.Hirschberg 11.12.2001) - else if ((itk::Math::abs(pcoords[0]) > ITK_DIVERGED) || (itk::Math::abs(pcoords[1]) > ITK_DIVERGED)) + else if ((itk::Math::Absolute(pcoords[0]) > ITK_DIVERGED) || (itk::Math::Absolute(pcoords[1]) > ITK_DIVERGED)) { return false; } diff --git a/Modules/Core/Common/include/itkSinRegularizedHeavisideStepFunction.hxx b/Modules/Core/Common/include/itkSinRegularizedHeavisideStepFunction.hxx index 3be2f12c4b8..4f907563c95 100644 --- a/Modules/Core/Common/include/itkSinRegularizedHeavisideStepFunction.hxx +++ b/Modules/Core/Common/include/itkSinRegularizedHeavisideStepFunction.hxx @@ -48,7 +48,7 @@ template auto SinRegularizedHeavisideStepFunction::EvaluateDerivative(const InputType & input) const -> OutputType { - if (itk::Math::abs(static_cast(input)) >= this->GetEpsilon()) + if (itk::Math::Absolute(static_cast(input)) >= this->GetEpsilon()) { return OutputType{}; } diff --git a/Modules/Core/Common/include/itkSpatialOrientationAdapter.h b/Modules/Core/Common/include/itkSpatialOrientationAdapter.h index 016c3b4c606..45b8128b89f 100644 --- a/Modules/Core/Common/include/itkSpatialOrientationAdapter.h +++ b/Modules/Core/Common/include/itkSpatialOrientationAdapter.h @@ -43,9 +43,9 @@ Max3(double x, double y, double z) { constexpr double obliquityThresholdCosineValue{ 0.001 }; - const double absX = itk::Math::abs(x); - const double absY = itk::Math::abs(y); - const double absZ = itk::Math::abs(z); + const double absX = itk::Math::Absolute(x); + const double absY = itk::Math::Absolute(y); + const double absZ = itk::Math::Absolute(z); if ((absX > obliquityThresholdCosineValue) && (absX > absY) && (absX > absZ)) { diff --git a/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h b/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h index d56ef8cade4..4b64dfce0d5 100644 --- a/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h +++ b/Modules/Core/Common/include/itkSymmetricEigenAnalysis.h @@ -78,7 +78,7 @@ sortEigenValuesByMagnitude(TArray & eigenValues, const unsigned int numberOfElem std::sort(std::begin(indicesSortPermutations), std::end(indicesSortPermutations), [&eigenValues](unsigned int a, unsigned int b) { - return itk::Math::abs(eigenValues[a]) < itk::Math::abs(eigenValues[b]); + return itk::Math::Absolute(eigenValues[a]) < itk::Math::Absolute(eigenValues[b]); }); auto tmpCopy = eigenValues; for (unsigned int i = 0; i < numberOfElements; ++i) diff --git a/Modules/Core/Common/include/itkSymmetricEigenAnalysis.hxx b/Modules/Core/Common/include/itkSymmetricEigenAnalysis.hxx index ae9f1f611d3..596270bae92 100644 --- a/Modules/Core/Common/include/itkSymmetricEigenAnalysis.hxx +++ b/Modules/Core/Common/include/itkSymmetricEigenAnalysis.hxx @@ -151,7 +151,7 @@ SymmetricEigenAnalysis::ReduceToTridiagonalMatri // Scale row (algol tol then not needed) for (int k = 0; k <= l; ++k) { - scale += itk::Math::abs(d[k]); + scale += itk::Math::Absolute(d[k]); } if (scale == 0.) @@ -175,7 +175,7 @@ SymmetricEigenAnalysis::ReduceToTridiagonalMatri e2[i] = scale * scale * h; double f = d[l]; const double d__1 = std::sqrt(h); - double g = (-1.0) * itk::Math::sgn0(f) * itk::Math::abs(d__1); + double g = (-1.0) * itk::Math::sgn0(f) * itk::Math::Absolute(d__1); e[i] = scale * g; h -= f * g; d[l] = f - g; @@ -265,7 +265,7 @@ SymmetricEigenAnalysis::ReduceToTridiagonalMatri // Scale row (algol tol then not needed) for (unsigned int k = 0; k <= l; ++k) { - scale += itk::Math::abs(d[k]); + scale += itk::Math::Absolute(d[k]); } if (scale == 0.0) @@ -289,7 +289,7 @@ SymmetricEigenAnalysis::ReduceToTridiagonalMatri double f = d[l]; const double d__1 = std::sqrt(h); - double g = (-1.0) * itk::Math::sgn0(f) * itk::Math::abs(d__1); + double g = (-1.0) * itk::Math::sgn0(f) * itk::Math::Absolute(d__1); e[i] = scale * g; h -= f * g; d[l] = f - g; @@ -422,7 +422,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesUsingQ for (unsigned int l = 0; l < m_Order; ++l) { unsigned int j = 0; - double h = itk::Math::abs(d[l]) + itk::Math::abs(e[l]); + double h = itk::Math::Absolute(d[l]) + itk::Math::Absolute(e[l]); if (tst1 < h) { tst1 = h; @@ -431,7 +431,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesUsingQ unsigned int m = l; for (; m < m_Order - 1; ++m) { - const double tst2 = tst1 + itk::Math::abs(e[m]); + const double tst2 = tst1 + itk::Math::Absolute(e[m]); if (tst2 == tst1) { break; @@ -455,8 +455,8 @@ SymmetricEigenAnalysis::ComputeEigenValuesUsingQ double g = d[l]; double p = (d[l + 1] - g) / (e[l] * 2.); double r = itk::Math::hypot(p, c_b10); - d[l] = e[l] / (p + itk::Math::sgn0(p) * itk::Math::abs(r)); - d[l + 1] = e[l] * (p + itk::Math::sgn0(p) * itk::Math::abs(r)); + d[l] = e[l] / (p + itk::Math::sgn0(p) * itk::Math::Absolute(r)); + d[l + 1] = e[l] * (p + itk::Math::sgn0(p) * itk::Math::Absolute(r)); const double dl1 = d[l + 1]; h = g - d[l]; @@ -496,7 +496,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesUsingQ p = -s * s2 * c3 * el1 * e[l] / dl1; e[l] = s * p; d[l] = c * p; - tst2 = tst1 + itk::Math::abs(e[l]); + tst2 = tst1 + itk::Math::Absolute(e[l]); } while (tst2 > tst1); } @@ -522,7 +522,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesUsingQ unsigned int i = l; for (; i > 0; --i) { - if (itk::Math::abs(p) >= itk::Math::abs(d[i - 1])) + if (itk::Math::Absolute(p) >= itk::Math::Absolute(d[i - 1])) { break; } @@ -567,7 +567,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesAndVec for (unsigned int l = 0; l < m_Order; ++l) { unsigned int j = 0; - double h = itk::Math::abs(d[l]) + itk::Math::abs(e[l]); + double h = itk::Math::Absolute(d[l]) + itk::Math::Absolute(e[l]); if (tst1 < h) { tst1 = h; @@ -579,7 +579,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesAndVec unsigned int m = l; for (; m < m_Order - 1; ++m) { - tst2 = tst1 + itk::Math::abs(e[m]); + tst2 = tst1 + itk::Math::Absolute(e[m]); if (tst2 == tst1) { break; @@ -603,8 +603,8 @@ SymmetricEigenAnalysis::ComputeEigenValuesAndVec double g = d[l]; double p = (d[l + 1] - g) / (e[l] * 2.); double r = itk::Math::hypot(p, c_b10); - d[l] = e[l] / (p + itk::Math::sgn0(p) * itk::Math::abs(r)); - d[l + 1] = e[l] * (p + itk::Math::sgn0(p) * itk::Math::abs(r)); + d[l] = e[l] / (p + itk::Math::sgn0(p) * itk::Math::Absolute(r)); + d[l + 1] = e[l] * (p + itk::Math::sgn0(p) * itk::Math::Absolute(r)); const double dl1 = d[l + 1]; h = g - d[l]; @@ -651,7 +651,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesAndVec p = -s * s2 * c3 * el1 * e[l] / dl1; e[l] = s * p; d[l] = c * p; - tst2 = tst1 + itk::Math::abs(e[l]); + tst2 = tst1 + itk::Math::Absolute(e[l]); } while (tst2 > tst1); } @@ -702,7 +702,7 @@ SymmetricEigenAnalysis::ComputeEigenValuesAndVec for (unsigned int j = i + 1; j < m_Order; ++j) { - if (itk::Math::abs(d[j]) >= itk::Math::abs(p)) + if (itk::Math::Absolute(d[j]) >= itk::Math::Absolute(p)) { continue; } diff --git a/Modules/Core/Common/include/itkVersor.hxx b/Modules/Core/Common/include/itkVersor.hxx index 9364c51896d..dfe60f51fa6 100644 --- a/Modules/Core/Common/include/itkVersor.hxx +++ b/Modules/Core/Common/include/itkVersor.hxx @@ -114,7 +114,7 @@ Versor::operator==(const Self & v) const constexpr double epsilon{ 1e-300 }; - if (itk::Math::abs(1.0f - square) < epsilon) + if (itk::Math::Absolute(1.0f - square) < epsilon) { return true; } @@ -165,7 +165,7 @@ Versor::Normalize() { const ValueType tensor = this->GetTensor(); - if (itk::Math::abs(tensor) < 1e-20) + if (itk::Math::Absolute(tensor) < 1e-20) { ExceptionObject except; except.SetDescription("Attempt to normalize a itk::Versor with zero tensor"); @@ -322,11 +322,12 @@ Versor::Set(const MatrixType & mat) // check for orthonormality and that it isn't a reflection const vnl_matrix_fixed & I = m * m.transpose(); - if (itk::Math::abs(I[0][1]) > epsilon || itk::Math::abs(I[0][2]) > epsilon || itk::Math::abs(I[1][0]) > epsilon || - itk::Math::abs(I[1][2]) > epsilon || itk::Math::abs(I[2][0]) > epsilon || itk::Math::abs(I[2][1]) > epsilon || - itk::Math::abs(I[0][0] - itk::NumericTraits::OneValue()) > epsilonDiff || - itk::Math::abs(I[1][1] - itk::NumericTraits::OneValue()) > epsilonDiff || - itk::Math::abs(I[2][2] - itk::NumericTraits::OneValue()) > epsilonDiff || vnl_det(I) < 0) + if (itk::Math::Absolute(I[0][1]) > epsilon || itk::Math::Absolute(I[0][2]) > epsilon || + itk::Math::Absolute(I[1][0]) > epsilon || itk::Math::Absolute(I[1][2]) > epsilon || + itk::Math::Absolute(I[2][0]) > epsilon || itk::Math::Absolute(I[2][1]) > epsilon || + itk::Math::Absolute(I[0][0] - itk::NumericTraits::OneValue()) > epsilonDiff || + itk::Math::Absolute(I[1][1] - itk::NumericTraits::OneValue()) > epsilonDiff || + itk::Math::Absolute(I[2][2] - itk::NumericTraits::OneValue()) > epsilonDiff || vnl_det(I) < 0) { itkGenericExceptionMacro("The following matrix does not represent rotation to within an epsion of " << epsilon << '.' << std::endl diff --git a/Modules/Core/Common/src/itkSpatialOrientationAdapter.cxx b/Modules/Core/Common/src/itkSpatialOrientationAdapter.cxx index 9e522f6835e..16a1c860938 100644 --- a/Modules/Core/Common/src/itkSpatialOrientationAdapter.cxx +++ b/Modules/Core/Common/src/itkSpatialOrientationAdapter.cxx @@ -44,7 +44,7 @@ SpatialOrientationAdapter::FromDirectionCosines(const DirectionType & Dir) { for (unsigned int r = 0; r < 3; ++r) { - value_to_idx.emplace(itk::Math::abs(Dir[c][r]), std::make_pair(c, r)); + value_to_idx.emplace(itk::Math::Absolute(Dir[c][r]), std::make_pair(c, r)); } } diff --git a/Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx b/Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx index 76286a784a4..992579d7900 100644 --- a/Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx +++ b/Modules/Core/Common/test/VNLSparseLUSolverTraitsTest.cxx @@ -17,7 +17,7 @@ *=========================================================================*/ #include "VNLSparseLUSolverTraits.h" -#include "itkMath.h" // itk::Math::abs +#include "itkMath.h" // itk::Math::Absolute #include #include @@ -34,9 +34,9 @@ VectorsEquals(const TVector & v1, const TVector & v2, const typename TVector::el for (unsigned int i = 0; i < v1.size(); ++i) { - if (itk::Math::abs(v1(i) - v2(i)) > tolerance) + if (itk::Math::Absolute(v1(i) - v2(i)) > tolerance) { - std::cerr << "Error: itk::Math::abs( v1(" << i << ") - v2(" << i << ") ) > " << tolerance << std::endl; + std::cerr << "Error: itk::Math::Absolute( v1(" << i << ") - v2(" << i << ") ) > " << tolerance << std::endl; return false; } } diff --git a/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx b/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx index c9c1cab95f6..6da91f6bdd6 100644 --- a/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx +++ b/Modules/Core/Common/test/itkBSplineInterpolationWeightFunctionTest.cxx @@ -94,7 +94,7 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) constexpr unsigned int numberOfWeigts{ weights1.size() }; - const int indexDifference = itk::Math::abs(startIndex2[0] + startIndex1[0]) & 1; + const int indexDifference = itk::Math::Absolute(startIndex2[0] + startIndex1[0]) & 1; constexpr double tolerance{ 1e-6 }; @@ -102,7 +102,7 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) for (unsigned int nw = 0; nw < numberOfWeigts - indexDifference; ++nw) { - if (itk::Math::abs(weights1[nw] - weights2[numberOfWeigts - nw - 1 - indexDifference]) > tolerance) + if (itk::Math::Absolute(weights1[nw] - weights2[numberOfWeigts - nw - 1 - indexDifference]) > tolerance) { symmetryForXBroken = true; } @@ -182,7 +182,7 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) constexpr unsigned int numberOfWeigts{ weights1.size() }; - const int indexDifference = itk::Math::abs(startIndex2[0] + startIndex1[0] + 1) & 1; + const int indexDifference = itk::Math::Absolute(startIndex2[0] + startIndex1[0] + 1) & 1; constexpr double tolerance{ 1e-6 }; @@ -190,7 +190,7 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) for (unsigned int nw = 0; nw < numberOfWeigts - indexDifference; ++nw) { - if (itk::Math::abs(weights1[nw] - weights2[numberOfWeigts - nw - 1 - indexDifference]) > tolerance) + if (itk::Math::Absolute(weights1[nw] - weights2[numberOfWeigts - nw - 1 - indexDifference]) > tolerance) { symmetryForXBroken = true; } @@ -293,7 +293,7 @@ itkBSplineInterpolationWeightFunctionTest(int, char *[]) { value *= kernel->Evaluate(static_cast(iter.GetIndex()[j]) - position[j]); } - if (itk::Math::abs(weights[counter] - value) > 1e-7) + if (itk::Math::Absolute(weights[counter] - value) > 1e-7) { std::cout << "Error at weights[" << counter << ']' << std::endl; std::cout << "Computed value: " << weights[counter] << std::endl; diff --git a/Modules/Core/Common/test/itkBSplineKernelFunctionTest.cxx b/Modules/Core/Common/test/itkBSplineKernelFunctionTest.cxx index 323168f0176..63c2d2b67af 100644 --- a/Modules/Core/Common/test/itkBSplineKernelFunctionTest.cxx +++ b/Modules/Core/Common/test/itkBSplineKernelFunctionTest.cxx @@ -59,30 +59,30 @@ itkBSplineKernelFunctionTest(int, char *[]) // Testing the output of BSplineKernelFunction -#define TEST_BSPLINE_KERNEL(ORDERNUM) \ - { \ - using FunctionType = itk::BSplineKernelFunction; \ - auto function = FunctionType::New(); \ - \ - function->Print(std::cout); \ - constexpr double epsilon{ 1e-6 }; \ - for (unsigned int j = 0; j < npoints; ++j) \ - { \ - double results = function->Evaluate(x[j]); \ - /* compare with external results */ \ - if (itk::Math::abs(results - b##ORDERNUM[j]) > epsilon) \ - { \ - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); \ - std::cerr << "Test failed!" << std::endl; \ - std::cerr << "Error with " << ORDERNUM << " order BSplineKernelFunction "; \ - std::cerr << "at index [" << j << "] " << std::endl; \ - std::cerr << "Expected value " << b##ORDERNUM[j] << std::endl; \ - std::cerr << " differs from " << results; \ - std::cerr << " by more than " << epsilon << std::endl; \ - return EXIT_FAILURE; \ - } \ - } \ - } \ +#define TEST_BSPLINE_KERNEL(ORDERNUM) \ + { \ + using FunctionType = itk::BSplineKernelFunction; \ + auto function = FunctionType::New(); \ + \ + function->Print(std::cout); \ + constexpr double epsilon{ 1e-6 }; \ + for (unsigned int j = 0; j < npoints; ++j) \ + { \ + double results = function->Evaluate(x[j]); \ + /* compare with external results */ \ + if (itk::Math::Absolute(results - b##ORDERNUM[j]) > epsilon) \ + { \ + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); \ + std::cerr << "Test failed!" << std::endl; \ + std::cerr << "Error with " << ORDERNUM << " order BSplineKernelFunction "; \ + std::cerr << "at index [" << j << "] " << std::endl; \ + std::cerr << "Expected value " << b##ORDERNUM[j] << std::endl; \ + std::cerr << " differs from " << results; \ + std::cerr << " by more than " << epsilon << std::endl; \ + return EXIT_FAILURE; \ + } \ + } \ + } \ ITK_MACROEND_NOOP_STATEMENT TEST_BSPLINE_KERNEL(0); @@ -102,9 +102,9 @@ itkBSplineKernelFunctionTest(int, char *[]) const double results = derivFunction->Evaluate(xx); constexpr double epsilon{ 1e-6 }; - if (itk::Math::abs(results - expectedValue) > epsilon) + if (itk::Math::Absolute(results - expectedValue) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error with " << SplineOrder << " order BSplineDerivativeKernelFunction at " << xx << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; @@ -129,9 +129,9 @@ itkBSplineKernelFunctionTest(int, char *[]) const double results = derivFunction->Evaluate(xx); constexpr double epsilon{ 1e-6 }; - if (itk::Math::abs(results - expectedValue) > epsilon) + if (itk::Math::Absolute(results - expectedValue) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error with " << SplineOrder << " order BSplineDerivativeKernelFunction at " << xx << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; @@ -158,9 +158,9 @@ itkBSplineKernelFunctionTest(int, char *[]) const double results = derivFunction->Evaluate(xx); constexpr double epsilon{ 1e-6 }; - if (itk::Math::abs(results - expectedValue) > epsilon) + if (itk::Math::Absolute(results - expectedValue) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error with " << SplineOrder << " order BSplineDerivativeKernelFunction at " << xx << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; @@ -187,9 +187,9 @@ itkBSplineKernelFunctionTest(int, char *[]) const double results = derivFunction->Evaluate(xx); constexpr double epsilon{ 1e-6 }; - if (itk::Math::abs(results - expectedValue) > epsilon) + if (itk::Math::Absolute(results - expectedValue) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error with " << SplineOrder << " order BSplineDerivativeKernelFunction at " << xx << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; diff --git a/Modules/Core/Common/test/itkBoundingBoxTest.cxx b/Modules/Core/Common/test/itkBoundingBoxTest.cxx index 21593bccb22..51e470b2f18 100644 --- a/Modules/Core/Common/test/itkBoundingBoxTest.cxx +++ b/Modules/Core/Common/test/itkBoundingBoxTest.cxx @@ -199,7 +199,7 @@ itkBoundingBoxTest(int, char *[]) const CC::BoundsArrayType & clonedbounds = clone->GetBounds(); for (unsigned int i = 0; i < originalBounds.Size(); ++i) { - if (itk::Math::abs(originalBounds[i] - clonedbounds[i]) > tolerance) + if (itk::Math::Absolute(originalBounds[i] - clonedbounds[i]) > tolerance) { std::cerr << "Cloning test failed" << std::endl; std::cerr << originalBounds << std::endl; diff --git a/Modules/Core/Common/test/itkCompensatedSummationTest.cxx b/Modules/Core/Common/test/itkCompensatedSummationTest.cxx index b902b5310c4..dc99b65ab6b 100644 --- a/Modules/Core/Common/test/itkCompensatedSummationTest.cxx +++ b/Modules/Core/Common/test/itkCompensatedSummationTest.cxx @@ -51,10 +51,10 @@ itkCompensatedSummationTest(int, char *[]) floatAccumulator.AddElement(randomNumber); } const FloatType vanillaMean = vanillaSum / static_cast(accumSize); - const FloatType vanillaError = itk::Math::abs(vanillaMean - expectedMean); + const FloatType vanillaError = itk::Math::Absolute(vanillaMean - expectedMean); const FloatType accumulatorSum = floatAccumulator.GetSum(); const FloatType accumulatorMean = accumulatorSum / static_cast(accumSize); - const FloatType accumulatorError = itk::Math::abs(accumulatorMean - expectedMean); + const FloatType accumulatorError = itk::Math::Absolute(accumulatorMean - expectedMean); std::cout << "The expected mean is: " << expectedMean << std::endl; diff --git a/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx b/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx index b025083ee3a..94dc28717df 100644 --- a/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx +++ b/Modules/Core/Common/test/itkCompensatedSummationTest2.cxx @@ -217,8 +217,8 @@ itkCompensatedSummationTest2(int, char *[]) * optimizations that were not handled by the CompensatedSummation class * pragmas, or perhaps because of differences in math coprocessors, or * something else. It's not clear. */ - if (itk::Math::abs(referenceSum - enclosingClass.GetCompensatedSumOfThreads()) > - itk::Math::abs(referenceSum - enclosingClass.GetUncompensatedSumOfThreads())) + if (itk::Math::Absolute(referenceSum - enclosingClass.GetCompensatedSumOfThreads()) > + itk::Math::Absolute(referenceSum - enclosingClass.GetUncompensatedSumOfThreads())) { std::cerr << "Error. Expected the compensated sum of threads to be closer " << "to reference than the uncompensated sum, or the same value. " << std::endl; diff --git a/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx index e47009ce9e5..10645741ac7 100644 --- a/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx @@ -60,7 +60,7 @@ itkConicShellInteriorExteriorSpatialFunctionTest(int, char *[]) conicShellInteriorExteriorSpatialFunction->SetOriginGradient(originGradient); constexpr double tolerance{ 10e-6 }; - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); for (unsigned int i = 0; i < originGradient.Size(); ++i) { if (!itk::Math::FloatAlmostEqual( diff --git a/Modules/Core/Common/test/itkCovariantVectorGeometryTest.cxx b/Modules/Core/Common/test/itkCovariantVectorGeometryTest.cxx index 7672a4f6cb8..9583b63322c 100644 --- a/Modules/Core/Common/test/itkCovariantVectorGeometryTest.cxx +++ b/Modules/Core/Common/test/itkCovariantVectorGeometryTest.cxx @@ -163,9 +163,9 @@ itkCovariantVectorGeometryTest(int, char *[]) // std::cout << val << std::endl; // std::cout << fp[i] << std::endl; - const float diff = itk::Math::abs(val - fp[i]); + const float diff = itk::Math::Absolute(val - fp[i]); std::cout << "difference = " << diff << std::endl; - if (itk::Math::abs(val - fp[i]) > tolerance) + if (itk::Math::Absolute(val - fp[i]) > tolerance) { std::cout << "Test failed at component " << i << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx index 6fc7a537fac..591cd0a1cb5 100644 --- a/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkEllipsoidInteriorExteriorSpatialFunctionTest.cxx @@ -101,7 +101,7 @@ itkEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) const double volume = 4.18879013333 * (axes[0] / 2) * (axes[1] / 2) * (axes[2] / 2); // Percent difference in volume measurement and calculation - const double volumeError = (itk::Math::abs(volume - interiorPixelCounter) / volume) * 100; + const double volumeError = (itk::Math::Absolute(volume - interiorPixelCounter) / volume) * 100; std::cout << spatialFunc; diff --git a/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx index 7f7bef291d3..35daa8f494e 100644 --- a/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkFiniteCylinderSpatialFunctionTest.cxx @@ -105,7 +105,7 @@ itkFiniteCylinderSpatialFunctionTest(int, char *[]) const double volume = 3.14159 * pow(radius, 2) * axis; // Percent difference in volume measurement and calculation - const double volumeError = (itk::Math::abs(volume - interiorPixelCounter) / volume) * 100; + const double volumeError = (itk::Math::Absolute(volume - interiorPixelCounter) / volume) * 100; std::cout << spatialFunc; diff --git a/Modules/Core/Common/test/itkGaussianDerivativeOperatorTest.cxx b/Modules/Core/Common/test/itkGaussianDerivativeOperatorTest.cxx index e9810c42e89..2d802976e2c 100644 --- a/Modules/Core/Common/test/itkGaussianDerivativeOperatorTest.cxx +++ b/Modules/Core/Common/test/itkGaussianDerivativeOperatorTest.cxx @@ -60,7 +60,7 @@ TestGaussianOperator(double variance, double error, unsigned int width, unsigned std::cout.precision(16); constexpr double epsilon{ itk::NumericTraits::epsilon() * 32 }; - if (order == 0 && itk::Math::abs(total - 1.0) > epsilon) + if (order == 0 && itk::Math::Absolute(total - 1.0) > epsilon) { std::cerr << "Test failed!" << std::endl; std::cerr << "Error in coefficients." << std::endl; @@ -69,7 +69,7 @@ TestGaussianOperator(double variance, double error, unsigned int width, unsigned std::cerr << " differs from 1.0 "; std::cerr << " by more than " << epsilon << std::endl; } - else if (order != 0 && itk::Math::abs(total) > epsilon) + else if (order != 0 && itk::Math::Absolute(total) > epsilon) { std::cerr << "Test failed!" << std::endl; std::cerr << "Error in coefficients." << std::endl; diff --git a/Modules/Core/Common/test/itkImageTest.cxx b/Modules/Core/Common/test/itkImageTest.cxx index fd90e615146..f4770b6dcc4 100644 --- a/Modules/Core/Common/test/itkImageTest.cxx +++ b/Modules/Core/Common/test/itkImageTest.cxx @@ -83,8 +83,8 @@ itkImageTest(int, char *[]) std::cout << "Test inverse direction." << std::endl; Image::DirectionType product = direction * image->GetInverseDirection(); constexpr double eps{ 1e-06 }; - if (itk::Math::abs(product[0][0] - 1.0) > eps || itk::Math::abs(product[1][1] - 1.0) > eps || - itk::Math::abs(product[0][1]) > eps || itk::Math::abs(product[1][0]) > eps) + if (itk::Math::Absolute(product[0][0] - 1.0) > eps || itk::Math::Absolute(product[1][1] - 1.0) > eps || + itk::Math::Absolute(product[0][1]) > eps || itk::Math::Absolute(product[1][0]) > eps) { std::cerr << "Inverse direction test failed: " << "direction * inverse: " << product << std::endl; @@ -100,8 +100,8 @@ itkImageTest(int, char *[]) image->TransformLocalVectorToPhysicalVector(truthGradient, outputGradient); GradientType testGradient; image->TransformPhysicalVectorToLocalVector(outputGradient, testGradient); - if (itk::Math::abs(truthGradient[0] - testGradient[0]) > eps || - itk::Math::abs(truthGradient[1] - testGradient[1]) > eps) + if (itk::Math::Absolute(truthGradient[0] - testGradient[0]) > eps || + itk::Math::Absolute(truthGradient[1] - testGradient[1]) > eps) { std::cerr << "Transform to/from PhysicalVector test failed: " << "truthGradient: " << truthGradient << std::endl diff --git a/Modules/Core/Common/test/itkMathGTest.cxx b/Modules/Core/Common/test/itkMathGTest.cxx index c653dc3cf0a..d959afc2c91 100644 --- a/Modules/Core/Common/test/itkMathGTest.cxx +++ b/Modules/Core/Common/test/itkMathGTest.cxx @@ -318,41 +318,41 @@ TEST(itkMath, GreatestPrimeFactor) TEST(itkMath, Abs) { // static_assert tests from an original file - static_assert(itk::Math::safe_abs(false) == false); - static_assert(itk::Math::safe_abs(true) == true); - static_assert(itk::Math::safe_abs(static_cast(5)) == 5); - static_assert(itk::Math::safe_abs(static_cast(5)) == 5); - static_assert(itk::Math::safe_abs(static_cast(5)) == 5); - static_assert(itk::Math::safe_abs(static_cast(5)) == 5); - static_assert(itk::Math::safe_abs(static_cast(5)) == 5); - static_assert(itk::Math::safe_abs(static_cast(-5)) == 5); - static_assert(itk::Math::safe_abs(static_cast(-128)) == 128); - static_assert(itk::Math::safe_abs(static_cast(-5)) == 5); - static_assert(itk::Math::safe_abs(-5) == 5u); - static_assert(itk::Math::safe_abs(-5L) == 5ul); - static_assert(itk::Math::safe_abs(-5LL) == 5ull); - static_assert(itk::Math::safe_abs(-5.0) == 5.0); - static_assert(itk::Math::safe_abs(-5.0f) == 5.0f); + static_assert(itk::Math::Absolute(false) == false); + static_assert(itk::Math::Absolute(true) == true); + static_assert(itk::Math::Absolute(static_cast(5)) == 5); + static_assert(itk::Math::Absolute(static_cast(5)) == 5); + static_assert(itk::Math::Absolute(static_cast(5)) == 5); + static_assert(itk::Math::Absolute(static_cast(5)) == 5); + static_assert(itk::Math::Absolute(static_cast(5)) == 5); + static_assert(itk::Math::Absolute(static_cast(-5)) == 5); + static_assert(itk::Math::Absolute(static_cast(-128)) == 128); + static_assert(itk::Math::Absolute(static_cast(-5)) == 5); + static_assert(itk::Math::Absolute(-5) == 5u); + static_assert(itk::Math::Absolute(-5L) == 5ul); + static_assert(itk::Math::Absolute(-5LL) == 5ull); + static_assert(itk::Math::Absolute(-5.0) == 5.0); + static_assert(itk::Math::Absolute(-5.0f) == 5.0f); constexpr auto cf = std::complex(-3, -4); - EXPECT_EQ(itk::Math::safe_abs(cf), 5); + EXPECT_EQ(itk::Math::Absolute(cf), 5); constexpr auto cd = std::complex(-3, -4); - EXPECT_EQ(itk::Math::safe_abs(cd), 5); + EXPECT_EQ(itk::Math::Absolute(cd), 5); constexpr auto cld = std::complex(-3, -4); - EXPECT_EQ(itk::Math::safe_abs(cld), 5); - - EXPECT_EQ(itk::Math::abs(false), false); - EXPECT_EQ(itk::Math::abs(true), true); - EXPECT_EQ(itk::Math::abs(static_cast(5)), 5); - EXPECT_EQ(itk::Math::abs(static_cast(-5)), 5); - EXPECT_EQ(itk::Math::abs(static_cast(-128)), 128); - EXPECT_EQ(itk::Math::abs(static_cast(-5)), 5); - EXPECT_EQ(itk::Math::abs(-5), 5u); - EXPECT_EQ(itk::Math::abs(-5L), 5ul); - EXPECT_EQ(itk::Math::abs(-5LL), 5ull); - EXPECT_EQ(itk::Math::abs(-5.0), 5.0); - EXPECT_EQ(itk::Math::abs(-5.0f), 5.0f); - EXPECT_EQ(itk::Math::abs(-5), 5); + EXPECT_EQ(itk::Math::Absolute(cld), 5); + + EXPECT_EQ(itk::Math::Absolute(false), false); + EXPECT_EQ(itk::Math::Absolute(true), true); + EXPECT_EQ(itk::Math::Absolute(static_cast(5)), 5); + EXPECT_EQ(itk::Math::Absolute(static_cast(-5)), 5); + EXPECT_EQ(itk::Math::Absolute(static_cast(-128)), 128); + EXPECT_EQ(itk::Math::Absolute(static_cast(-5)), 5); + EXPECT_EQ(itk::Math::Absolute(-5), 5u); + EXPECT_EQ(itk::Math::Absolute(-5L), 5ul); + EXPECT_EQ(itk::Math::Absolute(-5LL), 5ull); + EXPECT_EQ(itk::Math::Absolute(-5.0), 5.0); + EXPECT_EQ(itk::Math::Absolute(-5.0f), 5.0f); + EXPECT_EQ(itk::Math::Absolute(-5), 5); } TEST(itkMath, ConstexprTests) diff --git a/Modules/Core/Common/test/itkMatrixTest.cxx b/Modules/Core/Common/test/itkMatrixTest.cxx index ffd327c9225..c2fe5fb027c 100644 --- a/Modules/Core/Common/test/itkMatrixTest.cxx +++ b/Modules/Core/Common/test/itkMatrixTest.cxx @@ -236,14 +236,14 @@ itkMatrixTest(int, char *[]) { for (unsigned int c = 0; c < nc; ++c) { - if (itk::Math::abs(m3[r][c] - 2 * r) > tolerance) + if (itk::Math::Absolute(m3[r][c] - 2 * r) > tolerance) { std::cerr << "Addition failed !" << std::endl; std::cerr << "M[" << r << "][" << c << "] = "; std::cerr << m3[r][c] << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(m4[r][c] - 2 * c) > tolerance) + if (itk::Math::Absolute(m4[r][c] - 2 * c) > tolerance) { std::cerr << "Subtraction failed !" << std::endl; return EXIT_FAILURE; @@ -262,13 +262,13 @@ itkMatrixTest(int, char *[]) { for (unsigned int c = 0; c < nc; ++c) { - if (itk::Math::abs(m3[r][c] - m1[r][c]) > tolerance) + if (itk::Math::Absolute(m3[r][c] - m1[r][c]) > tolerance) { std::cerr << "In-place addition failed !" << std::endl; std::cerr << m3 << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(m4[r][c] - m1[r][c]) > tolerance) + if (itk::Math::Absolute(m4[r][c] - m1[r][c]) > tolerance) { std::cerr << "In-place subtraction failed !" << std::endl; std::cerr << m4 << std::endl; @@ -302,7 +302,7 @@ itkMatrixTest(int, char *[]) { for (unsigned int col = 0; col < 3; ++col) { - if (itk::Math::abs(matrixB[row][col] - matrixA[row][col]) > tolerance) + if (itk::Math::Absolute(matrixB[row][col] - matrixA[row][col]) > tolerance) { std::cerr << "constructor from vnl_matrix failed ! " << std::endl; return EXIT_FAILURE; @@ -320,7 +320,7 @@ itkMatrixTest(int, char *[]) { for (unsigned int col = 0; col < 3; ++col) { - if (itk::Math::abs(matrixC[row][col] - matrixA[row][col]) > tolerance) + if (itk::Math::Absolute(matrixC[row][col] - matrixA[row][col]) > tolerance) { std::cerr << "assignment from vnl_matrix failed ! " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkMersenneTwisterRandomVariateGeneratorTest.cxx b/Modules/Core/Common/test/itkMersenneTwisterRandomVariateGeneratorTest.cxx index 2890c08b003..07eb6c1988a 100644 --- a/Modules/Core/Common/test/itkMersenneTwisterRandomVariateGeneratorTest.cxx +++ b/Modules/Core/Common/test/itkMersenneTwisterRandomVariateGeneratorTest.cxx @@ -97,12 +97,12 @@ itkMersenneTwisterRandomVariateGeneratorTest(int, char *[]) } const double mean = sum / static_cast(count); const double variance = sum2 / static_cast(count) - mean * mean; - if (itk::Math::abs(mean) > 0.01) + if (itk::Math::Absolute(mean) > 0.01) { std::cerr << "Mean was " << mean << " expected 0.0 " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(variance - 1.0) > 0.01) + if (itk::Math::Absolute(variance - 1.0) > 0.01) { std::cerr << "Variance was " << variance << " expected 1.0 " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkPointGeometryTest.cxx b/Modules/Core/Common/test/itkPointGeometryTest.cxx index a67ae21ea28..e5bb6b24c02 100644 --- a/Modules/Core/Common/test/itkPointGeometryTest.cxx +++ b/Modules/Core/Common/test/itkPointGeometryTest.cxx @@ -136,7 +136,7 @@ itkPointGeometryTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { auto val = static_cast(dp[i]); - if (itk::Math::abs(val - fp[i]) > tolerance) + if (itk::Math::Absolute(val - fp[i]) > tolerance) { std::cout << "Failed at component " << i << std::endl; return EXIT_FAILURE; @@ -189,7 +189,7 @@ itkPointGeometryTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { const double value = (alpha * A[i] + (1.0 - alpha) * B[i]); - if (itk::Math::abs(combination[i] - value) > tolerance) + if (itk::Math::Absolute(combination[i] - value) > tolerance) { std::cerr << "Failure to compute Barycentric combination" << std::endl; return EXIT_FAILURE; @@ -221,7 +221,7 @@ itkPointGeometryTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { const double value = alpha * A[i] + beta * B[i] + (1.0 - alpha - beta) * C[i]; - if (itk::Math::abs(combination[i] - value) > tolerance) + if (itk::Math::Absolute(combination[i] - value) > tolerance) { std::cerr << "Failure to compute Barycentric combination" << std::endl; return EXIT_FAILURE; @@ -250,7 +250,7 @@ itkPointGeometryTest(int, char *[]) std::cout << "Test for Barycentric combination of an array of Points" << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(combination[i] - (K / 3.0)) > tolerance) + if (itk::Math::Absolute(combination[i] - (K / 3.0)) > tolerance) { std::cerr << "Failure to compute Barycentric combination" << std::endl; return EXIT_FAILURE; @@ -288,7 +288,7 @@ itkPointGeometryTest(int, char *[]) std::cout << "Test for Barycentric combination of a VectorContainer of Points" << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(combination[i] - (K / 3.0)) > tolerance) + if (itk::Math::Absolute(combination[i] - (K / 3.0)) > tolerance) { std::cerr << "Failure to compute Barycentric combination" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkRGBPixelTest.cxx b/Modules/Core/Common/test/itkRGBPixelTest.cxx index 373fc9025ba..68aafb359a4 100644 --- a/Modules/Core/Common/test/itkRGBPixelTest.cxx +++ b/Modules/Core/Common/test/itkRGBPixelTest.cxx @@ -125,7 +125,7 @@ itkRGBPixelTest(int, char *[]) const float realLuminance = rgbl[0] * 0.30 + rgbl[1] * 0.59 + rgbl[2] * 0.11; constexpr float tolerance{ 1e-4 }; - if (itk::Math::abs(luminance - realLuminance) > tolerance) + if (itk::Math::Absolute(luminance - realLuminance) > tolerance) { std::cerr << "Error in luminance conversion" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkRealTimeClockTest.cxx b/Modules/Core/Common/test/itkRealTimeClockTest.cxx index 66d23b6f885..20e13b3fa3b 100644 --- a/Modules/Core/Common/test/itkRealTimeClockTest.cxx +++ b/Modules/Core/Common/test/itkRealTimeClockTest.cxx @@ -82,7 +82,7 @@ itkRealTimeClockTest(int, char *[]) std::cout << realStamp2 << " - " << realStamp1 << " = "; std::cout << secondsD << " = " << secondsE << std::endl; - if (itk::Math::abs(secondsD - secondsE) / secondsE > tolerance) + if (itk::Math::Absolute(secondsD - secondsE) / secondsE > tolerance) { std::cerr << "Precision error in time difference" << std::endl; std::cerr << "Expected " << secondsE << " seconds " << std::endl; diff --git a/Modules/Core/Common/test/itkRealTimeIntervalTest.cxx b/Modules/Core/Common/test/itkRealTimeIntervalTest.cxx index 4b8335946be..ce16d2536f1 100644 --- a/Modules/Core/Common/test/itkRealTimeIntervalTest.cxx +++ b/Modules/Core/Common/test/itkRealTimeIntervalTest.cxx @@ -27,9 +27,9 @@ double eps = 4.0 * itk::NumericTraits::epsilon(); \ ITK_GCC_PRAGMA_PUSH \ ITK_GCC_SUPPRESS_Wfloat_equal \ - eps = (b == 0.0) ? eps : itk::Math::abs(b * eps); \ + eps = (b == 0.0) ? eps : itk::Math::Absolute(b * eps); \ ITK_GCC_PRAGMA_POP \ - if (itk::Math::abs(a - b) > eps) \ + if (itk::Math::Absolute(a - b) > eps) \ { \ std::cerr << "Error in " #a << " expected " << b << " but got " << a << std::endl; \ return EXIT_FAILURE; \ diff --git a/Modules/Core/Common/test/itkRealTimeStampTest.cxx b/Modules/Core/Common/test/itkRealTimeStampTest.cxx index 685fab890ef..014a98d9c6e 100644 --- a/Modules/Core/Common/test/itkRealTimeStampTest.cxx +++ b/Modules/Core/Common/test/itkRealTimeStampTest.cxx @@ -27,9 +27,9 @@ double eps = 4.0 * itk::NumericTraits::epsilon(); \ ITK_GCC_PRAGMA_PUSH \ ITK_GCC_SUPPRESS_Wfloat_equal \ - eps = (b == 0.0) ? eps : itk::Math::abs(b * eps); \ + eps = (b == 0.0) ? eps : itk::Math::Absolute(b * eps); \ ITK_GCC_PRAGMA_POP \ - if (itk::Math::abs(a - b) > eps) \ + if (itk::Math::Absolute(a - b) > eps) \ { \ std::cerr << "Error in " #a << " expected " << b << " but got " << a << std::endl; \ return EXIT_FAILURE; \ diff --git a/Modules/Core/Common/test/itkSymmetricEigenAnalysisTest.cxx b/Modules/Core/Common/test/itkSymmetricEigenAnalysisTest.cxx index 375790d4653..52b4fb57013 100644 --- a/Modules/Core/Common/test/itkSymmetricEigenAnalysisTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricEigenAnalysisTest.cxx @@ -105,13 +105,13 @@ itkSymmetricEigenAnalysisTest(int argc, char * argv[]) constexpr double tolerance{ 0.01 }; for (unsigned int i = 0; i < 6; ++i) { - if (itk::Math::abs(eigvals[i] - eigenvalues[i]) > tolerance) + if (itk::Math::Absolute(eigvals[i] - eigenvalues[i]) > tolerance) { std::cout << "Eigen value computation failed" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) + if (itk::Math::Absolute(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) { std::cout << "Eigen vector computation failed" << std::endl; return EXIT_FAILURE; @@ -168,13 +168,13 @@ itkSymmetricEigenAnalysisTest(int argc, char * argv[]) constexpr double tolerance{ 0.01 }; for (unsigned int i = 0; i < 6; ++i) { - if (itk::Math::abs(eigvals[i] - eigenvalues[i]) > tolerance) + if (itk::Math::Absolute(eigvals[i] - eigenvalues[i]) > tolerance) { std::cout << "Eigen value computation failed" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) + if (itk::Math::Absolute(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) { std::cout << "Eigen vector computation failed" << std::endl; return EXIT_FAILURE; @@ -225,13 +225,13 @@ itkSymmetricEigenAnalysisTest(int argc, char * argv[]) constexpr double tolerance{ 0.01 }; for (unsigned int i = 0; i < 6; ++i) { - if (itk::Math::abs(eigvals[i] - eigenvalues[i]) > tolerance) + if (itk::Math::Absolute(eigvals[i] - eigenvalues[i]) > tolerance) { std::cout << "Eigen value computation failed" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) + if (itk::Math::Absolute(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) { std::cout << "Eigen vector computation failed" << std::endl; return EXIT_FAILURE; @@ -288,13 +288,13 @@ itkSymmetricEigenAnalysisTest(int argc, char * argv[]) constexpr double tolerance{ 0.01 }; for (unsigned int i = 0; i < 6; ++i) { - if (itk::Math::abs(eigvals[i] - eigenvalues[i]) > tolerance) + if (itk::Math::Absolute(eigvals[i] - eigenvalues[i]) > tolerance) { std::cout << "Eigen value computation failed" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) + if (itk::Math::Absolute(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) { std::cout << "Eigen vector computation failed" << std::endl; return EXIT_FAILURE; @@ -349,13 +349,13 @@ itkSymmetricEigenAnalysisTest(int argc, char * argv[]) constexpr double tolerance{ 0.01 }; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(eigvals[i] - eigenvalues[i]) > tolerance) + if (itk::Math::Absolute(eigvals[i] - eigenvalues[i]) > tolerance) { std::cout << "Eigen value computation failed" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) + if (itk::Math::Absolute(eigvec3[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) { std::cout << "Eigen vector computation failed" << std::endl; return EXIT_FAILURE; @@ -410,13 +410,13 @@ itkSymmetricEigenAnalysisTest(int argc, char * argv[]) constexpr float tolerance{ 0.01 }; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(eigvals[i] - eigenvalues[i]) > tolerance) + if (itk::Math::Absolute(eigvals[i] - eigenvalues[i]) > tolerance) { std::cout << "Eigen value computation failed" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(eigvec2[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) + if (itk::Math::Absolute(eigvec2[i] - itk::Math::sgn0(eigenvectors[2][0]) * eigenvectors[2][i]) > tolerance) { std::cout << eigenvectors[2][i] << ' ' << eigvec2[i] << std::endl; std::cout << "Eigen vector computation failed" << std::endl; diff --git a/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx index c9c90a71810..25bcb729f84 100644 --- a/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest.cxx @@ -97,7 +97,7 @@ itkSymmetricEllipsoidInteriorExteriorSpatialFunctionTest(int, char *[]) (symmetricAxesLength / 2) }; // Percent difference in volume measurement and calculation - const double volumeError = (itk::Math::abs(volume - interiorPixelCounter) / volume) * 100; + const double volumeError = (itk::Math::Absolute(volume - interiorPixelCounter) / volume) * 100; // 5% error was randomly chosen as a successful ellipsoid fill. // This should actually be some function of the image/ellipsoid size. diff --git a/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageReadTest.cxx b/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageReadTest.cxx index e2c7afd18fd..3b198256c66 100644 --- a/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageReadTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageReadTest.cxx @@ -100,7 +100,7 @@ itkSymmetricSecondRankTensorImageReadTest(int argc, char * argv[]) { for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(matrixPixel[i][j] - tensorPixel(i, j)) > tolerance) + if (itk::Math::Absolute(matrixPixel[i][j] - tensorPixel(i, j)) > tolerance) { std::cerr << "Tensor read does not match expected values " << std::endl; std::cerr << "Index " << tItr.ComputeIndex() << std::endl; diff --git a/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageWriteReadTest.cxx b/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageWriteReadTest.cxx index b18adeeeb9f..68cf16b5856 100644 --- a/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageWriteReadTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricSecondRankTensorImageWriteReadTest.cxx @@ -85,7 +85,7 @@ itkSymmetricSecondRankTensorImageWriteReadTest(int argc, char * argv[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(tensorPixelInput[i] - tensorPixelOutput[i]) > tolerance) + if (itk::Math::Absolute(tensorPixelInput[i] - tensorPixelOutput[i]) > tolerance) { std::cerr << "Tensor read does not match expected values " << std::endl; std::cerr << "Index " << inIt.ComputeIndex() << std::endl; diff --git a/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx b/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx index 339a60acae7..e40264cda7f 100644 --- a/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx @@ -223,7 +223,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(expectedValues[i] - eigenValues[i]) > tolerance) + if (itk::Math::Absolute(expectedValues[i] - eigenValues[i]) > tolerance) { std::cerr << "EigenAnalysis computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -234,7 +234,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(expectedValues[j] - eigenValues2[j]) > tolerance) + if (itk::Math::Absolute(expectedValues[j] - eigenValues2[j]) > tolerance) { std::cerr << "EigenValues computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -275,7 +275,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(expectedValues[i] - eigenValues[i]) > tolerance) + if (itk::Math::Absolute(expectedValues[i] - eigenValues[i]) > tolerance) { std::cerr << "EigenAnalysis computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -286,7 +286,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(expectedValues[j] - eigenValues2[j]) > tolerance) + if (itk::Math::Absolute(expectedValues[j] - eigenValues2[j]) > tolerance) { std::cerr << "EigenValues computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -327,7 +327,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(expectedValues[i] - eigenValues[i]) > tolerance) + if (itk::Math::Absolute(expectedValues[i] - eigenValues[i]) > tolerance) { std::cerr << "Eigenvalue computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -338,7 +338,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(expectedValues[j] - eigenValues2[j]) > tolerance) + if (itk::Math::Absolute(expectedValues[j] - eigenValues2[j]) > tolerance) { std::cerr << "EigenValues computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -378,7 +378,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) constexpr double tolerance{ 1e-4 }; const AccumulateValueType computedTrace = tensor3D.GetTrace(); - if (itk::Math::abs(computedTrace - expectedTrace) > tolerance) + if (itk::Math::Absolute(computedTrace - expectedTrace) > tolerance) { std::cerr << "Error computing the Trace" << std::endl; std::cerr << "Expected trace = " << expectedTrace << std::endl; diff --git a/Modules/Core/Common/test/itkVNLRoundProfileTest1.cxx b/Modules/Core/Common/test/itkVNLRoundProfileTest1.cxx index 17990eb1798..1f443039a66 100644 --- a/Modules/Core/Common/test/itkVNLRoundProfileTest1.cxx +++ b/Modules/Core/Common/test/itkVNLRoundProfileTest1.cxx @@ -214,7 +214,7 @@ itkVNLRoundProfileTest1(int, char *[]) while (inpItr != inputEnd) { - if (itk::Math::abs(*outItr1 - *outItr2) > tolerance) + if (itk::Math::Absolute(*outItr1 - *outItr2) > tolerance) { std::cout << "Warning*** For input: " << *inpItr << " if-round: " << *outItr1 << " differs from itk::Math::rnd: " << *outItr2 << std::endl; diff --git a/Modules/Core/Common/test/itkVectorGeometryTest.cxx b/Modules/Core/Common/test/itkVectorGeometryTest.cxx index a4d5dad4cd4..8df629f77cd 100644 --- a/Modules/Core/Common/test/itkVectorGeometryTest.cxx +++ b/Modules/Core/Common/test/itkVectorGeometryTest.cxx @@ -214,7 +214,7 @@ itkVectorGeometryTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { auto val = static_cast(dp[i]); - if (itk::Math::abs(val - fp[i]) > tolerance) + if (itk::Math::Absolute(val - fp[i]) > tolerance) { std::cout << "Test failed at component " << i << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Common/test/itkVectorTest.cxx b/Modules/Core/Common/test/itkVectorTest.cxx index 4c016983193..58da7b4320c 100644 --- a/Modules/Core/Common/test/itkVectorTest.cxx +++ b/Modules/Core/Common/test/itkVectorTest.cxx @@ -25,7 +25,7 @@ using Real = double; bool different(Real a, Real b) { - return itk::Math::abs(a - b) > 1e-6; + return itk::Math::Absolute(a - b) > 1e-6; } int diff --git a/Modules/Core/Common/test/itkVersorTest.cxx b/Modules/Core/Common/test/itkVersorTest.cxx index 4038d03f2d3..2ce1039dab7 100644 --- a/Modules/Core/Common/test/itkVersorTest.cxx +++ b/Modules/Core/Common/test/itkVersorTest.cxx @@ -203,22 +203,22 @@ itkVersorTest(int, char *[]) { std::cout << "Test default constructor... "; constexpr VersorType qa; - if (itk::Math::abs(qa.GetX()) > epsilon) + if (itk::Math::Absolute(qa.GetX()) > epsilon) { std::cout << "Error ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetY()) > epsilon) + if (itk::Math::Absolute(qa.GetY()) > epsilon) { std::cout << "Error ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetZ()) > epsilon) + if (itk::Math::Absolute(qa.GetZ()) > epsilon) { std::cout << "Error ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetW() - 1.0) > epsilon) + if (itk::Math::Absolute(qa.GetW() - 1.0) > epsilon) { std::cout << "Error ! " << std::endl; return EXIT_FAILURE; @@ -275,27 +275,27 @@ itkVersorTest(int, char *[]) xb = xa * sinangle; - if (itk::Math::abs(qa.GetX() - xb[0]) > epsilon) + if (itk::Math::Absolute(qa.GetX() - xb[0]) > epsilon) { std::cout << "Error in X ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetY() - xb[1]) > epsilon) + if (itk::Math::Absolute(qa.GetY() - xb[1]) > epsilon) { std::cout << "Error in Y ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetZ() - xb[2]) > epsilon) + if (itk::Math::Absolute(qa.GetZ() - xb[2]) > epsilon) { std::cout << "Error in Z ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetW() - cosangle) > epsilon) + if (itk::Math::Absolute(qa.GetW() - cosangle) > epsilon) { std::cout << "Error in W ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetAngle() - angle) > epsilon) + if (itk::Math::Absolute(qa.GetAngle() - angle) > epsilon) { std::cout << "Error in Angle ! " << std::endl; return EXIT_FAILURE; @@ -321,14 +321,14 @@ itkVersorTest(int, char *[]) qa.Set(xa, angle); const ValueType cos2a = std::cos(angle / 2.0); - if (itk::Math::abs(qa.GetW() - cos2a) > epsilon) + if (itk::Math::Absolute(qa.GetW() - cos2a) > epsilon) { std::cout << "Error in W ! " << std::endl; std::cout << "W= " << qa.GetW(); std::cout << " it should be " << cos2a << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(qa.GetAngle() - angle) > epsilon) + if (itk::Math::Absolute(qa.GetAngle() - angle) > epsilon) { std::cout << "Error in Angle ! " << std::endl; return EXIT_FAILURE; @@ -356,7 +356,7 @@ itkVersorTest(int, char *[]) VersorType qb; qb = qa.SquareRoot(); - if (itk::Math::abs(qa.GetAngle() - 2.0 * qb.GetAngle()) > epsilon) + if (itk::Math::Absolute(qa.GetAngle() - 2.0 * qb.GetAngle()) > epsilon) { std::cout << "Error in Square Root ! " << std::endl; std::cout << "Angle = " << qb.GetAngle(); @@ -383,17 +383,17 @@ itkVersorTest(int, char *[]) VectorType xc = qa.Transform(xb); // This rotation will just permute the axis - if (itk::Math::abs(xc[1] - xb[0]) > epsilon) + if (itk::Math::Absolute(xc[1] - xb[0]) > epsilon) { std::cout << "Error in X ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[2] - xb[1]) > epsilon) + if (itk::Math::Absolute(xc[2] - xb[1]) > epsilon) { std::cout << "Error in Y ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[0] - xb[2]) > epsilon) + if (itk::Math::Absolute(xc[0] - xb[2]) > epsilon) { std::cout << "Error in Z ! " << std::endl; return EXIT_FAILURE; @@ -418,17 +418,17 @@ itkVersorTest(int, char *[]) PointType xc = qa.Transform(xb); // This rotation will just permute the axis - if (itk::Math::abs(xc[1] - xb[0]) > epsilon) + if (itk::Math::Absolute(xc[1] - xb[0]) > epsilon) { std::cout << "Error in X ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[2] - xb[1]) > epsilon) + if (itk::Math::Absolute(xc[2] - xb[1]) > epsilon) { std::cout << "Error in Y ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[0] - xb[2]) > epsilon) + if (itk::Math::Absolute(xc[0] - xb[2]) > epsilon) { std::cout << "Error in Z ! " << std::endl; return EXIT_FAILURE; @@ -454,17 +454,17 @@ itkVersorTest(int, char *[]) CovariantVectorType xc = qa.Transform(xb); // This rotation will just permute the axis - if (itk::Math::abs(xc[1] - xb[0]) > epsilon) + if (itk::Math::Absolute(xc[1] - xb[0]) > epsilon) { std::cout << "Error in X ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[2] - xb[1]) > epsilon) + if (itk::Math::Absolute(xc[2] - xb[1]) > epsilon) { std::cout << "Error in Y ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[0] - xb[2]) > epsilon) + if (itk::Math::Absolute(xc[0] - xb[2]) > epsilon) { std::cout << "Error in Z ! " << std::endl; return EXIT_FAILURE; @@ -491,17 +491,17 @@ itkVersorTest(int, char *[]) VnlVectorType xc = qa.Transform(xb); // This rotation will just permute the axis - if (itk::Math::abs(xc[1] - xb[0]) > epsilon) + if (itk::Math::Absolute(xc[1] - xb[0]) > epsilon) { std::cout << "Error in X ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[2] - xb[1]) > epsilon) + if (itk::Math::Absolute(xc[2] - xb[1]) > epsilon) { std::cout << "Error in Y ! " << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(xc[0] - xb[2]) > epsilon) + if (itk::Math::Absolute(xc[0] - xb[2]) > epsilon) { std::cout << "Error in Z ! " << std::endl; return EXIT_FAILURE; @@ -532,8 +532,8 @@ itkVersorTest(int, char *[]) v2.Set(x, y, z, w); // Compare both versors - if (itk::Math::abs(v1.GetX() - v2.GetX()) > epsilon || itk::Math::abs(v1.GetY() - v2.GetY()) > epsilon || - itk::Math::abs(v1.GetZ() - v2.GetZ()) > epsilon || itk::Math::abs(v1.GetW() - v2.GetW()) > epsilon) + if (itk::Math::Absolute(v1.GetX() - v2.GetX()) > epsilon || itk::Math::Absolute(v1.GetY() - v2.GetY()) > epsilon || + itk::Math::Absolute(v1.GetZ() - v2.GetZ()) > epsilon || itk::Math::Absolute(v1.GetW() - v2.GetW()) > epsilon) { std::cout << "Error in Versor Set(x,y,z,w) ! " << std::endl; std::cout << "v1 = " << v1 << std::endl; @@ -550,8 +550,8 @@ itkVersorTest(int, char *[]) v2.Set(vnlq); // Compare both versors - if (itk::Math::abs(v1.GetX() - v2.GetX()) > epsilon || itk::Math::abs(v1.GetY() - v2.GetY()) > epsilon || - itk::Math::abs(v1.GetZ() - v2.GetZ()) > epsilon || itk::Math::abs(v1.GetW() - v2.GetW()) > epsilon) + if (itk::Math::Absolute(v1.GetX() - v2.GetX()) > epsilon || itk::Math::Absolute(v1.GetY() - v2.GetY()) > epsilon || + itk::Math::Absolute(v1.GetZ() - v2.GetZ()) > epsilon || itk::Math::Absolute(v1.GetW() - v2.GetW()) > epsilon) { std::cout << "Error in Versor Set( vnl_quaternion ) ! " << std::endl; std::cout << "v1 = " << v1 << std::endl; @@ -572,8 +572,8 @@ itkVersorTest(int, char *[]) v3.Set(x, y, z, w); // Compare both versors - if (itk::Math::abs(v1.GetX() - v3.GetX()) > epsilon || itk::Math::abs(v1.GetY() - v3.GetY()) > epsilon || - itk::Math::abs(v1.GetZ() - v3.GetZ()) > epsilon || itk::Math::abs(v1.GetW() - v3.GetW()) > epsilon) + if (itk::Math::Absolute(v1.GetX() - v3.GetX()) > epsilon || itk::Math::Absolute(v1.GetY() - v3.GetY()) > epsilon || + itk::Math::Absolute(v1.GetZ() - v3.GetZ()) > epsilon || itk::Math::Absolute(v1.GetW() - v3.GetW()) > epsilon) { std::cout << "Error in Versor Set() with negative W ! " << std::endl; std::cout << "v1 = " << v1 << std::endl; @@ -604,8 +604,8 @@ itkVersorTest(int, char *[]) const VersorType v2r = v2.GetReciprocal(); VersorType unit = v2 * v2r; - if (itk::Math::abs(unit.GetX()) > epsilon || itk::Math::abs(unit.GetY()) > epsilon || - itk::Math::abs(unit.GetZ()) > epsilon || itk::Math::abs(unit.GetW() - 1.0) > epsilon) + if (itk::Math::Absolute(unit.GetX()) > epsilon || itk::Math::Absolute(unit.GetY()) > epsilon || + itk::Math::Absolute(unit.GetZ()) > epsilon || itk::Math::Absolute(unit.GetW() - 1.0) > epsilon) { std::cout << "Error in Reciprocal ! " << std::endl; std::cout << "Versor = " << v2 << std::endl; @@ -617,8 +617,8 @@ itkVersorTest(int, char *[]) unit = v2 / v2; - if (itk::Math::abs(unit.GetX()) > epsilon || itk::Math::abs(unit.GetY()) > epsilon || - itk::Math::abs(unit.GetZ()) > epsilon || itk::Math::abs(unit.GetW() - 1.0) > epsilon) + if (itk::Math::Absolute(unit.GetX()) > epsilon || itk::Math::Absolute(unit.GetY()) > epsilon || + itk::Math::Absolute(unit.GetZ()) > epsilon || itk::Math::Absolute(unit.GetW() - 1.0) > epsilon) { std::cout << "Error in Division ! " << std::endl; std::cout << "Versor = " << v2 << std::endl; @@ -629,8 +629,8 @@ itkVersorTest(int, char *[]) unit = v2; unit /= v2; - if (itk::Math::abs(unit.GetX()) > epsilon || itk::Math::abs(unit.GetY()) > epsilon || - itk::Math::abs(unit.GetZ()) > epsilon || itk::Math::abs(unit.GetW() - 1.0) > epsilon) + if (itk::Math::Absolute(unit.GetX()) > epsilon || itk::Math::Absolute(unit.GetY()) > epsilon || + itk::Math::Absolute(unit.GetZ()) > epsilon || itk::Math::Absolute(unit.GetW() - 1.0) > epsilon) { std::cout << "Error in Division operator/= ! " << std::endl; std::cout << "Versor = " << v2 << std::endl; @@ -646,8 +646,8 @@ itkVersorTest(int, char *[]) const VersorType v3 = v1 * v2; const VersorType v4 = v3 * v2r; - if (itk::Math::abs(v1.GetX() - v4.GetX()) > epsilon || itk::Math::abs(v1.GetY() - v4.GetY()) > epsilon || - itk::Math::abs(v1.GetZ() - v4.GetZ()) > epsilon || itk::Math::abs(v1.GetW() - v4.GetW()) > epsilon) + if (itk::Math::Absolute(v1.GetX() - v4.GetX()) > epsilon || itk::Math::Absolute(v1.GetY() - v4.GetY()) > epsilon || + itk::Math::Absolute(v1.GetZ() - v4.GetZ()) > epsilon || itk::Math::Absolute(v1.GetW() - v4.GetW()) > epsilon) { std::cout << "Error in Versor division ! " << std::endl; std::cout << "v1 = " << v1 << std::endl; @@ -679,8 +679,9 @@ itkVersorTest(int, char *[]) const double halfSqrtOfTwo = std::sqrt(2.0) / 2.0; - if (itk::Math::abs(vv.GetX() - 0.0) > epsilon || itk::Math::abs(vv.GetY() - 0.0) > epsilon || - itk::Math::abs(vv.GetZ() - (-halfSqrtOfTwo)) > epsilon || itk::Math::abs(vv.GetW() - halfSqrtOfTwo) > epsilon) + if (itk::Math::Absolute(vv.GetX() - 0.0) > epsilon || itk::Math::Absolute(vv.GetY() - 0.0) > epsilon || + itk::Math::Absolute(vv.GetZ() - (-halfSqrtOfTwo)) > epsilon || + itk::Math::Absolute(vv.GetW() - halfSqrtOfTwo) > epsilon) { std::cout << "Error in Versor Set(Matrix) method ! " << std::endl; std::cout << "vv = " << vv << std::endl; diff --git a/Modules/Core/ImageAdaptors/include/itkAbsImageAdaptor.h b/Modules/Core/ImageAdaptors/include/itkAbsImageAdaptor.h index fb11f49f3ae..58fec5bcb90 100644 --- a/Modules/Core/ImageAdaptors/include/itkAbsImageAdaptor.h +++ b/Modules/Core/ImageAdaptors/include/itkAbsImageAdaptor.h @@ -26,7 +26,7 @@ namespace Accessor { /** * \class AbsPixelAccessor - * \brief Give access to the itk::Math::abs() function of a value + * \brief Give access to the itk::Math::Absolute() function of a value * * AbsPixelAccessor is templated over an internal type and an * external type representation. This class cast the input @@ -64,7 +64,7 @@ class AbsPixelAccessor /** * \class AbsImageAdaptor - * \brief Presents an image as being composed of the itk::Math::abs() of its pixels + * \brief Presents an image as being composed of the itk::Math::Absolute() of its pixels * * Additional casting is performed according to the input and output image * types following C++ default casting rules. diff --git a/Modules/Core/ImageAdaptors/include/itkComplexToModulusImageAdaptor.h b/Modules/Core/ImageAdaptors/include/itkComplexToModulusImageAdaptor.h index 79fc3a9092a..335e282be03 100644 --- a/Modules/Core/ImageAdaptors/include/itkComplexToModulusImageAdaptor.h +++ b/Modules/Core/ImageAdaptors/include/itkComplexToModulusImageAdaptor.h @@ -66,7 +66,7 @@ class ComplexToModulusPixelAccessor /** * \class ComplexToModulusImageAdaptor - * \brief Presents a complex image as being composed of itk::Math::abs() part + * \brief Presents a complex image as being composed of itk::Math::Absolute() part * of its pixels. * * Additional casting is performed according to the input and output image diff --git a/Modules/Core/ImageFunction/include/itkRayCastInterpolateImageFunction.hxx b/Modules/Core/ImageFunction/include/itkRayCastInterpolateImageFunction.hxx index 510db822390..63d2d9730c7 100644 --- a/Modules/Core/ImageFunction/include/itkRayCastInterpolateImageFunction.hxx +++ b/Modules/Core/ImageFunction/include/itkRayCastInterpolateImageFunction.hxx @@ -752,9 +752,9 @@ void RayCastInterpolateImageFunction::RayCastHelper::CalcDirnVector() { // Calculate the number of voxels in each direction - const double xNum = itk::Math::abs(m_RayVoxelStartPosition[0] - m_RayVoxelEndPosition[0]); - const double yNum = itk::Math::abs(m_RayVoxelStartPosition[1] - m_RayVoxelEndPosition[1]); - const double zNum = itk::Math::abs(m_RayVoxelStartPosition[2] - m_RayVoxelEndPosition[2]); + const double xNum = itk::Math::Absolute(m_RayVoxelStartPosition[0] - m_RayVoxelEndPosition[0]); + const double yNum = itk::Math::Absolute(m_RayVoxelStartPosition[1] - m_RayVoxelEndPosition[1]); + const double zNum = itk::Math::Absolute(m_RayVoxelStartPosition[2] - m_RayVoxelEndPosition[2]); // The direction iterated in is that with the greatest number of voxels // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/Modules/Core/ImageFunction/include/itkWindowedSincInterpolateImageFunction.hxx b/Modules/Core/ImageFunction/include/itkWindowedSincInterpolateImageFunction.hxx index b2e49d40eeb..fb07c7ff239 100644 --- a/Modules/Core/ImageFunction/include/itkWindowedSincInterpolateImageFunction.hxx +++ b/Modules/Core/ImageFunction/include/itkWindowedSincInterpolateImageFunction.hxx @@ -148,7 +148,7 @@ WindowedSincInterpolateImageFunction(itk::Math::abs(std::log10(tolerance1)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance1)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetSplinePoles() at index [" << i << ']' << std::endl; std::cerr << "Expected value " << expectedSplinePole << std::endl; @@ -167,7 +167,7 @@ itkBSplineDecompositionImageFilterTest(int argc, char * argv[]) if (!itk::Math::FloatAlmostEqual(f, g, 10, tolerance2)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(tolerance2)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(tolerance2)))); std::cout << " Test failed! " << std::endl; std::cout << "Resample and Interpolated points are different." << std::endl; std::cout << " Point: " << point << std::endl; diff --git a/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx index 7b152ecfe71..db4565e0f88 100644 --- a/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkBSplineInterpolateImageFunctionTest.cxx @@ -149,7 +149,7 @@ TestGeometricPoint(const TInterpolator * interp, const PointType & point, bool i const double value = interp->Evaluate(point); std::cout << " Value: " << value; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << "*** Error: value should be " << trueValue << std::endl; return false; @@ -185,7 +185,7 @@ TestContinuousIndex(const TInterpolator * interp, const ContinuousIndexType & in const double value = interp->EvaluateAtContinuousIndex(index); std::cout << " Value: " << value; - if (itk::Math::abs(value - trueValue) > 1e-4) + if (itk::Math::Absolute(value - trueValue) > 1e-4) { std::cout << "*** Error: value should be " << trueValue << std::endl; return false; @@ -232,7 +232,7 @@ TestContinuousIndexDerivative(const TInterpolator * interp, std::cout << ", "; } std::cout << value[i]; - if (itk::Math::abs(value[i] - trueValue[i]) > 1e-4) + if (itk::Math::Absolute(value[i] - trueValue[i]) > 1e-4) { std::cout << "*** Error: value should be " << trueValue[i] << std::endl; return false; @@ -642,7 +642,7 @@ testEvaluateValueAndDerivative() std::cout << std::scientific << value << std::endl; std::cout << std::scientific << "EvaluateDerivative: " << dx_1 << std::endl; std::cout << std::scientific << "EvaluateValueAndDerivative: " << dx_2 << std::endl; - if (itk::Math::abs(dx_1[i] - dx_2[i]) > 1e-5) + if (itk::Math::Absolute(dx_1[i] - dx_2[i]) > 1e-5) { std::cout << "[ERROR]" << dx_1[i] << " != " << dx_2[i] << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkBSplineResampleImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkBSplineResampleImageFunctionTest.cxx index 02530facbed..6505475f907 100644 --- a/Modules/Core/ImageFunction/test/itkBSplineResampleImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkBSplineResampleImageFunctionTest.cxx @@ -88,7 +88,7 @@ itkBSplineResampleImageFunctionTest(int, char *[]) const double f = resample->Evaluate(point); const double g = interpolator->Evaluate(point); - if (itk::Math::abs(f - g) > 1e-5) + if (itk::Math::Absolute(f - g) > 1e-5) { std::cout << "Resample and Interpolated point are different." << std::endl; std::cout << " point: " << point << std::endl; diff --git a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx index aeabeb819d9..8763d3818b2 100644 --- a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionOnVectorTest.cxx @@ -29,7 +29,7 @@ IsEqual(T & m1, T & m2) { for (unsigned int c = 0; c < T::ColumnDimensions; ++c) { - if (itk::Math::abs(m1(r, c) - m2(r, c)) > 1e-4) + if (itk::Math::Absolute(m1(r, c) - m2(r, c)) > 1e-4) { return false; } @@ -277,7 +277,7 @@ itkCentralDifferenceImageFunctionOnVectorTestRun() result = EXIT_FAILURE; } - if (itk::Math::abs((right[0][0] + left[0][0]) / 2.0 - center[0][0]) > 1e-06) + if (itk::Math::Absolute((right[0][0] + left[0][0]) / 2.0 - center[0][0]) > 1e-06) { std::cout << "ERROR: Failed for EvaluateAtContinuousIndex at non-integer incecies. Center index result is not " "average of left and right." @@ -303,7 +303,7 @@ itkCentralDifferenceImageFunctionOnVectorTestRun() result = EXIT_FAILURE; } - if (itk::Math::abs((right[0][0] + left[0][0]) / 2.0 - center[0][0]) > 1e-06) + if (itk::Math::Absolute((right[0][0] + left[0][0]) / 2.0 - center[0][0]) > 1e-06) { std::cout << "ERROR: Failed for Evaluate at non-integer incecies. Center index result is not average of left and right." diff --git a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx index 0abe5c4313b..623e2e1fd37 100644 --- a/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCentralDifferenceImageFunctionTest.cxx @@ -217,7 +217,7 @@ itkCentralDifferenceImageFunctionTest(int, char *[]) result = EXIT_FAILURE; } - if (itk::Math::abs((right[0] + left[0]) / 2.0 - center[0]) > 1e-06) + if (itk::Math::Absolute((right[0] + left[0]) / 2.0 - center[0]) > 1e-06) { std::cerr << "ERROR: Failed for EvaluateAtContinuousIndex at non-integer incecies. " << "Center index result is not average of left and right." << std::endl; @@ -243,7 +243,7 @@ itkCentralDifferenceImageFunctionTest(int, char *[]) result = EXIT_FAILURE; } - if (itk::Math::abs((right[0] + left[0]) / 2.0 - center[0]) > 1e-06) + if (itk::Math::Absolute((right[0] + left[0]) / 2.0 - center[0]) > 1e-06) { std::cerr << "ERROR: Failed for Evaluate at non-integer incecies. " << "Center index result is not average of left and right." << std::endl; diff --git a/Modules/Core/ImageFunction/test/itkCovarianceImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkCovarianceImageFunctionTest.cxx index 9e86b6fc513..aa2cdf01481 100644 --- a/Modules/Core/ImageFunction/test/itkCovarianceImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkCovarianceImageFunctionTest.cxx @@ -75,7 +75,7 @@ itkCovarianceImageFunctionTest(int, char *[]) for (unsigned int iy = 0; iy < VectorDimension; ++iy) { // Covariance must be zero in this image with constant values - if (!itk::Math::FloatAlmostEqual(itk::Math::abs(covariance[ix][iy]), + if (!itk::Math::FloatAlmostEqual(itk::Math::Absolute(covariance[ix][iy]), static_cast(imageValue), 10, 10e-7)) diff --git a/Modules/Core/ImageFunction/test/itkGaussianBlurImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkGaussianBlurImageFunctionTest.cxx index a068e841a1f..638c68c787d 100644 --- a/Modules/Core/ImageFunction/test/itkGaussianBlurImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkGaussianBlurImageFunctionTest.cxx @@ -98,7 +98,7 @@ itkGaussianBlurImageFunctionTest(int, char *[]) for (unsigned int i = 0; i < Dimension; ++i) { - if (itk::Math::abs(setError[i] - readError[i]) > 1e-6) + if (itk::Math::Absolute(setError[i] - readError[i]) > 1e-6) { std::cerr << "[FAILED]" << std::endl; return EXIT_FAILURE; @@ -179,7 +179,7 @@ itkGaussianBlurImageFunctionTest(int, char *[]) std::cout << "Testing Evaluate(), EvaluateAtIndex() and EvaluateIndex: "; - if ((itk::Math::abs(blurredvalue_index - blurredvalue_point) > 0.01) || + if ((itk::Math::Absolute(blurredvalue_index - blurredvalue_point) > 0.01) || itk::Math::NotAlmostEquals(blurredvalue_point, blurredvalue_continuousIndex)) { std::cerr << "[FAILED] : " << blurredvalue_index << " : " << blurredvalue_point << " : " @@ -191,7 +191,7 @@ itkGaussianBlurImageFunctionTest(int, char *[]) std::cout << "Testing Evaluate() : "; - if (itk::Math::abs(blurredvalue_point - 0.158) > 0.1) + if (itk::Math::Absolute(blurredvalue_point - 0.158) > 0.1) { std::cerr << "[FAILED]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkGaussianDerivativeImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkGaussianDerivativeImageFunctionTest.cxx index 3db0b5a1392..df3dd2988ac 100644 --- a/Modules/Core/ImageFunction/test/itkGaussianDerivativeImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkGaussianDerivativeImageFunctionTest.cxx @@ -110,7 +110,7 @@ TestGaussianDerivativeImageFunction() std::cout << "Testing Evaluate() : "; - if ((gradientPoint[0] > 0.1) || (itk::Math::abs(gradientPoint[1] + 1.0) > 10e-4)) + if ((gradientPoint[0] > 0.1) || (itk::Math::Absolute(gradientPoint[1] + 1.0) > 10e-4)) { std::cerr << "[FAILED]" << std::endl; return EXIT_FAILURE; @@ -126,7 +126,7 @@ TestGaussianDerivativeImageFunction() std::cout << "Testing Evaluate() : "; - if ((gradientPoint[0] > 0.1) || (itk::Math::abs(gradientPoint[1] - 1.0) > 10e-4)) + if ((gradientPoint[0] > 0.1) || (itk::Math::Absolute(gradientPoint[1] - 1.0) > 10e-4)) { std::cerr << "[FAILED]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx index d3c8f399aeb..41a6ebe21ff 100644 --- a/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkImageAdaptorInterpolateImageFunctionTest.cxx @@ -81,7 +81,7 @@ TestGeometricPoint(const InterpolatorType * interp, const PointType & point, boo const OutputType value = interp->Evaluate(point); std::cout << " Value: " << value << std::endl; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << " *** Error: Value should be: "; std::cout << trueValue << std::endl; @@ -120,7 +120,7 @@ TestContinuousIndex(const InterpolatorType * interp, const OutputType value = interp->EvaluateAtContinuousIndex(index); std::cout << " Value: " << value << std::endl; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << " *** Error: Value should be: "; std::cout << trueValue << std::endl; diff --git a/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx b/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx index 1897580eb62..35eebfc36b0 100644 --- a/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx +++ b/Modules/Core/ImageFunction/test/itkInterpolateTest.cxx @@ -67,7 +67,7 @@ TestGeometricPoint(const TInterpolator * interp, const PointType & point, bool i const double value = interp->Evaluate(point); std::cout << " Value: " << value; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << "*** Error: value should be " << trueValue << std::endl; return false; @@ -103,7 +103,7 @@ TestContinuousIndex(const TInterpolator * interp, const ContinuousIndexType & in const double value = interp->EvaluateAtContinuousIndex(index); std::cout << " Value: " << value; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << "*** Error: value should be " << trueValue << std::endl; return false; diff --git a/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx index 1a310faafb5..5194fc424bc 100644 --- a/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkLinearInterpolateImageFunctionTest.cxx @@ -197,7 +197,7 @@ RunLinearInterpolateTest() const AccumulatorType computedValue = interpolator->Evaluate(point); const AccumulatorType difference = expectedValue - computedValue; - if (itk::Math::abs(difference) > tolerance) + if (itk::Math::Absolute(difference) > tolerance) { std::cerr << "Error found while computing interpolation " << std::endl; std::cerr << "Point = " << point << std::endl; diff --git a/Modules/Core/ImageFunction/test/itkMeanImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkMeanImageFunctionTest.cxx index fa9cb49f1a4..221b88a401a 100644 --- a/Modules/Core/ImageFunction/test/itkMeanImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkMeanImageFunctionTest.cxx @@ -66,7 +66,7 @@ itkMeanImageFunctionTest(int, char *[]) constexpr double epsilon{ 1e-7 }; if (!itk::Math::FloatAlmostEqual(static_cast(initialValue), mean, 10, epsilon)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << "Mean value (" << mean << ") does not equal initialValue (" << initialValue << ')' << std::endl; testStatus = EXIT_FAILURE; } @@ -80,7 +80,7 @@ itkMeanImageFunctionTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(static_cast(initialValue), mean2, 10, epsilon)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << "Mean value (" << mean2 << ") does not equal initialValue (" << initialValue << ')' << std::endl; testStatus = EXIT_FAILURE; } @@ -94,7 +94,7 @@ itkMeanImageFunctionTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(static_cast(initialValue), mean3, 10, epsilon)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << "Mean value (" << mean3 << ") does not equal initialValue (" << initialValue << ')' << std::endl; testStatus = EXIT_FAILURE; } diff --git a/Modules/Core/ImageFunction/test/itkMedianImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkMedianImageFunctionTest.cxx index 6c0df2d11d8..2bc70297d2c 100644 --- a/Modules/Core/ImageFunction/test/itkMedianImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkMedianImageFunctionTest.cxx @@ -71,7 +71,7 @@ itkMedianImageFunctionTest(int, char *[]) // since the input image is constant // the should be equal to the initial value - if (itk::Math::abs(initialValue - median) > 10e-7) + if (itk::Math::Absolute(initialValue - median) > 10e-7) { std::cerr << "Error in mean computation" << std::endl; return EXIT_FAILURE; @@ -111,7 +111,7 @@ itkMedianImageFunctionTest(int, char *[]) // since the input image is constant // the should be equal to the initial value - if (itk::Math::abs(initialValue - median) > 10e-7) + if (itk::Math::Absolute(initialValue - median) > 10e-7) { std::cerr << "Error in mean computation" << std::endl; return EXIT_FAILURE; @@ -128,7 +128,7 @@ itkMedianImageFunctionTest(int, char *[]) // Since we've changed the image outside the default neighborhood // for the MedianImageFunction, it would be an error for the median // to be the same - if (itk::Math::abs(initialValue - median) < 10e-7) + if (itk::Math::Absolute(initialValue - median) < 10e-7) { std::cerr << "Error in mean computation" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkNeighborhoodOperatorImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkNeighborhoodOperatorImageFunctionTest.cxx index 6cb0ccac056..7086d8336d3 100644 --- a/Modules/Core/ImageFunction/test/itkNeighborhoodOperatorImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkNeighborhoodOperatorImageFunctionTest.cxx @@ -62,7 +62,7 @@ itkNeighborhoodOperatorImageFunctionTest(int, char *[]) // since the input image is constant // the should be equal to the initial value - if (itk::Math::abs(initialValue - Blur) > 10e-7) + if (itk::Math::Absolute(initialValue - Blur) > 10e-7) { std::cerr << "[FAILED] : Error in Blur computation" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx index 9f74a1ca4f0..4e8393882ad 100644 --- a/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkRGBInterpolateImageFunctionTest.cxx @@ -77,7 +77,7 @@ TestGeometricPoint(const InterpolatorType * interp, const PointType & point, boo int k = 0; for (; k < VectorDimension; ++k) { - if (itk::Math::abs(value[k] - trueValue[k]) > 1e-9) + if (itk::Math::Absolute(value[k] - trueValue[k]) > 1e-9) { break; } @@ -137,7 +137,7 @@ TestContinuousIndex(const InterpolatorType * interp, int k = 0; for (k = 0; k < VectorDimension; ++k) { - if (itk::Math::abs(value[k] - trueValue[k]) > 1e-9) + if (itk::Math::Absolute(value[k] - trueValue[k]) > 1e-9) { break; } diff --git a/Modules/Core/ImageFunction/test/itkScatterMatrixImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkScatterMatrixImageFunctionTest.cxx index 43e0051d44f..6ed868b63d7 100644 --- a/Modules/Core/ImageFunction/test/itkScatterMatrixImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkScatterMatrixImageFunctionTest.cxx @@ -98,7 +98,7 @@ itkScatterMatrixImageFunctionTest(int, char *[]) { for (unsigned int iy = 0; iy < VectorDimension; ++iy) { - if (itk::Math::abs(initialValue[ix] * initialValue[iy] - scatterMatrix[ix][iy]) > 10e-7) + if (itk::Math::Absolute(initialValue[ix] * initialValue[iy] - scatterMatrix[ix][iy]) > 10e-7) { std::cerr << "Error in scatterMatrix computation" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkVarianceImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVarianceImageFunctionTest.cxx index 1c19ed3e1fe..dc77c0d4cbf 100644 --- a/Modules/Core/ImageFunction/test/itkVarianceImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkVarianceImageFunctionTest.cxx @@ -80,7 +80,7 @@ itkVarianceImageFunctionTest(int, char *[]) // since the input image is constant // the variance should be zero - if (itk::Math::abs(variance) > 10e-7) + if (itk::Math::Absolute(variance) > 10e-7) { std::cerr << "Error in variance computation" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx index 22ac95f372c..63c4c9c6995 100644 --- a/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkVectorInterpolateImageFunctionTest.cxx @@ -72,7 +72,7 @@ TestGeometricPoint(const InterpolatorType * interp, const PointType & point, boo int k = 0; for (; k < VectorDimension; ++k) { - if (itk::Math::abs(value[k] - trueValue[k]) > 1e-9) + if (itk::Math::Absolute(value[k] - trueValue[k]) > 1e-9) { break; } @@ -135,7 +135,7 @@ TestContinuousIndex(const InterpolatorType * interp, unsigned int k = 0; for (; k < VectorDimension; ++k) { - if (itk::Math::abs(value[k] - trueValue[k]) > 1e-9) + if (itk::Math::Absolute(value[k] - trueValue[k]) > 1e-9) { break; } diff --git a/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx index 50ad9ac19cd..a7f7d331a79 100644 --- a/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkVectorLinearInterpolateNearestNeighborExtrapolateImageFunctionTest.cxx @@ -81,7 +81,7 @@ TestGeometricPoint(const InterpolatorType * interp, int k = 0; for (k = 0; k < VectorDimension; ++k) { - if (itk::Math::abs(value[k] - trueValue[k]) > 1e-9) + if (itk::Math::Absolute(value[k] - trueValue[k]) > 1e-9) { break; } @@ -145,7 +145,7 @@ TestContinuousIndex(const InterpolatorType * interp, int k = 0; for (; k < VectorDimension; ++k) { - if (itk::Math::abs(value[k] - trueValue[k]) > 1e-9) + if (itk::Math::Absolute(value[k] - trueValue[k]) > 1e-9) { break; } diff --git a/Modules/Core/ImageFunction/test/itkVectorMeanImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkVectorMeanImageFunctionTest.cxx index ae63bfb88a0..fe450f42894 100644 --- a/Modules/Core/ImageFunction/test/itkVectorMeanImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkVectorMeanImageFunctionTest.cxx @@ -76,7 +76,7 @@ itkVectorMeanImageFunctionTest(int, char *[]) // the should be equal to the initial value for (unsigned int ii = 0; ii < VectorDimension; ++ii) { - if (itk::Math::abs(initialValue[ii] - mean[ii]) > 10e-7) + if (itk::Math::Absolute(initialValue[ii] - mean[ii]) > 10e-7) { std::cerr << "Error in mean computation" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx index 6fd211bff52..425512fa0a5 100644 --- a/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx +++ b/Modules/Core/ImageFunction/test/itkWindowedSincInterpolateImageFunctionTest.cxx @@ -74,7 +74,7 @@ TestGeometricPoint(const InterpolatorType * interp, const PointType & point, boo const OutputType value = interp->Evaluate(point); std::cout << " Value: " << value << std::endl; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << " *** Error: Value is " << value << " but should be: "; std::cout << trueValue << std::endl; @@ -112,7 +112,7 @@ TestContinuousIndex(const InterpolatorType * interp, const OutputType value = interp->EvaluateAtContinuousIndex(index); std::cout << " Value: " << value << std::endl; - if (itk::Math::abs(value - trueValue) > 1e-9) + if (itk::Math::Absolute(value - trueValue) > 1e-9) { std::cout << " *** Error: Value is " << value << " but should be: " << trueValue << std::endl; } diff --git a/Modules/Core/Mesh/include/itkSimplexMeshAdaptTopologyFilter.h b/Modules/Core/Mesh/include/itkSimplexMeshAdaptTopologyFilter.h index 94638c80a9a..869f6b1ad13 100644 --- a/Modules/Core/Mesh/include/itkSimplexMeshAdaptTopologyFilter.h +++ b/Modules/Core/Mesh/include/itkSimplexMeshAdaptTopologyFilter.h @@ -128,11 +128,11 @@ class ITK_TEMPLATE_EXPORT SimplexMeshAdaptTopologyFilter : public MeshToMeshFilt double meanCurvature = 0; const PointIdentifier refPoint = *it; double val = mesh->GetMeanCurvature(*it++); - meanCurvature += itk::Math::abs(val); + meanCurvature += itk::Math::Absolute(val); PointIdentifier id1 = *it; val = mesh->GetMeanCurvature(*it++); - meanCurvature += itk::Math::abs(val); + meanCurvature += itk::Math::Absolute(val); double area = 0; @@ -144,7 +144,7 @@ class ITK_TEMPLATE_EXPORT SimplexMeshAdaptTopologyFilter : public MeshToMeshFilt area += ComputeArea(refPoint, id1, id2); id1 = id2; val = mesh->GetMeanCurvature(*it); - meanCurvature += itk::Math::abs(val); + meanCurvature += itk::Math::Absolute(val); ++cnt; ++it; } @@ -184,7 +184,7 @@ class ITK_TEMPLATE_EXPORT SimplexMeshAdaptTopologyFilter : public MeshToMeshFilt mesh->GetPoint(p1, &v1); mesh->GetPoint(p2, &v2); mesh->GetPoint(p3, &v3); - return itk::Math::abs(vnl_cross_3d((v2 - v1).GetVnlVector(), (v3 - v1).GetVnlVector()).two_norm() / 2.0); + return itk::Math::Absolute(vnl_cross_3d((v2 - v1).GetVnlVector(), (v3 - v1).GetVnlVector()).two_norm() / 2.0); } typename DoubleValueMapType::Pointer diff --git a/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx b/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx index dfda2a38789..66e7d211bdc 100644 --- a/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx +++ b/Modules/Core/Mesh/include/itkSimplexMeshVolumeCalculator.hxx @@ -56,7 +56,7 @@ SimplexMeshVolumeCalculator::Finalize() m_Kz = (m_Muncz + (m_Wxyz / 3.0) + ((m_Wxz + m_Wyz) / 2.0)) / m_NumberOfTriangles; m_Volume = (m_Kx * m_VolumeX + m_Ky * m_VolumeY + m_Kz * m_VolumeZ); - m_Volume = itk::Math::abs(m_Volume); + m_Volume = itk::Math::Absolute(m_Volume); } template @@ -137,9 +137,9 @@ SimplexMeshVolumeCalculator::CalculateTriangleVolume(InputPointType // double absu[3]; - absu[0] = itk::Math::abs(u[0]); - absu[1] = itk::Math::abs(u[1]); - absu[2] = itk::Math::abs(u[2]); + absu[0] = itk::Math::Absolute(u[0]); + absu[1] = itk::Math::Absolute(u[1]); + absu[2] = itk::Math::Absolute(u[2]); if ((absu[0] > absu[1]) && (absu[0] > absu[2])) { ++m_Muncx; @@ -196,7 +196,7 @@ SimplexMeshVolumeCalculator::CalculateTriangleVolume(InputPointType const double b = std::sqrt(ii[0] + jj[0] + kk[0]); const double c = std::sqrt(ii[2] + jj[2] + kk[2]); const double s = 0.5 * (a + b + c); - const double area = std::sqrt(itk::Math::abs(s * (s - a) * (s - b) * (s - c))); + const double area = std::sqrt(itk::Math::Absolute(s * (s - a) * (s - b) * (s - c))); // Volume elements ... // diff --git a/Modules/Core/Mesh/include/itkSphereMeshSource.hxx b/Modules/Core/Mesh/include/itkSphereMeshSource.hxx index dac49037adb..c54d58fe3dc 100644 --- a/Modules/Core/Mesh/include/itkSphereMeshSource.hxx +++ b/Modules/Core/Mesh/include/itkSphereMeshSource.hxx @@ -88,21 +88,23 @@ SphereMeshSource::GenerateData() int signu = (std::cos(u) > 0) ? 1 : -1; int signv = (std::cos(v) > 0) ? 1 : -1; - p1[0] = m_Scale[0] * signu * - (std::pow(static_cast(itk::Math::abs(std::cos(u))), static_cast(m_Squareness1)))*signv * - (std::pow(static_cast(itk::Math::abs(std::cos(v))), static_cast(m_Squareness2))) + - m_Center[0]; + p1[0] = + m_Scale[0] * signu * + (std::pow(static_cast(itk::Math::Absolute(std::cos(u))), static_cast(m_Squareness1)))*signv * + (std::pow(static_cast(itk::Math::Absolute(std::cos(v))), static_cast(m_Squareness2))) + + m_Center[0]; signv = (std::sin(v) > 0) ? 1 : -1; - p1[1] = m_Scale[1] * signu * - (std::pow(static_cast(itk::Math::abs(std::cos(u))), static_cast(m_Squareness1)))*signv * - (std::pow(static_cast(itk::Math::abs(std::sin(v))), static_cast(m_Squareness2))) + - m_Center[1]; + p1[1] = + m_Scale[1] * signu * + (std::pow(static_cast(itk::Math::Absolute(std::cos(u))), static_cast(m_Squareness1)))*signv * + (std::pow(static_cast(itk::Math::Absolute(std::sin(v))), static_cast(m_Squareness2))) + + m_Center[1]; signu = (std::sin(u) > 0) ? 1 : -1; p1[2] = m_Scale[2] * signu * - (std::pow(static_cast(itk::Math::abs(std::sin(u))), static_cast(m_Squareness1))) + + (std::pow(static_cast(itk::Math::Absolute(std::sin(u))), static_cast(m_Squareness1))) + m_Center[2]; point.Value() = p1; @@ -111,26 +113,26 @@ SphereMeshSource::GenerateData() } // calculate the south pole node - p1[0] = (m_Scale[0] * (std::pow(static_cast(itk::Math::abs(std::cos(-itk::Math::pi / 2))), 1.0f)) * - (std::pow(static_cast(itk::Math::abs(std::cos(0.0))), 1.0f)) + + p1[0] = (m_Scale[0] * (std::pow(static_cast(itk::Math::Absolute(std::cos(-itk::Math::pi / 2))), 1.0f)) * + (std::pow(static_cast(itk::Math::Absolute(std::cos(0.0))), 1.0f)) + m_Center[0]); - p1[1] = (m_Scale[1] * (std::pow(static_cast(itk::Math::abs(std::cos(-itk::Math::pi / 2))), 1.0f)) * - (std::pow(static_cast(itk::Math::abs(std::sin(0.0))), 1.0f)) + + p1[1] = (m_Scale[1] * (std::pow(static_cast(itk::Math::Absolute(std::cos(-itk::Math::pi / 2))), 1.0f)) * + (std::pow(static_cast(itk::Math::Absolute(std::sin(0.0))), 1.0f)) + m_Center[1]); - p1[2] = (m_Scale[2] * -1 * (std::pow(static_cast(itk::Math::abs(std::sin(-itk::Math::pi / 2))), 1.0f)) + + p1[2] = (m_Scale[2] * -1 * (std::pow(static_cast(itk::Math::Absolute(std::sin(-itk::Math::pi / 2))), 1.0f)) + m_Center[2]); point.Value() = p1; ++point; // calculate the north pole node - p1[0] = (m_Scale[0] * (std::pow(static_cast(itk::Math::abs(std::cos(itk::Math::pi / 2))), 1.0f)) * - (std::pow(itk::Math::abs(std::cos(0.0)), 1.0)) + + p1[0] = (m_Scale[0] * (std::pow(static_cast(itk::Math::Absolute(std::cos(itk::Math::pi / 2))), 1.0f)) * + (std::pow(itk::Math::Absolute(std::cos(0.0)), 1.0)) + m_Center[0]); - p1[1] = (m_Scale[1] * (std::pow(static_cast(itk::Math::abs(std::cos(itk::Math::pi / 2))), 1.0f)) * - (std::pow(itk::Math::abs(std::sin(0.0)), 1.0)) + + p1[1] = (m_Scale[1] * (std::pow(static_cast(itk::Math::Absolute(std::cos(itk::Math::pi / 2))), 1.0f)) * + (std::pow(itk::Math::Absolute(std::sin(0.0)), 1.0)) + m_Center[1]); - p1[2] = - (m_Scale[2] * (std::pow(static_cast(itk::Math::abs(std::sin(itk::Math::pi / 2))), 1.0f)) + m_Center[2]); + p1[2] = (m_Scale[2] * (std::pow(static_cast(itk::Math::Absolute(std::sin(itk::Math::pi / 2))), 1.0f)) + + m_Center[2]); point.Value() = p1; ++point; } diff --git a/Modules/Core/Mesh/include/itkTriangleMeshCurvatureCalculator.hxx b/Modules/Core/Mesh/include/itkTriangleMeshCurvatureCalculator.hxx index 888e970497f..bec4d2b9a5e 100644 --- a/Modules/Core/Mesh/include/itkTriangleMeshCurvatureCalculator.hxx +++ b/Modules/Core/Mesh/include/itkTriangleMeshCurvatureCalculator.hxx @@ -134,7 +134,7 @@ TriangleMeshCurvatureCalculator::ComputeGaussCurvature(const InputMe // Surface area const auto A = static_cast( - itk::Math::abs(vnl_cross_3d((v1 - v0).GetVnlVector(), (v2 - v0).GetVnlVector()).two_norm() / 2.0)); + itk::Math::Absolute(vnl_cross_3d((v1 - v0).GetVnlVector(), (v2 - v0).GetVnlVector()).two_norm() / 2.0)); dA[point_ids[0]] += A; dA[point_ids[1]] += A; diff --git a/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx b/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx index e18bff423f0..05bf83d94c9 100644 --- a/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx +++ b/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx @@ -435,7 +435,7 @@ TriangleMeshToBinaryImageFilter::RasterizeTriangles() const int sign = p1D.m_Sign; // check absolute distance from lastx to x - if (itk::Math::abs(x - lastx) > m_Tolerance) + if (itk::Math::Absolute(x - lastx) > m_Tolerance) { signproduct = sign * lastSign; if (signproduct < 0) diff --git a/Modules/Core/Mesh/test/itkMeshSpatialObjectIOTest.cxx b/Modules/Core/Mesh/test/itkMeshSpatialObjectIOTest.cxx index ead493991b9..e523bf6d341 100644 --- a/Modules/Core/Mesh/test/itkMeshSpatialObjectIOTest.cxx +++ b/Modules/Core/Mesh/test/itkMeshSpatialObjectIOTest.cxx @@ -282,7 +282,7 @@ itkMeshSpatialObjectIOTest(int argc, char * argv[]) std::cout << "Index = " << (*it_pd)->Index() << " v.s " << j << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs((*it_pd)->Value() - data) > 0.001) + if (itk::Math::Absolute((*it_pd)->Value() - data) > 0.001) { std::cout << " [FAILED]" << std::endl; std::cout << "value = " << (*it_pd)->Value() << " v.s " << data << std::endl; @@ -320,7 +320,7 @@ itkMeshSpatialObjectIOTest(int argc, char * argv[]) std::cout << "Index = " << (*it_pc)->Index() << " v.s " << j << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs((*it_pc)->Value() - data) > 0.001) + if (itk::Math::Absolute((*it_pc)->Value() - data) > 0.001) { std::cout << " [FAILED]" << std::endl; std::cout << "value = " << (*it_pc)->Value() << " v.s " << data << std::endl; diff --git a/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx b/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx index 97b106da70a..83662227524 100644 --- a/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx +++ b/Modules/Core/Mesh/test/itkQuadrilateralCellTest.cxx @@ -174,7 +174,7 @@ itkQuadrilateralCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] - 0.5) > toleance) || (itk::Math::abs(pcoords[1] - 0.6) > toleance)) + if ((itk::Math::Absolute(pcoords[0] - 0.5) > toleance) || (itk::Math::Absolute(pcoords[1] - 0.6) > toleance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -182,8 +182,8 @@ itkQuadrilateralCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(weights[0] - 0.2) > toleance) || (itk::Math::abs(weights[1] - 0.2) > toleance) || - (itk::Math::abs(weights[2] - 0.3) > toleance) || (itk::Math::abs(weights[3] - 0.3) > toleance)) + if ((itk::Math::Absolute(weights[0] - 0.2) > toleance) || (itk::Math::Absolute(weights[1] - 0.2) > toleance) || + (itk::Math::Absolute(weights[2] - 0.3) > toleance) || (itk::Math::Absolute(weights[3] - 0.3) > toleance)) { std::cerr << "Error: weights computed incorrectly" << std::endl; std::cerr << "weights[0] = " << weights[0] << std::endl; @@ -208,7 +208,7 @@ itkQuadrilateralCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] + 0.5) > toleance) || (itk::Math::abs(pcoords[1] - 0.6) > toleance)) + if ((itk::Math::Absolute(pcoords[0] + 0.5) > toleance) || (itk::Math::Absolute(pcoords[1] - 0.6) > toleance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -235,7 +235,7 @@ itkQuadrilateralCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] - 1.5) > toleance) || (itk::Math::abs(pcoords[1] - 0.6) > toleance)) + if ((itk::Math::Absolute(pcoords[0] - 1.5) > toleance) || (itk::Math::Absolute(pcoords[1] - 0.6) > toleance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -260,15 +260,15 @@ itkQuadrilateralCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] - 0.5) > toleance) || (itk::Math::abs(pcoords[1] - 0.6) > toleance)) + if ((itk::Math::Absolute(pcoords[0] - 0.5) > toleance) || (itk::Math::Absolute(pcoords[1] - 0.6) > toleance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; std::cerr << "pcoords[1] = " << pcoords[1] << std::endl; return EXIT_FAILURE; } - if ((itk::Math::abs(weights[0] - 0.2) > toleance) || (itk::Math::abs(weights[1] - 0.2) > toleance) || - (itk::Math::abs(weights[2] - 0.3) > toleance) || (itk::Math::abs(weights[3] - 0.3) > toleance)) + if ((itk::Math::Absolute(weights[0] - 0.2) > toleance) || (itk::Math::Absolute(weights[1] - 0.2) > toleance) || + (itk::Math::Absolute(weights[2] - 0.3) > toleance) || (itk::Math::Absolute(weights[3] - 0.3) > toleance)) { std::cerr << "Error: weights computed incorrectly" << std::endl; std::cerr << "weights[0] = " << weights[0] << std::endl; @@ -299,7 +299,7 @@ itkQuadrilateralCellTest(int, char *[]) // With planar assumption, this off-plane point should give: pcoords[0] = 0.625 // With proper projection on quad, it should give: pcoords[0] = 0.4 // FIXME when projection is implemented in itkQuadrilateralCell::EvaluatePosition - if ((itk::Math::abs(pcoords[0] - 0.625) > toleance) || (itk::Math::abs(pcoords[1] - 0.3) > toleance)) + if ((itk::Math::Absolute(pcoords[0] - 0.625) > toleance) || (itk::Math::Absolute(pcoords[1] - 0.3) > toleance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; diff --git a/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest.cxx b/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest.cxx index d4f30cef07c..40228d1b12c 100644 --- a/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest.cxx +++ b/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest.cxx @@ -72,7 +72,7 @@ itkRegularSphereMeshSourceTest(int, char *[]) const double distanceToCenter = pt.EuclideanDistanceTo(center); - if (itk::Math::abs(distanceToCenter - radius) > tolerance) + if (itk::Math::Absolute(distanceToCenter - radius) > tolerance) { std::cerr << "Distance to center " << distanceToCenter; std::cerr << " is too different from radius " << radius << std::endl; diff --git a/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest2.cxx b/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest2.cxx index c2e6e6e0978..c2f5c7f5336 100644 --- a/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest2.cxx +++ b/Modules/Core/Mesh/test/itkRegularSphereMeshSourceTest2.cxx @@ -78,7 +78,7 @@ itkRegularSphereMeshSourceTest2(int, char *[]) d += (center[dim] - p[dim]) * (center[dim] - p[dim]) / (scale[dim] * scale[dim]); } - if (itk::Math::abs(d - 1.) > 1e-6) + if (itk::Math::Absolute(d - 1.) > 1e-6) { std::cerr << "too much deviation for vertex " << it->Index() << std::endl; std::cerr << "distance: " << d << std::endl; diff --git a/Modules/Core/Mesh/test/itkSimplexMeshVolumeCalculatorTest.cxx b/Modules/Core/Mesh/test/itkSimplexMeshVolumeCalculatorTest.cxx index 6022739e9c8..7c1ae584930 100644 --- a/Modules/Core/Mesh/test/itkSimplexMeshVolumeCalculatorTest.cxx +++ b/Modules/Core/Mesh/test/itkSimplexMeshVolumeCalculatorTest.cxx @@ -81,7 +81,7 @@ itkSimplexMeshVolumeCalculatorTest(int, char *[]) std::cout << "knownVolume: " << knownVolume << " versus computedVolume: " << volume << std::endl; - if (itk::Math::abs(volume - knownVolume) > (1e-2 * knownVolume)) + if (itk::Math::Absolute(volume - knownVolume) > (1e-2 * knownVolume)) { std::cerr << "Error in the Volume computation " << std::endl; std::cerr << "We expected " << knownVolume << std::endl; diff --git a/Modules/Core/Mesh/test/itkTriangleCellTest.cxx b/Modules/Core/Mesh/test/itkTriangleCellTest.cxx index b735b693710..eef018a7d54 100644 --- a/Modules/Core/Mesh/test/itkTriangleCellTest.cxx +++ b/Modules/Core/Mesh/test/itkTriangleCellTest.cxx @@ -178,8 +178,8 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] - 0.3) > tolerance) || (itk::Math::abs(pcoords[1] - 0.5) > tolerance) || - (itk::Math::abs(pcoords[2] - 0.2) > tolerance)) + if ((itk::Math::Absolute(pcoords[0] - 0.3) > tolerance) || (itk::Math::Absolute(pcoords[1] - 0.5) > tolerance) || + (itk::Math::Absolute(pcoords[2] - 0.2) > tolerance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -188,8 +188,8 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(weights[0] - 0.3) > tolerance) || (itk::Math::abs(weights[1] - 0.5) > tolerance) || - (itk::Math::abs(weights[2] - 0.2) > tolerance)) + if ((itk::Math::Absolute(weights[0] - 0.3) > tolerance) || (itk::Math::Absolute(weights[1] - 0.5) > tolerance) || + (itk::Math::Absolute(weights[2] - 0.2) > tolerance)) { std::cerr << "Error: weights computed incorrectly" << std::endl; std::cerr << "weights[0] = " << weights[0] << std::endl; @@ -198,8 +198,9 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(closestPoint[0] - 5.0) > tolerance) || (itk::Math::abs(closestPoint[1] - 3.0) > tolerance) || - (itk::Math::abs(closestPoint[2] - 0.0) > tolerance)) + if ((itk::Math::Absolute(closestPoint[0] - 5.0) > tolerance) || + (itk::Math::Absolute(closestPoint[1] - 3.0) > tolerance) || + (itk::Math::Absolute(closestPoint[2] - 0.0) > tolerance)) { std::cerr << "Error: closestPoint computed incorrectly" << std::endl; std::cerr << "closestPoint[0] = " << closestPoint[0] << std::endl; @@ -227,8 +228,8 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] - 0.5) > tolerance) || (itk::Math::abs(pcoords[1] + 0.5) > tolerance) || - (itk::Math::abs(pcoords[2] - 1.0) > tolerance)) + if ((itk::Math::Absolute(pcoords[0] - 0.5) > tolerance) || (itk::Math::Absolute(pcoords[1] + 0.5) > tolerance) || + (itk::Math::Absolute(pcoords[2] - 1.0) > tolerance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -237,8 +238,9 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(closestPoint[0] - 10.0) > tolerance) || (itk::Math::abs(closestPoint[1] - 5.0) > tolerance) || - (itk::Math::abs(closestPoint[2] - 0.0) > tolerance)) + if ((itk::Math::Absolute(closestPoint[0] - 10.0) > tolerance) || + (itk::Math::Absolute(closestPoint[1] - 5.0) > tolerance) || + (itk::Math::Absolute(closestPoint[2] - 0.0) > tolerance)) { std::cerr << "Error: closestPoint computed incorrectly" << std::endl; std::cerr << "closestPoint[0] = " << closestPoint[0] << std::endl; @@ -270,8 +272,8 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] - 1.0) > tolerance) || (itk::Math::abs(pcoords[1] - 1.0) > tolerance) || - (itk::Math::abs(pcoords[2] + 1.0) > tolerance)) + if ((itk::Math::Absolute(pcoords[0] - 1.0) > tolerance) || (itk::Math::Absolute(pcoords[1] - 1.0) > tolerance) || + (itk::Math::Absolute(pcoords[2] + 1.0) > tolerance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -281,8 +283,9 @@ itkTriangleCellTest(int, char *[]) } // note should be half way up the line (0,0,0) -> (10,10,0) - if ((itk::Math::abs(closestPoint[0] - 5.0) > tolerance) || (itk::Math::abs(closestPoint[1] - 5.0) > tolerance) || - (itk::Math::abs(closestPoint[2] - 0.0) > tolerance)) + if ((itk::Math::Absolute(closestPoint[0] - 5.0) > tolerance) || + (itk::Math::Absolute(closestPoint[1] - 5.0) > tolerance) || + (itk::Math::Absolute(closestPoint[2] - 0.0) > tolerance)) { std::cerr << "Error: closestPoint computed incorrectly" << std::endl; std::cerr << "closestPoint[0] = " << closestPoint[0] << std::endl; @@ -314,8 +317,8 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] + 0.5) > tolerance) || (itk::Math::abs(pcoords[1] - 0.5) > tolerance) || - (itk::Math::abs(pcoords[2] - 1.0) > tolerance)) + if ((itk::Math::Absolute(pcoords[0] + 0.5) > tolerance) || (itk::Math::Absolute(pcoords[1] - 0.5) > tolerance) || + (itk::Math::Absolute(pcoords[2] - 1.0) > tolerance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -324,8 +327,9 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(closestPoint[0] - 5.0) > tolerance) || (itk::Math::abs(closestPoint[1] - 0.0) > tolerance) || - (itk::Math::abs(closestPoint[2] - 0.0) > tolerance)) + if ((itk::Math::Absolute(closestPoint[0] - 5.0) > tolerance) || + (itk::Math::Absolute(closestPoint[1] - 0.0) > tolerance) || + (itk::Math::Absolute(closestPoint[2] - 0.0) > tolerance)) { std::cerr << "Error: closestPoint computed incorrectly" << std::endl; std::cerr << "closestPoint[0] = " << closestPoint[0] << std::endl; @@ -357,8 +361,8 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(pcoords[0] + 0.3) > tolerance) || (itk::Math::abs(pcoords[1] - 1.5) > tolerance) || - (itk::Math::abs(pcoords[2] + 0.2) > tolerance)) + if ((itk::Math::Absolute(pcoords[0] + 0.3) > tolerance) || (itk::Math::Absolute(pcoords[1] - 1.5) > tolerance) || + (itk::Math::Absolute(pcoords[2] + 0.2) > tolerance)) { std::cerr << "Error: pcoords computed incorrectly" << std::endl; std::cerr << "pcoords[0] = " << pcoords[0] << std::endl; @@ -367,8 +371,9 @@ itkTriangleCellTest(int, char *[]) return EXIT_FAILURE; } - if ((itk::Math::abs(closestPoint[0] - 0.0) > tolerance) || (itk::Math::abs(closestPoint[1] - 0.0) > tolerance) || - (itk::Math::abs(closestPoint[2] - 0.0) > tolerance)) + if ((itk::Math::Absolute(closestPoint[0] - 0.0) > tolerance) || + (itk::Math::Absolute(closestPoint[1] - 0.0) > tolerance) || + (itk::Math::Absolute(closestPoint[2] - 0.0) > tolerance)) { std::cerr << "Error: closestPoint computed incorrectly" << std::endl; std::cerr << "closestPoint[0] = " << closestPoint[0] << std::endl; diff --git a/Modules/Core/Mesh/test/itkVTKPolyDataWriterTest02.cxx b/Modules/Core/Mesh/test/itkVTKPolyDataWriterTest02.cxx index 6c352847217..660e08a9875 100644 --- a/Modules/Core/Mesh/test/itkVTKPolyDataWriterTest02.cxx +++ b/Modules/Core/Mesh/test/itkVTKPolyDataWriterTest02.cxx @@ -75,7 +75,7 @@ itkVTKPolyDataWriterTest02(int argc, char * argv[]) const double distanceToCenter = pt.EuclideanDistanceTo(center); - if (itk::Math::abs(distanceToCenter - radius) > tolerance) + if (itk::Math::Absolute(distanceToCenter - radius) > tolerance) { std::cerr << "Distance to center " << distanceToCenter; std::cerr << " is too different from radius " << radius << std::endl; diff --git a/Modules/Core/Mesh/test/itkWarpMeshFilterTest.cxx b/Modules/Core/Mesh/test/itkWarpMeshFilterTest.cxx index 360eb6effff..435ff14c23e 100644 --- a/Modules/Core/Mesh/test/itkWarpMeshFilterTest.cxx +++ b/Modules/Core/Mesh/test/itkWarpMeshFilterTest.cxx @@ -134,7 +134,7 @@ itkWarpMeshFilterTest(int, char *[]) for (unsigned int i = 0; i < Dimension; ++i) { const double distance = outputPoint.Value()[i] - inputPoint.Value()[i]; - if (itk::Math::abs(distance - simpleVector[i]) > tolerance) + if (itk::Math::Absolute(distance - simpleVector[i]) > tolerance) { std::cerr << "Filter failed" << std::endl; std::cerr << "Expected displacement = " << simpleVector[i] << std::endl; diff --git a/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx index d96b12a7867..1d3c3ba6e9c 100644 --- a/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx +++ b/Modules/Core/SpatialObjects/include/itkPolygonSpatialObject.hxx @@ -92,10 +92,10 @@ double PolygonSpatialObject::MeasureAreaInObjectSpace() const { // To find the area of a planar polygon not in the x-y plane, use: - // 2 A(P) = itk::Math::abs(N . (sum_{i=0}^{n-1} (v_i x v_{i+1}))) + // 2 A(P) = itk::Math::Absolute(N . (sum_{i=0}^{n-1} (v_i x v_{i+1}))) // where N is a unit vector normal to the plane. The `.' represents the // dot product operator, the `x' represents the cross product operator, - // and itk::Math::abs() is the absolute value function. + // and itk::Math::Absolute() is the absolute value function. double area = 0.0; const int numpoints = this->GetNumberOfPoints(); int X = 0; diff --git a/Modules/Core/SpatialObjects/test/itkDTITubeSpatialObjectTest.cxx b/Modules/Core/SpatialObjects/test/itkDTITubeSpatialObjectTest.cxx index d7914ad123a..2153106fa4c 100644 --- a/Modules/Core/SpatialObjects/test/itkDTITubeSpatialObjectTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkDTITubeSpatialObjectTest.cxx @@ -419,22 +419,22 @@ itkDTITubeSpatialObjectTest(int, char *[]) const Point n2_known(itk::MakePoint(0.408248, 0.408248, 0.816497)); constexpr double tol{ 0.0001 }; - if ((itk::Math::abs(t[0] - t_known[0]) > tol) || (itk::Math::abs(t[1] - t_known[1]) > tol) || - (itk::Math::abs(t[2] - t_known[2]) > tol)) + if ((itk::Math::Absolute(t[0] - t_known[0]) > tol) || (itk::Math::Absolute(t[1] - t_known[1]) > tol) || + (itk::Math::Absolute(t[2] - t_known[2]) > tol)) { std::cout << "[FAILED]" << std::endl; std::cout << " t = " << t << " != " << t_known << " within " << tol << std::endl; return EXIT_FAILURE; } - if ((itk::Math::abs(n1[0] - n1_known[0]) > tol) || (itk::Math::abs(n1[1] + n1_known[1]) > tol) || - (itk::Math::abs(n1[2] - n1_known[2]) > tol)) + if ((itk::Math::Absolute(n1[0] - n1_known[0]) > tol) || (itk::Math::Absolute(n1[1] + n1_known[1]) > tol) || + (itk::Math::Absolute(n1[2] - n1_known[2]) > tol)) { std::cout << "[FAILED]" << std::endl; std::cout << " n1 = " << n1 << " != " << n1_known << " within " << tol << std::endl; return EXIT_FAILURE; } - if ((itk::Math::abs(n2[0] - n2_known[0]) > tol) || (itk::Math::abs(n2[1] - n2_known[1]) > tol) || - (itk::Math::abs(n2[2] + n2_known[2]) > tol)) + if ((itk::Math::Absolute(n2[0] - n2_known[0]) > tol) || (itk::Math::Absolute(n2[1] - n2_known[1]) > tol) || + (itk::Math::Absolute(n2[2] + n2_known[2]) > tol)) { std::cout << "[FAILED]" << std::endl; std::cout << " n2 = " << n2 << " != " << n2_known << " within " << tol << std::endl; diff --git a/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx b/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx index 0dc1aef774f..8d63759ff80 100644 --- a/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkImageSpatialObjectTest.cxx @@ -134,9 +134,9 @@ itkImageSpatialObjectTest(int, char *[]) std::cout << "ValueAt() with interpolator..."; double epsilon = 0.001; - if (itk::Math::abs(returnedValue - expectedValue) > epsilon) + if (itk::Math::Absolute(returnedValue - expectedValue) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in ValueAt at point " << q << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; @@ -154,11 +154,11 @@ itkImageSpatialObjectTest(int, char *[]) expectedDerivative[2] = 100; std::cout << "DerivativeAt() with interpolator ..."; epsilon = 0.00001; - if (itk::Math::abs(derivative[0] - expectedDerivative[0]) > epsilon || - itk::Math::abs(derivative[1] - expectedDerivative[1]) > epsilon || - itk::Math::abs(derivative[2] - expectedDerivative[2]) > epsilon) + if (itk::Math::Absolute(derivative[0] - expectedDerivative[0]) > epsilon || + itk::Math::Absolute(derivative[1] - expectedDerivative[1]) > epsilon || + itk::Math::Absolute(derivative[2] - expectedDerivative[2]) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in ValueAt at point " << q << std::endl; std::cerr << "Expected value " << expectedDerivative << std::endl; diff --git a/Modules/Core/SpatialObjects/test/itkMetaArrowConverterTest.cxx b/Modules/Core/SpatialObjects/test/itkMetaArrowConverterTest.cxx index eade63c0d3f..7e48b768cb6 100644 --- a/Modules/Core/SpatialObjects/test/itkMetaArrowConverterTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkMetaArrowConverterTest.cxx @@ -144,7 +144,7 @@ itkMetaArrowConverterTest(int argc, char * argv[]) const double metaLength = newMetaArrow->Length(); // if (metaLength != static_cast(length)) - if (itk::Math::abs(metaLength - length) > precisionLimit) + if (itk::Math::Absolute(metaLength - length) > precisionLimit) { std::cout << "Conversion to MetaArrow failed to convert length [FAILED]" << std::endl; std::cout << " Meta Length = " << metaLength << std::endl; @@ -174,9 +174,9 @@ itkMetaArrowConverterTest(int argc, char * argv[]) // check position const double * metaPosition = newMetaArrow->Position(); - if (itk::Math::abs(metaPosition[0] - position[0]) > precisionLimit || - itk::Math::abs(metaPosition[1] - position[1]) > precisionLimit || - itk::Math::abs(metaPosition[2] - position[2]) > precisionLimit) + if (itk::Math::Absolute(metaPosition[0] - position[0]) > precisionLimit || + itk::Math::Absolute(metaPosition[1] - position[1]) > precisionLimit || + itk::Math::Absolute(metaPosition[2] - position[2]) > precisionLimit) { std::cout << "Conversion to MetaArrow failed to convert position [FAILED]" << std::endl; return EXIT_FAILURE; @@ -198,9 +198,9 @@ itkMetaArrowConverterTest(int argc, char * argv[]) newMetaDirectionNorm.Normalize(); } - if (itk::Math::abs(newMetaDirectionNorm[0] - directionNorm[0]) > precisionLimit || - itk::Math::abs(newMetaDirectionNorm[1] - directionNorm[1]) > precisionLimit || - itk::Math::abs(newMetaDirectionNorm[2] - directionNorm[2]) > precisionLimit) + if (itk::Math::Absolute(newMetaDirectionNorm[0] - directionNorm[0]) > precisionLimit || + itk::Math::Absolute(newMetaDirectionNorm[1] - directionNorm[1]) > precisionLimit || + itk::Math::Absolute(newMetaDirectionNorm[2] - directionNorm[2]) > precisionLimit) { std::cout << "Conversion to SpatialObject failed to convert direction [FAILED]" << std::endl; return EXIT_FAILURE; @@ -220,7 +220,7 @@ itkMetaArrowConverterTest(int argc, char * argv[]) newItkArrow->Update(); // check length - if (itk::Math::abs(newItkArrow->GetLengthInWorldSpace() - metaArrow->Length()) > precisionLimit) + if (itk::Math::Absolute(newItkArrow->GetLengthInWorldSpace() - metaArrow->Length()) > precisionLimit) { std::cout << "Conversion to SpatialObject failed to convert length [FAILED]" << std::endl; std::cout << " Meta Length = " << metaArrow->Length() << std::endl; @@ -255,9 +255,9 @@ itkMetaArrowConverterTest(int argc, char * argv[]) // check position SpatialObjectType::PointType itkPosition = newItkArrow->GetPositionInWorldSpace(); - if (itk::Math::abs(itkPosition[0] - mPosition[0]) > precisionLimit || - itk::Math::abs(itkPosition[1] - mPosition[1]) > precisionLimit || - itk::Math::abs(itkPosition[2] - mPosition[2]) > precisionLimit) + if (itk::Math::Absolute(itkPosition[0] - mPosition[0]) > precisionLimit || + itk::Math::Absolute(itkPosition[1] - mPosition[1]) > precisionLimit || + itk::Math::Absolute(itkPosition[2] - mPosition[2]) > precisionLimit) { std::cout << "Conversion to SpatialObject failed to convert position [FAILED]" << std::endl; return EXIT_FAILURE; @@ -278,9 +278,9 @@ itkMetaArrowConverterTest(int argc, char * argv[]) mDirectionNorm.Normalize(); } - if (itk::Math::abs(itkDirectionNorm[0] - mDirectionNorm[0]) > precisionLimit || - itk::Math::abs(itkDirectionNorm[1] - mDirectionNorm[1]) > precisionLimit || - itk::Math::abs(itkDirectionNorm[2] - mDirectionNorm[2]) > precisionLimit) + if (itk::Math::Absolute(itkDirectionNorm[0] - mDirectionNorm[0]) > precisionLimit || + itk::Math::Absolute(itkDirectionNorm[1] - mDirectionNorm[1]) > precisionLimit || + itk::Math::Absolute(itkDirectionNorm[2] - mDirectionNorm[2]) > precisionLimit) { std::cout << "Conversion to SpatialObject failed to convert direction [FAILED]" << std::endl; return EXIT_FAILURE; @@ -305,7 +305,7 @@ itkMetaArrowConverterTest(int argc, char * argv[]) dynamic_cast(converter->ReadMeta(argv[1]).GetPointer()); // check length - if (itk::Math::abs(reLoad->GetLengthInWorldSpace() - length) > precisionLimit) + if (itk::Math::Absolute(reLoad->GetLengthInWorldSpace() - length) > precisionLimit) { std::cout << "Didn't read length properly [FAILED]" << std::endl; return EXIT_FAILURE; @@ -333,9 +333,9 @@ itkMetaArrowConverterTest(int argc, char * argv[]) // check position itkPosition = reLoad->GetPositionInWorldSpace(); - if (itk::Math::abs(itkPosition[0] - mPosition[0]) > precisionLimit || - itk::Math::abs(itkPosition[1] - mPosition[1]) > precisionLimit || - itk::Math::abs(itkPosition[2] - mPosition[2]) > precisionLimit) + if (itk::Math::Absolute(itkPosition[0] - mPosition[0]) > precisionLimit || + itk::Math::Absolute(itkPosition[1] - mPosition[1]) > precisionLimit || + itk::Math::Absolute(itkPosition[2] - mPosition[2]) > precisionLimit) { std::cout << "Didn't read position properly [FAILED]" << std::endl; return EXIT_FAILURE; @@ -351,9 +351,9 @@ itkMetaArrowConverterTest(int argc, char * argv[]) reLoadDirectionNorm.Normalize(); } - if (itk::Math::abs(reLoadDirectionNorm[0] - directionNorm[0]) > precisionLimit || - itk::Math::abs(reLoadDirectionNorm[1] - directionNorm[1]) > precisionLimit || - itk::Math::abs(reLoadDirectionNorm[2] - directionNorm[2]) > precisionLimit) + if (itk::Math::Absolute(reLoadDirectionNorm[0] - directionNorm[0]) > precisionLimit || + itk::Math::Absolute(reLoadDirectionNorm[1] - directionNorm[1]) > precisionLimit || + itk::Math::Absolute(reLoadDirectionNorm[2] - directionNorm[2]) > precisionLimit) { std::cout << "Didn't read direction properly [FAILED]" << std::endl; std::cout << " Direction: " << reLoadDirectionNorm << std::endl; diff --git a/Modules/Core/SpatialObjects/test/itkMetaGaussianConverterTest.cxx b/Modules/Core/SpatialObjects/test/itkMetaGaussianConverterTest.cxx index f4464fd06a8..a1ee03c9cfd 100644 --- a/Modules/Core/SpatialObjects/test/itkMetaGaussianConverterTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkMetaGaussianConverterTest.cxx @@ -115,7 +115,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) const double metaMaximum = newMetaGaussian->Maximum(); // if (metaMaximum != static_cast(maximum)) - if (itk::Math::abs(metaMaximum - maximum) > precisionLimit) + if (itk::Math::Absolute(metaMaximum - maximum) > precisionLimit) { std::cout << "[FAILED] Conversion to MetaGaussian failed to convert maximum" << std::endl; return EXIT_FAILURE; @@ -126,7 +126,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) const double metaRadius = newMetaGaussian->Radius(); // if (metaRadius != static_cast(radius)) - if (itk::Math::abs(metaRadius - radius) > precisionLimit) + if (itk::Math::Absolute(metaRadius - radius) > precisionLimit) { std::cout << "[FAILED] Conversion to MetaGaussian failed to convert radius" << std::endl; return EXIT_FAILURE; @@ -137,7 +137,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) const double metaSigma = newMetaGaussian->Sigma(); // if (metaSigma != static_cast(sigma)) - if (itk::Math::abs(metaSigma - sigma) > precisionLimit) + if (itk::Math::Absolute(metaSigma - sigma) > precisionLimit) { std::cout << "[FAILED] Conversion to MetaGaussian failed to convert sigma" << std::endl; return EXIT_FAILURE; @@ -181,7 +181,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) // Check maximum - if (itk::Math::abs(newGaussianSpatialObj->GetMaximum() - metaGaussian->Maximum()) > precisionLimit) + if (itk::Math::Absolute(newGaussianSpatialObj->GetMaximum() - metaGaussian->Maximum()) > precisionLimit) { std::cout << "[FAILED] Conversion to SpatialObject failed to convert maximum" << std::endl; return EXIT_FAILURE; @@ -189,7 +189,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) std::cout << "[PASSED] MetaObject -> SpatialObject: maximum: " << newGaussianSpatialObj->GetMaximum() << std::endl; // Check radius - if (itk::Math::abs(newGaussianSpatialObj->GetRadiusInObjectSpace() - metaGaussian->Radius()) > precisionLimit) + if (itk::Math::Absolute(newGaussianSpatialObj->GetRadiusInObjectSpace() - metaGaussian->Radius()) > precisionLimit) { std::cout << "[FAILED] Conversion to SpatialObject failed to convert radius" << std::endl; return EXIT_FAILURE; @@ -198,7 +198,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) << std::endl; // Check sigma - if (itk::Math::abs(newGaussianSpatialObj->GetSigmaInObjectSpace() - metaGaussian->Sigma()) > precisionLimit) + if (itk::Math::Absolute(newGaussianSpatialObj->GetSigmaInObjectSpace() - metaGaussian->Sigma()) > precisionLimit) { std::cout << "[FAILED] Conversion to SpatialObject failed to convert sigma" << std::endl; return EXIT_FAILURE; @@ -254,7 +254,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) dynamic_cast(converter->ReadMeta(argv[1]).GetPointer()); // Check maximum - if (itk::Math::abs(reLoad->GetMaximum() - maximum) > precisionLimit) + if (itk::Math::Absolute(reLoad->GetMaximum() - maximum) > precisionLimit) { std::cout << "[FAILED] Didn't read maximum properly" << std::endl; return EXIT_FAILURE; @@ -262,7 +262,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) std::cout << "[PASSED] Reading: maximum: " << reLoad->GetMaximum() << std::endl; // Check radius - if (itk::Math::abs(reLoad->GetRadiusInObjectSpace() - radius) > precisionLimit) + if (itk::Math::Absolute(reLoad->GetRadiusInObjectSpace() - radius) > precisionLimit) { std::cout << "[FAILED] Didn't read radius properly" << std::endl; return EXIT_FAILURE; @@ -270,7 +270,7 @@ itkMetaGaussianConverterTest(int argc, char * argv[]) std::cout << "[PASSED] Reading: radius: " << reLoad->GetRadiusInObjectSpace() << std::endl; // Check sigma - if (itk::Math::abs(reLoad->GetSigmaInObjectSpace() - sigma) > precisionLimit) + if (itk::Math::Absolute(reLoad->GetSigmaInObjectSpace() - sigma) > precisionLimit) { std::cout << "[FAILED] Didn't read sigma properly" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx b/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx index c4b02055db5..2e76f6bbe76 100644 --- a/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkNewMetaObjectTypeTest.cxx @@ -297,7 +297,7 @@ itkNewMetaObjectTypeTest(int, char *[]) return EXIT_FAILURE; } const float value = p->GetValue(); - if (itk::Math::abs(value - Pi) > 0.00001) + if (itk::Math::Absolute(value - Pi) > 0.00001) { std::cout << "Expected value " << Pi << "but found " << value << std::endl; delete metaScene; diff --git a/Modules/Core/SpatialObjects/test/itkSpatialObjectToImageStatisticsCalculatorTest.cxx b/Modules/Core/SpatialObjects/test/itkSpatialObjectToImageStatisticsCalculatorTest.cxx index 5a338527a85..a66c92e011d 100644 --- a/Modules/Core/SpatialObjects/test/itkSpatialObjectToImageStatisticsCalculatorTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkSpatialObjectToImageStatisticsCalculatorTest.cxx @@ -96,8 +96,8 @@ itkSpatialObjectToImageStatisticsCalculatorTest(int, char *[]) std::cout << "Sample mean = " << calculator->GetMean() << std::endl; std::cout << "Sample covariance = " << calculator->GetCovarianceMatrix(); - if ((itk::Math::abs(calculator->GetMean()[0] - 140.0) > 1.0) || - (itk::Math::abs(calculator->GetCovarianceMatrix()[0][0] - 16141.0) > 1.0)) + if ((itk::Math::Absolute(calculator->GetMean()[0] - 140.0) > 1.0) || + (itk::Math::Absolute(calculator->GetCovarianceMatrix()[0][0] - 16141.0) > 1.0)) { std::cout << "[FAILED]" << std::endl; return EXIT_FAILURE; @@ -116,8 +116,8 @@ itkSpatialObjectToImageStatisticsCalculatorTest(int, char *[]) std::cout << "Sample mean = " << calculator->GetMean() << std::endl; std::cout << "Sample covariance = " << calculator->GetCovarianceMatrix(); - if ((itk::Math::abs(calculator->GetMean()[0] - 140.0) > 1.0) || - (itk::Math::abs(calculator->GetCovarianceMatrix()[0][0] - 16141.0) > 1.0)) + if ((itk::Math::Absolute(calculator->GetMean()[0] - 140.0) > 1.0) || + (itk::Math::Absolute(calculator->GetCovarianceMatrix()[0][0] - 16141.0) > 1.0)) { std::cout << "[FAILED]" << std::endl; return EXIT_FAILURE; @@ -189,9 +189,9 @@ itkSpatialObjectToImageStatisticsCalculatorTest(int, char *[]) std::cout << "Sample mean = " << calculator3D->GetMean() << std::endl; std::cout << "Sample covariance = " << calculator3D->GetCovarianceMatrix(); - if ((itk::Math::abs(calculator3D->GetMean()[0] - 0.0) > 1.0) || - (itk::Math::abs(calculator3D->GetMean()[1] - 1.0) > 1.0) || - (itk::Math::abs(calculator3D->GetMean()[2] - 2.0) > 1.0)) + if ((itk::Math::Absolute(calculator3D->GetMean()[0] - 0.0) > 1.0) || + (itk::Math::Absolute(calculator3D->GetMean()[1] - 1.0) > 1.0) || + (itk::Math::Absolute(calculator3D->GetMean()[2] - 2.0) > 1.0)) { std::cout << "[FAILED]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/SpatialObjects/test/itkTubeSpatialObjectTest.cxx b/Modules/Core/SpatialObjects/test/itkTubeSpatialObjectTest.cxx index 46a2e2206cb..a841ae64556 100644 --- a/Modules/Core/SpatialObjects/test/itkTubeSpatialObjectTest.cxx +++ b/Modules/Core/SpatialObjects/test/itkTubeSpatialObjectTest.cxx @@ -432,22 +432,22 @@ itkTubeSpatialObjectTest(int, char *[]) const Point n2_known(itk::MakePoint(0.408248, 0.408248, 0.816497)); constexpr double tol{ 0.0001 }; - if ((itk::Math::abs(t[0] - t_known[0]) > tol) || (itk::Math::abs(t[1] - t_known[1]) > tol) || - (itk::Math::abs(t[2] - t_known[2]) > tol)) + if ((itk::Math::Absolute(t[0] - t_known[0]) > tol) || (itk::Math::Absolute(t[1] - t_known[1]) > tol) || + (itk::Math::Absolute(t[2] - t_known[2]) > tol)) { std::cout << "[FAILED]" << std::endl; std::cout << " t = " << t << " != " << t_known << " within " << tol << std::endl; return EXIT_FAILURE; } - if ((itk::Math::abs(n1[0] - n1_known[0]) > tol) || (itk::Math::abs(n1[1] + n1_known[1]) > tol) || - (itk::Math::abs(n1[2] - n1_known[2]) > tol)) + if ((itk::Math::Absolute(n1[0] - n1_known[0]) > tol) || (itk::Math::Absolute(n1[1] + n1_known[1]) > tol) || + (itk::Math::Absolute(n1[2] - n1_known[2]) > tol)) { std::cout << "[FAILED]" << std::endl; std::cout << " n1 = " << n1 << " != " << n1_known << " within " << tol << std::endl; return EXIT_FAILURE; } - if ((itk::Math::abs(n2[0] - n2_known[0]) > tol) || (itk::Math::abs(n2[1] - n2_known[1]) > tol) || - (itk::Math::abs(n2[2] + n2_known[2]) > tol)) + if ((itk::Math::Absolute(n2[0] - n2_known[0]) > tol) || (itk::Math::Absolute(n2[1] - n2_known[1]) > tol) || + (itk::Math::Absolute(n2[2] + n2_known[2]) > tol)) { std::cout << "[FAILED]" << std::endl; std::cout << " n2 = " << n2 << " != " << n2_known << " within " << tol << std::endl; diff --git a/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.hxx b/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.hxx index a01e3596743..7e9144dac2b 100644 --- a/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.hxx +++ b/Modules/Core/TestKernel/include/itkTestingStretchIntensityImageFilter.hxx @@ -75,7 +75,8 @@ StretchIntensityImageFilter::BeforeThreadedGenerateDa } } - if (itk::Math::abs(m_InputMaximum - m_InputMinimum) > itk::Math::abs(NumericTraits::epsilon())) + if (itk::Math::Absolute(m_InputMaximum - m_InputMinimum) > + itk::Math::Absolute(NumericTraits::epsilon())) { m_Scale = (static_cast(m_OutputMaximum) - static_cast(m_OutputMinimum)) / (static_cast(m_InputMaximum) - static_cast(m_InputMinimum)); diff --git a/Modules/Core/Transform/include/itkEuler3DTransform.hxx b/Modules/Core/Transform/include/itkEuler3DTransform.hxx index 3056c5effdd..380a50f4eb6 100644 --- a/Modules/Core/Transform/include/itkEuler3DTransform.hxx +++ b/Modules/Core/Transform/include/itkEuler3DTransform.hxx @@ -182,7 +182,7 @@ Euler3DTransform::ComputeMatrixParameters() { m_AngleY = -std::asin(this->GetMatrix()[2][0]); const double C = std::cos(m_AngleY); - if (itk::Math::abs(C) > 0.00005) + if (itk::Math::Absolute(C) > 0.00005) { double x = this->GetMatrix()[2][2] / C; double y = this->GetMatrix()[2][1] / C; @@ -203,7 +203,7 @@ Euler3DTransform::ComputeMatrixParameters() { m_AngleX = std::asin(this->GetMatrix()[2][1]); const double A = std::cos(m_AngleX); - if (itk::Math::abs(A) > 0.00005) + if (itk::Math::Absolute(A) > 0.00005) { double x = this->GetMatrix()[2][2] / A; double y = -this->GetMatrix()[2][0] / A; diff --git a/Modules/Core/Transform/test/itkAffineTransformTest.cxx b/Modules/Core/Transform/test/itkAffineTransformTest.cxx index 80bedeb9d40..5ae1285b20b 100644 --- a/Modules/Core/Transform/test/itkAffineTransformTest.cxx +++ b/Modules/Core/Transform/test/itkAffineTransformTest.cxx @@ -606,7 +606,7 @@ itkAffineTransformTest(int, char *[]) { for (unsigned int j = 0; j < Affine3DType::MatrixType::ColumnDimensions; ++j) { - if (itk::Math::abs(jaffInverseJacobianPosition[i][j] - matrix3invTruth[i][j]) > 1e-13) + if (itk::Math::Absolute(jaffInverseJacobianPosition[i][j] - matrix3invTruth[i][j]) > 1e-13) { std::cout << "Failed ComputeInverseJacobianWithRespectToPosition." << std::endl << "jaffInverseJacobianPosition: " << jaffInverseJacobianPosition << std::endl @@ -666,7 +666,7 @@ itkAffineTransformTest(int, char *[]) { const double v = (parameters1[q] - parameters1_inv_inv[q]); // Protect against numerical errors when v~=-0 with abs. - mag_error += sqrt(itk::Math::abs(v)); + mag_error += sqrt(itk::Math::Absolute(v)); } if (mag_error > 1e-4) { diff --git a/Modules/Core/Transform/test/itkAzimuthElevationToCartesianTransformTest.cxx b/Modules/Core/Transform/test/itkAzimuthElevationToCartesianTransformTest.cxx index 47af2e591de..e96e7e8d85b 100644 --- a/Modules/Core/Transform/test/itkAzimuthElevationToCartesianTransformTest.cxx +++ b/Modules/Core/Transform/test/itkAzimuthElevationToCartesianTransformTest.cxx @@ -165,9 +165,9 @@ itkAzimuthElevationToCartesianTransformTest(int argc, char * argv[]) bool same = true; for (unsigned int i = 0; i < PointType::PointDimension && same; ++i) { - same = ((itk::Math::abs(j[i] - answerBackwards[i]) < ACCEPTABLE_ERROR) && - (itk::Math::abs(j[i] - reverseDirectionAnswerBackwards[i]) < ACCEPTABLE_ERROR) && - (itk::Math::abs(answer[i] - reverseDirectionAnswer[i]) < ACCEPTABLE_ERROR)); + same = ((itk::Math::Absolute(j[i] - answerBackwards[i]) < ACCEPTABLE_ERROR) && + (itk::Math::Absolute(j[i] - reverseDirectionAnswerBackwards[i]) < ACCEPTABLE_ERROR) && + (itk::Math::Absolute(answer[i] - reverseDirectionAnswer[i]) < ACCEPTABLE_ERROR)); } if (!same) { diff --git a/Modules/Core/Transform/test/itkBSplineDeformableTransformTest.cxx b/Modules/Core/Transform/test/itkBSplineDeformableTransformTest.cxx index 252856ca7ea..3c39f010fd1 100644 --- a/Modules/Core/Transform/test/itkBSplineDeformableTransformTest.cxx +++ b/Modules/Core/Transform/test/itkBSplineDeformableTransformTest.cxx @@ -416,7 +416,7 @@ itkBSplineDeformableTransformTest1() std::cout << "numberOfParameters = " << numberOfParameters2 << std::endl; for (unsigned int i = 0; i < numberOfParameters2; ++i) { - if (itk::Math::abs(parameters2[i]) > 1e-10) + if (itk::Math::Absolute(parameters2[i]) > 1e-10) { std::cerr << "SetIdentity failed, parameters are not null " << "after invoking SetIdentity() " << std::endl; diff --git a/Modules/Core/Transform/test/itkBSplineTransformTest.cxx b/Modules/Core/Transform/test/itkBSplineTransformTest.cxx index 6706791d84b..af633bea244 100644 --- a/Modules/Core/Transform/test/itkBSplineTransformTest.cxx +++ b/Modules/Core/Transform/test/itkBSplineTransformTest.cxx @@ -446,7 +446,7 @@ itkBSplineTransformTest1() std::cout << "numberOfParameters = " << numberOfParameters2 << std::endl; for (unsigned int i = 0; i < numberOfParameters2; ++i) { - if (itk::Math::abs(parameters2[i]) > 1e-10) + if (itk::Math::Absolute(parameters2[i]) > 1e-10) { std::cerr << "SetIdentity failed, parameters are not null " << "after invoking SetIdentity() " << std::endl; diff --git a/Modules/Core/Transform/test/itkCenteredEuler3DTransformTest.cxx b/Modules/Core/Transform/test/itkCenteredEuler3DTransformTest.cxx index 7aaf8c411af..55bd7167472 100644 --- a/Modules/Core/Transform/test/itkCenteredEuler3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkCenteredEuler3DTransformTest.cxx @@ -109,7 +109,7 @@ itkCenteredEuler3DTransformTest(int, char *[]) r = eulerTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -141,7 +141,7 @@ itkCenteredEuler3DTransformTest(int, char *[]) r = eulerTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -271,7 +271,7 @@ itkCenteredEuler3DTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-5) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-5) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; @@ -295,9 +295,9 @@ itkCenteredEuler3DTransformTest(int, char *[]) auto t2 = EulerTransformType::New(); t2->SetIdentity(); t2->Compose(eulerTransform); - if ((itk::Math::abs(t2->GetParameters()[0] - 0.2) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[1] - 0.1) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[2] - 0.3) > 0.0001)) + if ((itk::Math::Absolute(t2->GetParameters()[0] - 0.2) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[1] - 0.1) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[2] - 0.3) > 0.0001)) { std::cout << " [ FAILED ] " << std::endl; return EXIT_FAILURE; @@ -313,9 +313,9 @@ itkCenteredEuler3DTransformTest(int, char *[]) t2->SetComputeZYX(true); t2->Compose(eulerTransform); - if ((itk::Math::abs(t2->GetParameters()[0] - 0.2) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[1] - 0.1) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[2] - 0.3) > 0.0001)) + if ((itk::Math::Absolute(t2->GetParameters()[0] - 0.2) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[1] - 0.1) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[2] - 0.3) > 0.0001)) { std::cout << " [ FAILED ] " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Transform/test/itkCenteredRigid2DTransformTest.cxx b/Modules/Core/Transform/test/itkCenteredRigid2DTransformTest.cxx index b090ee0daf0..e4c670ee5d1 100644 --- a/Modules/Core/Transform/test/itkCenteredRigid2DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkCenteredRigid2DTransformTest.cxx @@ -31,7 +31,7 @@ CheckEqual(const itk::Point & p1, const itk::Point & p2) for (unsigned int i = 0; i < 2; ++i) { - if (itk::Math::abs(p1[i] - p2[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p2[i]) > epsilon) { std::cout << p1 << " != " << p2 << ":[ FAILED ]" << std::endl; return false; @@ -75,7 +75,7 @@ itkCenteredRigid2DTransformTest(int, char *[]) CenteredRigidTransformType::OutputPointType r = transform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -106,7 +106,7 @@ itkCenteredRigid2DTransformTest(int, char *[]) r = transform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -158,7 +158,7 @@ itkCenteredRigid2DTransformTest(int, char *[]) Ok = true; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(p1[i] - p3[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p3[i]) > epsilon) { Ok = false; break; @@ -191,7 +191,7 @@ itkCenteredRigid2DTransformTest(int, char *[]) Ok = true; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(p1[i] - p3[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p3[i]) > epsilon) { Ok = false; break; @@ -345,7 +345,7 @@ itkCenteredRigid2DTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-4) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-4) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; diff --git a/Modules/Core/Transform/test/itkComposeScaleSkewVersor3DTransformTest.cxx b/Modules/Core/Transform/test/itkComposeScaleSkewVersor3DTransformTest.cxx index de22a5f2323..33f906814fd 100644 --- a/Modules/Core/Transform/test/itkComposeScaleSkewVersor3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkComposeScaleSkewVersor3DTransformTest.cxx @@ -115,7 +115,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -142,7 +142,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -170,7 +170,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -198,7 +198,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -229,7 +229,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -270,7 +270,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) transformedPoint = transform->TransformPoint(center); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(center[i] - transformedPoint[i]) > epsilon) + if (itk::Math::Absolute(center[i] - transformedPoint[i]) > epsilon) { Ok = false; break; @@ -315,7 +315,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Get/Set parameters: parameters do not match " << std::endl; return EXIT_FAILURE; @@ -368,7 +368,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) for (unsigned int p = 0; p < np; ++p) { std::cout << parameters[p] << " = " << parameters2[p] << std::endl; - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Identity parameters do not match" << std::endl; return EXIT_FAILURE; @@ -410,7 +410,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(rscale[j] - scale[j]) > tolerance) + if (itk::Math::Absolute(rscale[j] - scale[j]) > tolerance) { std::cerr << "Error in Set/Get Scale() " << std::endl; std::cerr << "Input scale: " << scale << std::endl; @@ -444,7 +444,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) for (unsigned int p = 0; p < np; ++p) { std::cout << parameters[p] << " = " << parameters2[p] << std::endl; - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Scale parameters do not match input " << std::endl; return EXIT_FAILURE; @@ -466,7 +466,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) for (unsigned int p = 0; p < np; ++p) { std::cout << parameters[p] << " = " << parameters3[p] << std::endl; - if (itk::Math::abs(parameters[p] - parameters3[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters3[p]) > tolerance) { std::cerr << "SetMatrix parameters do not match input " << std::endl; return EXIT_FAILURE; @@ -496,11 +496,11 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(tPnt[i] - tPnt2[i]) > 1e-7) + if (itk::Math::Absolute(tPnt[i] - tPnt2[i]) > 1e-7) { ++diff; } - if (itk::Math::abs(tPnt[i] - tPnt3[i]) > 1e-7) + if (itk::Math::Absolute(tPnt[i] - tPnt3[i]) > 1e-7) { ++diff; } @@ -559,7 +559,7 @@ itkComposeScaleSkewVersor3DTransformTest(int, char *[]) for (unsigned int d = 0; d < 3; ++d) { const double pntDiff = (pnt1[d] - pnt2[d]) / (2 * epsilon); - if (itk::Math::abs(pntDiff - jacob[d][i]) > itk::Math::abs(0.1 * pntDiff)) + if (itk::Math::Absolute(pntDiff - jacob[d][i]) > itk::Math::Absolute(0.1 * pntDiff)) { std::cout << "Ideal = " << pntDiff << " Jacob = " << jacob[d][i] << std::endl; std::cout << "Jacobian not matching finite difference." << std::endl; diff --git a/Modules/Core/Transform/test/itkCompositeTransformTest.cxx b/Modules/Core/Transform/test/itkCompositeTransformTest.cxx index 88c457f1161..b544be70c37 100644 --- a/Modules/Core/Transform/test/itkCompositeTransformTest.cxx +++ b/Modules/Core/Transform/test/itkCompositeTransformTest.cxx @@ -37,7 +37,7 @@ testPoint(const TPoint & p1, const TPoint & p2) for (unsigned int i = 0; i < TPoint::PointDimension; ++i) { - if (itk::Math::abs(p1[i] - p2[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p2[i]) > epsilon) { pass = false; } @@ -55,7 +55,7 @@ testMatrix(const TMatrix & m1, const TMatrix & m2) { for (unsigned int j = 0; j < TMatrix::ColumnDimensions; ++j) { - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { pass = false; } @@ -74,7 +74,7 @@ testJacobian(const TArray2D & m1, const TArray2D & m2) { for (unsigned int j = 0; j < m1.cols(); ++j) { - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { pass = false; } @@ -91,7 +91,7 @@ testVectorArray(const TVector & v1, const TVector & v2) for (unsigned int i = 0; i < v1.Size(); ++i) { - if (itk::Math::abs(v1[i] - v2[i]) > epsilon) + if (itk::Math::Absolute(v1[i] - v2[i]) > epsilon) { pass = false; } diff --git a/Modules/Core/Transform/test/itkEuler2DTransformTest.cxx b/Modules/Core/Transform/test/itkEuler2DTransformTest.cxx index eb275e071e1..0ab41681b28 100644 --- a/Modules/Core/Transform/test/itkEuler2DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkEuler2DTransformTest.cxx @@ -32,7 +32,7 @@ CheckEqual(const itk::Point & p1, const itk::Point & p2) for (unsigned int i = 0; i < 2; ++i) { - if (itk::Math::abs(p1[i] - p2[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p2[i]) > epsilon) { std::cout << p1 << " != " << p2 << ":[ FAILED ]" << std::endl; return false; @@ -90,7 +90,7 @@ itkEuler2DTransformTest(int, char *[]) r = eulerTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -121,7 +121,7 @@ itkEuler2DTransformTest(int, char *[]) r = eulerTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -169,7 +169,7 @@ itkEuler2DTransformTest(int, char *[]) auto t2 = EulerTransformType::New(); t2->SetIdentity(); t2->Compose(eulerTransform); - if (itk::Math::abs(t2->GetParameters()[0] - 0.2) > 0.0001) + if (itk::Math::Absolute(t2->GetParameters()[0] - 0.2) > 0.0001) { std::cout << " [ FAILED ] " << std::endl; return EXIT_FAILURE; @@ -321,7 +321,7 @@ itkEuler2DTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian2[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-4) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-4) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; @@ -380,9 +380,9 @@ itkEuler2DTransformTest(int, char *[]) std::cout << "Test Set/GetMatrix() and Set/GetOffset(): "; for (unsigned int j = 0; j < t1->GetNumberOfParameters(); ++j) { - if (itk::Math::abs(parameters3[j] - pdash[j]) > epsilon) + if (itk::Math::Absolute(parameters3[j] - pdash[j]) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in parameters at index [" << j << "]" << std::endl; std::cerr << "Expected value " << parameters3 << std::endl; diff --git a/Modules/Core/Transform/test/itkEuler3DTransformTest.cxx b/Modules/Core/Transform/test/itkEuler3DTransformTest.cxx index 1dbb3a60215..ad395f48a23 100644 --- a/Modules/Core/Transform/test/itkEuler3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkEuler3DTransformTest.cxx @@ -109,7 +109,7 @@ itkEuler3DTransformTest(int, char *[]) r = eulerTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -140,7 +140,7 @@ itkEuler3DTransformTest(int, char *[]) EulerTransformType::OutputPointType r2 = eulerTransform2->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(r1[i] - r2[i]) > epsilon) + if (itk::Math::Absolute(r1[i] - r2[i]) > epsilon) { Ok = false; break; @@ -173,7 +173,7 @@ itkEuler3DTransformTest(int, char *[]) r = eulerTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -309,7 +309,7 @@ itkEuler3DTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-5) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-5) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; @@ -332,9 +332,9 @@ itkEuler3DTransformTest(int, char *[]) auto t2 = EulerTransformType::New(); t2->SetIdentity(); t2->Compose(eulerTransform); - if ((itk::Math::abs(t2->GetParameters()[0] - 0.2) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[1] - 0.1) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[2] - 0.3) > 0.0001)) + if ((itk::Math::Absolute(t2->GetParameters()[0] - 0.2) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[1] - 0.1) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[2] - 0.3) > 0.0001)) { std::cout << " [ FAILED ] " << std::endl; return EXIT_FAILURE; @@ -350,9 +350,9 @@ itkEuler3DTransformTest(int, char *[]) t2->SetComputeZYX(true); t2->Compose(eulerTransform); - if ((itk::Math::abs(t2->GetParameters()[0] - 0.2) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[1] - 0.1) > 0.0001) || - (itk::Math::abs(t2->GetParameters()[2] - 0.3) > 0.0001)) + if ((itk::Math::Absolute(t2->GetParameters()[0] - 0.2) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[1] - 0.1) > 0.0001) || + (itk::Math::Absolute(t2->GetParameters()[2] - 0.3) > 0.0001)) { std::cout << " [ FAILED ] " << std::endl; return EXIT_FAILURE; @@ -448,7 +448,7 @@ itkEuler3DTransformTest(int, char *[]) ParametersType par0 = t3->GetParameters(); for (unsigned int k = 0; k < e.GetSize(); ++k) { - if (itk::Math::abs(e[k] - par0[k]) > epsilon) + if (itk::Math::Absolute(e[k] - par0[k]) > epsilon) { std::cout << " [ FAILED ] " << std::endl; std::cout << "Expected parameters: " << e << std::endl; @@ -477,7 +477,7 @@ itkEuler3DTransformTest(int, char *[]) ParametersType par1 = t_inv->GetParameters(); for (unsigned int k = 0; k < par1.GetSize(); ++k) { - if (itk::Math::abs(par1[k] - par0[k]) > epsilon) + if (itk::Math::Absolute(par1[k] - par0[k]) > epsilon) { std::cout << " [ FAILED ] " << std::endl; std::cout << "Expected parameters: " << par1 << std::endl; diff --git a/Modules/Core/Transform/test/itkIdentityTransformTest.cxx b/Modules/Core/Transform/test/itkIdentityTransformTest.cxx index 47aaefd35df..c74b21de159 100644 --- a/Modules/Core/Transform/test/itkIdentityTransformTest.cxx +++ b/Modules/Core/Transform/test/itkIdentityTransformTest.cxx @@ -43,7 +43,7 @@ itkIdentityTransformTest(int, char *[]) IdentityTransformType::OutputPointType r = transform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(p[i] - r[i]) > epsilon) + if (itk::Math::Absolute(p[i] - r[i]) > epsilon) { Ok = false; break; @@ -67,7 +67,7 @@ itkIdentityTransformTest(int, char *[]) IdentityTransformType::OutputVectorType vout = transform->TransformVector(vin); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(vout[i] - vin[i]) > epsilon) + if (itk::Math::Absolute(vout[i] - vin[i]) > epsilon) { Ok = false; break; @@ -91,7 +91,7 @@ itkIdentityTransformTest(int, char *[]) IdentityTransformType::OutputVnlVectorType vnlout = transform->TransformVector(vnlin); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(vnlout[i] - vnlin[i]) > epsilon) + if (itk::Math::Absolute(vnlout[i] - vnlin[i]) > epsilon) { Ok = false; break; @@ -115,7 +115,7 @@ itkIdentityTransformTest(int, char *[]) IdentityTransformType::OutputCovariantVectorType vcout = transform->TransformCovariantVector(vcin); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(vcout[i] - vcin[i]) > epsilon) + if (itk::Math::Absolute(vcout[i] - vcin[i]) > epsilon) { Ok = false; break; diff --git a/Modules/Core/Transform/test/itkMultiTransformTest.cxx b/Modules/Core/Transform/test/itkMultiTransformTest.cxx index 46ce4086ea8..12ef13e7e4e 100644 --- a/Modules/Core/Transform/test/itkMultiTransformTest.cxx +++ b/Modules/Core/Transform/test/itkMultiTransformTest.cxx @@ -39,7 +39,7 @@ testMatrix(const TMatrix & m1, const TMatrix & m2) { for (unsigned int j = 0; j < TMatrix::ColumnDimensions; ++j) { - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { pass = false; } @@ -56,7 +56,7 @@ testVectorArray(const TVector & v1, const TVector & v2) for (unsigned int i = 0; i < v1.Size(); ++i) { - if (itk::Math::abs(v1[i] - v2[i]) > epsilon) + if (itk::Math::Absolute(v1[i] - v2[i]) > epsilon) { pass = false; } diff --git a/Modules/Core/Transform/test/itkQuaternionRigidTransformTest.cxx b/Modules/Core/Transform/test/itkQuaternionRigidTransformTest.cxx index ab41f37e8e5..dc711326bea 100644 --- a/Modules/Core/Transform/test/itkQuaternionRigidTransformTest.cxx +++ b/Modules/Core/Transform/test/itkQuaternionRigidTransformTest.cxx @@ -40,7 +40,7 @@ itkQuaternionRigidTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -70,7 +70,7 @@ itkQuaternionRigidTransformTest(int, char *[]) std::cout << translationVector << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(translationVector[i] - itransVector[i]) > epsilon) + if (itk::Math::Absolute(translationVector[i] - itransVector[i]) > epsilon) { Ok = false; break; @@ -92,7 +92,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = translation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -117,7 +117,7 @@ itkQuaternionRigidTransformTest(int, char *[]) q = translation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -141,7 +141,7 @@ itkQuaternionRigidTransformTest(int, char *[]) q = translation->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -167,7 +167,7 @@ itkQuaternionRigidTransformTest(int, char *[]) q = translation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -218,7 +218,7 @@ itkQuaternionRigidTransformTest(int, char *[]) std::cout << "Offset = " << offset << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -241,7 +241,7 @@ itkQuaternionRigidTransformTest(int, char *[]) { for (unsigned int j = 0; j < N; ++j) { - if (itk::Math::abs(matrix[i][j] - mrotation[j][i]) > epsilon) + if (itk::Math::Absolute(matrix[i][j] - mrotation[j][i]) > epsilon) { Ok = false; break; @@ -269,7 +269,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -300,7 +300,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -331,7 +331,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -365,7 +365,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -435,7 +435,7 @@ itkQuaternionRigidTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-5) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-5) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; @@ -471,7 +471,7 @@ itkQuaternionRigidTransformTest(int, char *[]) // pOut should equate pInit for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(pOut[j] - pInit[j]) > 1e-5) + if (itk::Math::Absolute(pOut[j] - pInit[j]) > 1e-5) { std::cerr << "Error computing back transform" << std::endl; std::cerr << "Result should be: " << pInit << std::endl; @@ -542,7 +542,7 @@ itkQuaternionRigidTransformTest(int, char *[]) std::cout << "iOffset = " << ioffset << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -565,7 +565,7 @@ itkQuaternionRigidTransformTest(int, char *[]) { for (unsigned int j = 0; j < N; ++j) { - if (itk::Math::abs(matrix[i][j] - mrotation[j][i]) > epsilon) + if (itk::Math::Absolute(matrix[i][j] - mrotation[j][i]) > epsilon) { Ok = false; break; @@ -597,7 +597,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -628,7 +628,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -659,7 +659,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -693,7 +693,7 @@ itkQuaternionRigidTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -805,7 +805,7 @@ itkQuaternionRigidTransformTest(int, char *[]) ParametersType p = t2->GetParameters(); for (unsigned int k = 0; k < e.GetSize(); ++k) { - if (itk::Math::abs(e[k] - p[k]) > epsilon) + if (itk::Math::Absolute(e[k] - p[k]) > epsilon) { std::cout << " [ FAILED ] " << std::endl; std::cout << "Expected parameters: " << e << std::endl; diff --git a/Modules/Core/Transform/test/itkRigid2DTransformTest.cxx b/Modules/Core/Transform/test/itkRigid2DTransformTest.cxx index c8e6e146d13..f9b0ae4b356 100644 --- a/Modules/Core/Transform/test/itkRigid2DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkRigid2DTransformTest.cxx @@ -28,7 +28,7 @@ CheckEqual(const itk::Point & p1, const itk::Point & p2) constexpr double epsilon{ 1e-10 }; for (unsigned int i = 0; i < 2; ++i) { - if (itk::Math::abs(p1[i] - p2[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p2[i]) > epsilon) { std::cout << p1 << " != " << p2 << ": FAILED" << std::endl; return false; @@ -65,7 +65,7 @@ itkRigid2DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -110,7 +110,7 @@ itkRigid2DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -130,7 +130,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputPointType r = translation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -154,7 +154,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputVectorType q = translation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -177,7 +177,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputCovariantVectorType q = translation->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -202,7 +202,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputVnlVectorType q = translation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -244,10 +244,10 @@ itkRigid2DTransformTest(int, char *[]) ITK_TRY_EXPECT_EXCEPTION(rotation->SetMatrix(mrotation, 1e-8)); mrotation[0][0] -= 1e-7; - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); if (!itk::Math::FloatAlmostEqual(-angle, rotation->GetRotation(), 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetRotation" << std::endl; std::cerr << "Expected value " << -angle << std::endl; @@ -286,7 +286,7 @@ itkRigid2DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -307,7 +307,7 @@ itkRigid2DTransformTest(int, char *[]) { for (unsigned int j = 0; j < N; ++j) { - if (itk::Math::abs(matrix[i][j] - mrotation[i][j]) > epsilon) + if (itk::Math::Absolute(matrix[i][j] - mrotation[i][j]) > epsilon) { Ok = false; break; @@ -333,7 +333,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputPointType r = rotation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -362,7 +362,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputVectorType r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -392,7 +392,7 @@ itkRigid2DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -425,7 +425,7 @@ itkRigid2DTransformTest(int, char *[]) TransformType::OutputVnlVectorType r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; diff --git a/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx b/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx index 1de7c6e75ca..36d3bf9ed7d 100644 --- a/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx +++ b/Modules/Core/Transform/test/itkRigid3DPerspectiveTransformTest.cxx @@ -86,7 +86,7 @@ itkRigid3DPerspectiveTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -115,7 +115,7 @@ itkRigid3DPerspectiveTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -138,7 +138,7 @@ itkRigid3DPerspectiveTransformTest(int, char *[]) TransformType::OutputPointType r = translation->TransformPoint(p); for (unsigned int i = 0; i < N - 1; ++i) { - if (itk::Math::abs(s[i] - r[i]) > epsilon) + if (itk::Math::Absolute(s[i] - r[i]) > epsilon) { Ok = false; break; @@ -192,7 +192,7 @@ itkRigid3DPerspectiveTransformTest(int, char *[]) TransformType::OutputPointType r = rigid->TransformPoint(p); for (unsigned int i = 0; i < N - 1; ++i) { - if (itk::Math::abs(s[i] - r[i]) > epsilon) + if (itk::Math::Absolute(s[i] - r[i]) > epsilon) { Ok = false; break; diff --git a/Modules/Core/Transform/test/itkRigid3DTransformTest.cxx b/Modules/Core/Transform/test/itkRigid3DTransformTest.cxx index 540b76ca543..f316ac97de3 100644 --- a/Modules/Core/Transform/test/itkRigid3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkRigid3DTransformTest.cxx @@ -140,7 +140,7 @@ itkRigid3DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -167,7 +167,7 @@ itkRigid3DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -189,7 +189,7 @@ itkRigid3DTransformTest(int, char *[]) r = translation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -214,7 +214,7 @@ itkRigid3DTransformTest(int, char *[]) q = translation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -238,7 +238,7 @@ itkRigid3DTransformTest(int, char *[]) q = translation->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -264,7 +264,7 @@ itkRigid3DTransformTest(int, char *[]) q = translation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - p[i]) > epsilon) + if (itk::Math::Absolute(q[i] - p[i]) > epsilon) { Ok = false; break; @@ -312,7 +312,7 @@ itkRigid3DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(offset[i] - ioffset[i]) > epsilon) + if (itk::Math::Absolute(offset[i] - ioffset[i]) > epsilon) { Ok = false; break; @@ -333,7 +333,7 @@ itkRigid3DTransformTest(int, char *[]) { for (unsigned int j = 0; j < N; ++j) { - if (itk::Math::abs(matrix0[i][j] - mrotation[i][j]) > epsilon) + if (itk::Math::Absolute(matrix0[i][j] - mrotation[i][j]) > epsilon) { Ok = false; break; @@ -361,7 +361,7 @@ itkRigid3DTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -392,7 +392,7 @@ itkRigid3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -424,7 +424,7 @@ itkRigid3DTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -458,7 +458,7 @@ itkRigid3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -576,7 +576,7 @@ itkRigid3DTransformTest(int, char *[]) Ok = true; for (unsigned int par = 0; par < t->GetNumberOfParameters(); ++par) { - if (itk::Math::abs(p[par] - pIdeal[par]) > epsilon) + if (itk::Math::Absolute(p[par] - pIdeal[par]) > epsilon) { std::cerr << "Expected parameters: " << pIdeal << std::endl; std::cerr << "Actual parameters: " << p << std::endl; diff --git a/Modules/Core/Transform/test/itkScaleLogarithmicTransformTest.cxx b/Modules/Core/Transform/test/itkScaleLogarithmicTransformTest.cxx index b2e12289178..44414a614a7 100644 --- a/Modules/Core/Transform/test/itkScaleLogarithmicTransformTest.cxx +++ b/Modules/Core/Transform/test/itkScaleLogarithmicTransformTest.cxx @@ -49,7 +49,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) std::cout << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(scale[i] - 1.0) > epsilon) + if (itk::Math::Absolute(scale[i] - 1.0) > epsilon) { testStatus = false; break; @@ -81,7 +81,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(scale[i] - iscale[i]) > epsilon) + if (itk::Math::Absolute(scale[i] - iscale[i]) > epsilon) { testStatus = false; break; @@ -105,7 +105,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) TransformType::OutputPointType r = scaleTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { testStatus = false; break; @@ -134,7 +134,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) TransformType::OutputVectorType r = scaleTransform->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { testStatus = false; break; @@ -162,7 +162,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) TransformType::OutputCovariantVectorType r = scaleTransform->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { testStatus = false; break; @@ -192,7 +192,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) TransformType::OutputVnlVectorType r = scaleTransform->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { testStatus = false; break; @@ -247,7 +247,7 @@ itkScaleLogarithmicTransformTest(int, char *[]) testStatus = true; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(p2[i] - parameters[i]) > 1e-5) + if (itk::Math::Absolute(p2[i] - parameters[i]) > 1e-5) { testStatus = false; break; diff --git a/Modules/Core/Transform/test/itkScaleSkewVersor3DTransformTest.cxx b/Modules/Core/Transform/test/itkScaleSkewVersor3DTransformTest.cxx index 1ed44197d0c..f1ef81cd1b4 100644 --- a/Modules/Core/Transform/test/itkScaleSkewVersor3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkScaleSkewVersor3DTransformTest.cxx @@ -119,7 +119,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -146,7 +146,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -174,7 +174,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -202,7 +202,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -233,7 +233,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -274,7 +274,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) transformedPoint = transform->TransformPoint(center); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(center[i] - transformedPoint[i]) > epsilon) + if (itk::Math::Absolute(center[i] - transformedPoint[i]) > epsilon) { Ok = false; break; @@ -316,7 +316,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -376,7 +376,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) { for (unsigned int jj = 0; jj < 15; ++jj) { - if (itk::Math::abs(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) + if (itk::Math::Absolute(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) { std::cerr << "Jacobian components differ from expected values "; std::cerr << std::endl << std::endl; @@ -437,7 +437,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -479,7 +479,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(rscale[j] - scale[j]) > tolerance) + if (itk::Math::Absolute(rscale[j] - scale[j]) > tolerance) { std::cerr << "Error in Set/Get Scale() " << std::endl; std::cerr << "Input scale: " << scale << std::endl; @@ -509,7 +509,7 @@ itkScaleSkewVersor3DTransformTest(int, char *[]) ParametersType parameters2 = transform->GetParameters(); for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Transform/test/itkScaleTransformTest.cxx b/Modules/Core/Transform/test/itkScaleTransformTest.cxx index 82dc5bc2830..26e9db63502 100644 --- a/Modules/Core/Transform/test/itkScaleTransformTest.cxx +++ b/Modules/Core/Transform/test/itkScaleTransformTest.cxx @@ -49,7 +49,7 @@ itkScaleTransformTest(int, char *[]) std::cout << std::endl; for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(scale[i] - 1.0) > epsilon) + if (itk::Math::Absolute(scale[i] - 1.0) > epsilon) { Ok = false; break; @@ -97,7 +97,7 @@ itkScaleTransformTest(int, char *[]) for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(scale[i] - iscale[i]) > epsilon) + if (itk::Math::Absolute(scale[i] - iscale[i]) > epsilon) { Ok = false; break; @@ -121,7 +121,7 @@ itkScaleTransformTest(int, char *[]) TransformType::OutputPointType r = scaleTransform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -150,7 +150,7 @@ itkScaleTransformTest(int, char *[]) TransformType::OutputVectorType r = scaleTransform->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -178,7 +178,7 @@ itkScaleTransformTest(int, char *[]) TransformType::OutputCovariantVectorType r = scaleTransform->TransformCovariantVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -208,7 +208,7 @@ itkScaleTransformTest(int, char *[]) TransformType::OutputVnlVectorType r = scaleTransform->TransformVector(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; diff --git a/Modules/Core/Transform/test/itkScaleVersor3DTransformTest.cxx b/Modules/Core/Transform/test/itkScaleVersor3DTransformTest.cxx index 8e2562a0f6a..f55eb8f1ef7 100644 --- a/Modules/Core/Transform/test/itkScaleVersor3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkScaleVersor3DTransformTest.cxx @@ -132,7 +132,7 @@ itkScaleVersor3DTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -159,7 +159,7 @@ itkScaleVersor3DTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -187,7 +187,7 @@ itkScaleVersor3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -215,7 +215,7 @@ itkScaleVersor3DTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -246,7 +246,7 @@ itkScaleVersor3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -287,7 +287,7 @@ itkScaleVersor3DTransformTest(int, char *[]) transformedPoint = transform->TransformPoint(center); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(center[i] - transformedPoint[i]) > epsilon) + if (itk::Math::Absolute(center[i] - transformedPoint[i]) > epsilon) { Ok = false; break; @@ -327,7 +327,7 @@ itkScaleVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -387,7 +387,7 @@ itkScaleVersor3DTransformTest(int, char *[]) { for (unsigned int jj = 0; jj < 9; ++jj) { - if (itk::Math::abs(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) + if (itk::Math::Absolute(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) { std::cerr << "Jacobian components differ from expected values "; std::cerr << std::endl << std::endl; @@ -442,7 +442,7 @@ itkScaleVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -484,7 +484,7 @@ itkScaleVersor3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(rscale[j] - scale[j]) > tolerance) + if (itk::Math::Absolute(rscale[j] - scale[j]) > tolerance) { std::cerr << "Error in Set/Get Scale() " << std::endl; std::cerr << "Input scale: " << scale << std::endl; @@ -514,7 +514,7 @@ itkScaleVersor3DTransformTest(int, char *[]) ParametersType parameters2 = transform->GetParameters(); for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Transform/test/itkSimilarity2DTransformTest.cxx b/Modules/Core/Transform/test/itkSimilarity2DTransformTest.cxx index 1a4adfbf347..ec0b2a4522b 100644 --- a/Modules/Core/Transform/test/itkSimilarity2DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkSimilarity2DTransformTest.cxx @@ -30,7 +30,7 @@ CheckEqual(const itk::Point & p1, const itk::Point & p2) for (unsigned int i = 0; i < 2; ++i) { - if (itk::Math::abs(p1[i] - p2[i]) > epsilon) + if (itk::Math::Absolute(p1[i] - p2[i]) > epsilon) { std::cout << p1 << " != " << p2 << ":[ FAILED ]" << std::endl; return false; @@ -67,7 +67,7 @@ itkSimilarity2DTransformTest(int, char *[]) r = transform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(p[i] - r[i]) > epsilon) + if (itk::Math::Absolute(p[i] - r[i]) > epsilon) { Ok = false; break; @@ -91,7 +91,7 @@ itkSimilarity2DTransformTest(int, char *[]) transform2->SetMatrix(transform1->GetMatrix()); std::cout << "Testing SetAngle(" << angle1 << ")/GetAngle():"; constexpr double epsilon2{ 1e-5 }; - if (itk::Math::abs(transform2->GetAngle() - angle1) > epsilon2) + if (itk::Math::Absolute(transform2->GetAngle() - angle1) > epsilon2) { std::cerr << "Error with SetAngle/GetAngle:" << std::endl; std::cerr << "transform1->SetAngle: " << angle1 << std::endl; @@ -106,7 +106,7 @@ itkSimilarity2DTransformTest(int, char *[]) transform1->SetAngle(-angle1); transform2->SetMatrix(transform1->GetMatrix()); std::cout << "Testing SetAngle(" << -angle1 << ")/GetAngle():"; - if (itk::Math::abs(transform2->GetAngle() - (-angle1)) > epsilon2) + if (itk::Math::Absolute(transform2->GetAngle() - (-angle1)) > epsilon2) { std::cerr << "Error with SetAngle/GetAngle:" << std::endl; std::cerr << "transform1->SetAngle: " << -angle1 << std::endl; @@ -134,7 +134,7 @@ itkSimilarity2DTransformTest(int, char *[]) std::cout << "Output Parameters = " << outputParams << std::endl; for (unsigned int i = 0; i < 4; ++i) // do not test for the offset { - if (itk::Math::abs(outputParams[i] - params[i]) > epsilon) + if (itk::Math::Absolute(outputParams[i] - params[i]) > epsilon) { Ok = false; break; @@ -169,7 +169,7 @@ itkSimilarity2DTransformTest(int, char *[]) r = transform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -200,7 +200,7 @@ itkSimilarity2DTransformTest(int, char *[]) r = transform->TransformPoint(p); for (unsigned int i = 0; i < N; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -399,7 +399,7 @@ itkSimilarity2DTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-4) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-4) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; @@ -557,7 +557,7 @@ itkSimilarity2DTransformTest(int, char *[]) const double approxDerivative = (plusPoint[j] - minusPoint[j]) / (2.0 * delta); const double computedDerivative = jacobian[j][k]; approxJacobian[j][k] = approxDerivative; - if (itk::Math::abs(approxDerivative - computedDerivative) > 1e-4) + if (itk::Math::Absolute(approxDerivative - computedDerivative) > 1e-4) { std::cerr << "Error computing Jacobian [" << j << "][" << k << ']' << std::endl; std::cerr << "Result should be: " << approxDerivative << std::endl; @@ -617,9 +617,9 @@ itkSimilarity2DTransformTest(int, char *[]) std::cout << "Test Set/GetMatrix() and Set/GetOffset(): "; for (unsigned int j = 0; j < t1->GetNumberOfParameters(); ++j) { - if (itk::Math::abs(parameters[j] - pdash[j]) > epsilon) + if (itk::Math::Absolute(parameters[j] - pdash[j]) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in parameters at index [" << j << "]" << std::endl; std::cerr << "Expected value " << parameters << std::endl; diff --git a/Modules/Core/Transform/test/itkSimilarity3DTransformTest.cxx b/Modules/Core/Transform/test/itkSimilarity3DTransformTest.cxx index 4b7e680141e..15c08ba2c7d 100644 --- a/Modules/Core/Transform/test/itkSimilarity3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkSimilarity3DTransformTest.cxx @@ -60,7 +60,7 @@ itkSimilarity3DTransformTest(int, char *[]) std::cout << "Test default constructor... "; auto transform = TransformType::New(); - if (itk::Math::abs(transform->GetScale() - 1.0) > itk::NumericTraits::min()) + if (itk::Math::Absolute(transform->GetScale() - 1.0) > itk::NumericTraits::min()) { std::cout << "Error: Scale: Expected 1.0, got " << transform->GetScale() << " ! " << std::endl; return EXIT_FAILURE; @@ -68,7 +68,7 @@ itkSimilarity3DTransformTest(int, char *[]) // SetIdentity supposed to reset scale as well. transform->SetScale(2.0); transform->SetIdentity(); - if (itk::Math::abs(transform->GetScale() - 1.0) > itk::NumericTraits::min()) + if (itk::Math::Absolute(transform->GetScale() - 1.0) > itk::NumericTraits::min()) { std::cout << "Error: Scale: Expected 1.0 after SetIdentity, got " << transform->GetScale() << " ! " << std::endl; return EXIT_FAILURE; @@ -121,7 +121,7 @@ itkSimilarity3DTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -148,7 +148,7 @@ itkSimilarity3DTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -176,7 +176,7 @@ itkSimilarity3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -203,7 +203,7 @@ itkSimilarity3DTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -234,7 +234,7 @@ itkSimilarity3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -274,7 +274,7 @@ itkSimilarity3DTransformTest(int, char *[]) transformedPoint = transform->TransformPoint(center); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(center[i] - transformedPoint[i]) > epsilon) + if (itk::Math::Absolute(center[i] - transformedPoint[i]) > epsilon) { Ok = false; break; @@ -311,7 +311,7 @@ itkSimilarity3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cout << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -363,7 +363,7 @@ itkSimilarity3DTransformTest(int, char *[]) { for (unsigned int jj = 0; jj < 7; ++jj) { - if (itk::Math::abs(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) + if (itk::Math::Absolute(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) { std::cout << "Jacobian components differ from expected values "; std::cout << std::endl << std::endl; @@ -416,7 +416,7 @@ itkSimilarity3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cout << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -457,7 +457,7 @@ itkSimilarity3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; - if (itk::Math::abs(rscale - scale) > tolerance) + if (itk::Math::Absolute(rscale - scale) > tolerance) { std::cout << "Error in Set/Get Scale() " << std::endl; return EXIT_FAILURE; @@ -481,7 +481,7 @@ itkSimilarity3DTransformTest(int, char *[]) ParametersType parameters2 = transform->GetParameters(); for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cout << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -589,7 +589,7 @@ itkSimilarity3DTransformTest(int, char *[]) ParametersType p = t2->GetParameters(); for (unsigned int k = 0; k < e.GetSize(); ++k) { - if (itk::Math::abs(e[k] - p[k]) > epsilon) + if (itk::Math::Absolute(e[k] - p[k]) > epsilon) { std::cout << " [ FAILED ] " << std::endl; std::cout << "Expected parameters: " << e << std::endl; diff --git a/Modules/Core/Transform/test/itkSplineKernelTransformTest.cxx b/Modules/Core/Transform/test/itkSplineKernelTransformTest.cxx index dd58c374949..29f38f12789 100644 --- a/Modules/Core/Transform/test/itkSplineKernelTransformTest.cxx +++ b/Modules/Core/Transform/test/itkSplineKernelTransformTest.cxx @@ -459,7 +459,7 @@ itkSplineKernelTransformTest(int, char *[]) constexpr double tolerance{ 1e-7 }; for (unsigned int pr = 0; pr < numberOfParameters; ++pr) { - if (itk::Math::abs(parameters1[pr] - parameters2[pr]) > tolerance) + if (itk::Math::Absolute(parameters1[pr] - parameters2[pr]) > tolerance) { std::cout << "Parameters were not correctly recovered " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Core/Transform/test/itkTransformCloneTest.cxx b/Modules/Core/Transform/test/itkTransformCloneTest.cxx index 17448a69a01..ee60b265496 100644 --- a/Modules/Core/Transform/test/itkTransformCloneTest.cxx +++ b/Modules/Core/Transform/test/itkTransformCloneTest.cxx @@ -29,7 +29,7 @@ testMatrix(const TMatrix & m1, const TMatrix & m2) { for (unsigned int j = 0; j < TMatrix::ColumnDimensions; ++j) { - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { pass = false; } @@ -46,7 +46,7 @@ testVector(const TVector & v1, const TVector & v2) for (unsigned int i = 0; i < TVector::Dimension; ++i) { - if (itk::Math::abs(v1[i] - v2[i]) > epsilon) + if (itk::Math::Absolute(v1[i] - v2[i]) > epsilon) { pass = false; } diff --git a/Modules/Core/Transform/test/itkVersorRigid3DTransformTest.cxx b/Modules/Core/Transform/test/itkVersorRigid3DTransformTest.cxx index 2739e227af9..7fd51dca1d7 100644 --- a/Modules/Core/Transform/test/itkVersorRigid3DTransformTest.cxx +++ b/Modules/Core/Transform/test/itkVersorRigid3DTransformTest.cxx @@ -113,7 +113,7 @@ itkVersorRigid3DTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -140,7 +140,7 @@ itkVersorRigid3DTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -168,7 +168,7 @@ itkVersorRigid3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -196,7 +196,7 @@ itkVersorRigid3DTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -227,7 +227,7 @@ itkVersorRigid3DTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -268,7 +268,7 @@ itkVersorRigid3DTransformTest(int, char *[]) transformedPoint = transform->TransformPoint(center); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(center[i] - transformedPoint[i]) > epsilon) + if (itk::Math::Absolute(center[i] - transformedPoint[i]) > epsilon) { Ok = false; break; @@ -304,7 +304,7 @@ itkVersorRigid3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -352,7 +352,7 @@ itkVersorRigid3DTransformTest(int, char *[]) { for (unsigned int jj = 0; jj < 6; ++jj) { - if (itk::Math::abs(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) + if (itk::Math::Absolute(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) { std::cerr << "Jacobian components differ from expected values "; std::cerr << std::endl << std::endl; @@ -404,7 +404,7 @@ itkVersorRigid3DTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -499,7 +499,7 @@ itkVersorRigid3DTransformTest(int, char *[]) ParametersType p = t2->GetParameters(); for (unsigned int k = 0; k < e.GetSize(); ++k) { - if (itk::Math::abs(e[k] - p[k]) > epsilon) + if (itk::Math::Absolute(e[k] - p[k]) > epsilon) { std::cout << " [ FAILED ] " << std::endl; std::cout << "Expected parameters: " << e << std::endl; diff --git a/Modules/Core/Transform/test/itkVersorTransformTest.cxx b/Modules/Core/Transform/test/itkVersorTransformTest.cxx index 96d2f705e2f..8d6164bb40a 100644 --- a/Modules/Core/Transform/test/itkVersorTransformTest.cxx +++ b/Modules/Core/Transform/test/itkVersorTransformTest.cxx @@ -110,7 +110,7 @@ itkVersorTransformTest(int, char *[]) std::cout << offset << std::endl; for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(offset[i] - 0.0) > epsilon) + if (itk::Math::Absolute(offset[i] - 0.0) > epsilon) { Ok = false; break; @@ -137,7 +137,7 @@ itkVersorTransformTest(int, char *[]) r = rotation->TransformPoint(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -165,7 +165,7 @@ itkVersorTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -193,7 +193,7 @@ itkVersorTransformTest(int, char *[]) r = rotation->TransformCovariantVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -224,7 +224,7 @@ itkVersorTransformTest(int, char *[]) r = rotation->TransformVector(p); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(q[i] - r[i]) > epsilon) + if (itk::Math::Absolute(q[i] - r[i]) > epsilon) { Ok = false; break; @@ -265,7 +265,7 @@ itkVersorTransformTest(int, char *[]) transformedPoint = transform->TransformPoint(center); for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(center[i] - transformedPoint[i]) > epsilon) + if (itk::Math::Absolute(center[i] - transformedPoint[i]) > epsilon) { Ok = false; break; @@ -298,7 +298,7 @@ itkVersorTransformTest(int, char *[]) constexpr double tolerance{ 1e-8 }; for (unsigned int p = 0; p < np; ++p) { - if (itk::Math::abs(parameters[p] - parameters2[p]) > tolerance) + if (itk::Math::Absolute(parameters[p] - parameters2[p]) > tolerance) { std::cerr << "Output parameter does not match input " << std::endl; return EXIT_FAILURE; @@ -334,7 +334,7 @@ itkVersorTransformTest(int, char *[]) { for (unsigned int jj = 0; jj < 3; ++jj) { - if (itk::Math::abs(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) + if (itk::Math::Absolute(TheoreticalJacobian[ii][jj] - jacobian[ii][jj]) > 1e-5) { std::cerr << "Jacobian components differ from expected values "; std::cerr << std::endl << std::endl; @@ -442,7 +442,7 @@ itkVersorTransformTest(int, char *[]) ParametersType p = t2->GetParameters(); for (unsigned int k = 0; k < e.GetSize(); ++k) { - if (itk::Math::abs(e[k] - p[k]) > epsilon) + if (itk::Math::Absolute(e[k] - p[k]) > epsilon) { std::cout << " [ FAILED ] " << std::endl; std::cout << "Expected parameters: " << e << std::endl; @@ -471,7 +471,7 @@ itkVersorTransformTest(int, char *[]) TransformType::OffsetType offset = t->GetOffset(); for (unsigned int k = 0; k < 3; ++k) { - if (itk::Math::abs(expectedOffset[k] - offset[k]) > epsilon) + if (itk::Math::Absolute(expectedOffset[k] - offset[k]) > epsilon) { std::cerr << " [ FAILED ] " << std::endl; std::cerr << "Expected offset: " << expectedOffset << std::endl; diff --git a/Modules/Filtering/AnisotropicSmoothing/test/itkMinMaxCurvatureFlowImageFilterTest.cxx b/Modules/Filtering/AnisotropicSmoothing/test/itkMinMaxCurvatureFlowImageFilterTest.cxx index e334692d503..657d9221032 100644 --- a/Modules/Filtering/AnisotropicSmoothing/test/itkMinMaxCurvatureFlowImageFilterTest.cxx +++ b/Modules/Filtering/AnisotropicSmoothing/test/itkMinMaxCurvatureFlowImageFilterTest.cxx @@ -237,7 +237,7 @@ testMinMaxCurvatureFlow(itk::Size & size, // ND image s IteratorType outIter(swapPointer, swapPointer->GetBufferedRegion()); - const PixelType tolerance = itk::Math::abs(foreground - background) * 0.1; + const PixelType tolerance = itk::Math::Absolute(foreground - background) * 0.1; unsigned long numPixelsWrong = 0; @@ -253,12 +253,12 @@ testMinMaxCurvatureFlow(itk::Size & size, // ND image s } if (lhs < sqrRadius) { - if (itk::Math::abs(foreground - value) > tolerance) + if (itk::Math::Absolute(foreground - value) > tolerance) { numPixelsWrong++; } } - else if (itk::Math::abs(background - value) > tolerance) + else if (itk::Math::Absolute(background - value) > tolerance) { numPixelsWrong++; } diff --git a/Modules/Filtering/BiasCorrection/include/itkMRASlabIdentifier.hxx b/Modules/Filtering/BiasCorrection/include/itkMRASlabIdentifier.hxx index 410a24d6b21..d5e0019b9af 100644 --- a/Modules/Filtering/BiasCorrection/include/itkMRASlabIdentifier.hxx +++ b/Modules/Filtering/BiasCorrection/include/itkMRASlabIdentifier.hxx @@ -138,7 +138,7 @@ MRASlabIdentifier::GenerateSlabRegions() { double avgMinValue = *am_iter; const double sign = avgMinValue - average; - if ((sign * prevSign < 0) && (itk::Math::abs(sign) > m_Tolerance)) + if ((sign * prevSign < 0) && (itk::Math::Absolute(sign) > m_Tolerance)) { slabIndex[m_SlicingDirection] = slabBegin; slabSize[m_SlicingDirection] = slabLength; diff --git a/Modules/Filtering/BiasCorrection/test/itkCompositeValleyFunctionTest.cxx b/Modules/Filtering/BiasCorrection/test/itkCompositeValleyFunctionTest.cxx index 1fb25d85f1b..683b9a6b7ef 100644 --- a/Modules/Filtering/BiasCorrection/test/itkCompositeValleyFunctionTest.cxx +++ b/Modules/Filtering/BiasCorrection/test/itkCompositeValleyFunctionTest.cxx @@ -56,7 +56,7 @@ itkCompositeValleyFunctionTest(int, char *[]) const double interval1 = function.GetInterval(); const double interval2 = (function.GetUpperBound() - function.GetLowerBound()) / (1000000.0 - 1.0); - if (itk::Math::abs(interval1 - interval2) > itk::NumericTraits::epsilon()) + if (itk::Math::Absolute(interval1 - interval2) > itk::NumericTraits::epsilon()) { std::cout << "Test fails: GetInterval()" << std::endl; std::cout << "Interval from the GetInterval() = " << interval1 << std::endl; @@ -69,9 +69,9 @@ itkCompositeValleyFunctionTest(int, char *[]) const double value1 = function(measure); const double value2 = function.Evaluate(measure); - if (itk::Math::abs(value1 - value2) > itk::NumericTraits::epsilon()) + if (itk::Math::Absolute(value1 - value2) > itk::NumericTraits::epsilon()) { - std::cout << "diff = " << itk::Math::abs(value1 - value2) << std::endl; + std::cout << "diff = " << itk::Math::Absolute(value1 - value2) << std::endl; std::cout << "Test fails: operator()" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/BiasCorrection/test/itkMRIBiasFieldCorrectionFilterTest.cxx b/Modules/Filtering/BiasCorrection/test/itkMRIBiasFieldCorrectionFilterTest.cxx index c77b0a4e881..255ca757018 100644 --- a/Modules/Filtering/BiasCorrection/test/itkMRIBiasFieldCorrectionFilterTest.cxx +++ b/Modules/Filtering/BiasCorrection/test/itkMRIBiasFieldCorrectionFilterTest.cxx @@ -166,7 +166,7 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[]) ib_iter.GoToBegin(); while (!i_iter.IsAtEnd()) { - sumOfError += itk::Math::abs(ib_iter.Get() - i_iter.Get()); + sumOfError += itk::Math::Absolute(ib_iter.Get() - i_iter.Get()); ++i_iter; ++ib_iter; } @@ -240,7 +240,7 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[]) i_iter.GoToBegin(); while (!i_iter.IsAtEnd()) { - sumOfError += itk::Math::abs(o_iter.Get() - i_iter.Get()); + sumOfError += itk::Math::Absolute(o_iter.Get() - i_iter.Get()); ++i_iter; ++o_iter; } @@ -307,7 +307,7 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[]) i_iter.GoToBegin(); while (!i_iter.IsAtEnd()) { - sumOfError += itk::Math::abs(o2_iter.Get() - i_iter.Get()); + sumOfError += itk::Math::Absolute(o2_iter.Get() - i_iter.Get()); ++i_iter; ++o2_iter; } @@ -369,7 +369,7 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[]) i_iter.GoToBegin(); while (!i_iter.IsAtEnd()) { - sumOfError += itk::Math::abs(o3_iter.Get() - i_iter.Get()); + sumOfError += itk::Math::Absolute(o3_iter.Get() - i_iter.Get()); ++i_iter; ++o3_iter; } @@ -423,7 +423,7 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[]) i_iter.GoToBegin(); while (!i_iter.IsAtEnd()) { - sumOfError += itk::Math::abs(o4_iter.Get() - i_iter.Get()); + sumOfError += itk::Math::Absolute(o4_iter.Get() - i_iter.Get()); ++i_iter; ++o4_iter; } @@ -463,7 +463,7 @@ itkMRIBiasFieldCorrectionFilterTest(int, char *[]) i_iter.GoToBegin(); while (!i_iter.IsAtEnd()) { - sumOfErrorFinal += itk::Math::abs(o5_iter.Get() - i_iter.Get()); + sumOfErrorFinal += itk::Math::Absolute(o5_iter.Get() - i_iter.Get()); ++i_iter; ++o5_iter; } diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx index a2932be8f77..15ad64695c3 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx @@ -175,10 +175,10 @@ BinaryThinningImageFilter::ComputeThinImage() // First find the total number of transitions, and then // divide by 2. const PixelType transitions = - (itk::Math::abs(static_cast(p3 - p2)) + itk::Math::abs(static_cast(p4 - p3)) + - itk::Math::abs(static_cast(p5 - p4)) + itk::Math::abs(static_cast(p6 - p5)) + - itk::Math::abs(static_cast(p7 - p6)) + itk::Math::abs(static_cast(p8 - p7)) + - itk::Math::abs(static_cast(p9 - p8)) + itk::Math::abs(static_cast(p2 - p9))) / + (itk::Math::Absolute(static_cast(p3 - p2)) + itk::Math::Absolute(static_cast(p4 - p3)) + + itk::Math::Absolute(static_cast(p5 - p4)) + itk::Math::Absolute(static_cast(p6 - p5)) + + itk::Math::Absolute(static_cast(p7 - p6)) + itk::Math::Absolute(static_cast(p8 - p7)) + + itk::Math::Absolute(static_cast(p9 - p8)) + itk::Math::Absolute(static_cast(p2 - p9))) / 2; if (transitions == 1) diff --git a/Modules/Filtering/Colormap/include/itkHSVColormapFunction.hxx b/Modules/Filtering/Colormap/include/itkHSVColormapFunction.hxx index 0e1f7da736f..80f9b22c7bb 100644 --- a/Modules/Filtering/Colormap/include/itkHSVColormapFunction.hxx +++ b/Modules/Filtering/Colormap/include/itkHSVColormapFunction.hxx @@ -29,13 +29,13 @@ HSVColormapFunction::operator()(const TScalar & v) const -> // Apply the color mapping. // Apply the color mapping. - RealType red = itk::Math::abs(5.0 * (value - 0.5)) - 5.0 / 6.0; + RealType red = itk::Math::Absolute(5.0 * (value - 0.5)) - 5.0 / 6.0; red = std::clamp(red, 0.0, 1.0); - RealType green = -itk::Math::abs(5.0 * (value - 11.0 / 30.0)) + 11.0 / 6.0; + RealType green = -itk::Math::Absolute(5.0 * (value - 11.0 / 30.0)) + 11.0 / 6.0; green = std::clamp(green, 0.0, 1.0); - RealType blue = -itk::Math::abs(5.0 * (value - 19.0 / 30.0)) + 11.0 / 6.0; + RealType blue = -itk::Math::Absolute(5.0 * (value - 19.0 / 30.0)) + 11.0 / 6.0; blue = std::clamp(blue, 0.0, 1.0); // Set the rgb components after rescaling the values. diff --git a/Modules/Filtering/Colormap/include/itkJetColormapFunction.hxx b/Modules/Filtering/Colormap/include/itkJetColormapFunction.hxx index 473bd0d028a..ce7411b72d3 100644 --- a/Modules/Filtering/Colormap/include/itkJetColormapFunction.hxx +++ b/Modules/Filtering/Colormap/include/itkJetColormapFunction.hxx @@ -28,13 +28,13 @@ JetColormapFunction::operator()(const TScalar & v) const -> const RealType value = this->RescaleInputValue(v); // Apply the color mapping. - RealType red = -itk::Math::abs(3.95 * (value - 0.7460)) + 1.5; + RealType red = -itk::Math::Absolute(3.95 * (value - 0.7460)) + 1.5; red = std::clamp(red, 0.0, 1.0); - RealType green = -itk::Math::abs(3.95 * (value - 0.492)) + 1.5; + RealType green = -itk::Math::Absolute(3.95 * (value - 0.492)) + 1.5; green = std::clamp(green, 0.0, 1.0); - RealType blue = -itk::Math::abs(3.95 * (value - 0.2385)) + 1.5; + RealType blue = -itk::Math::Absolute(3.95 * (value - 0.2385)) + 1.5; blue = std::clamp(blue, 0.0, 1.0); // Set the rgb components after rescaling the values. diff --git a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx index 335cf09f852..cd2d724eec8 100644 --- a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx +++ b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx @@ -180,7 +180,7 @@ MinMaxCurvatureFlowFunction::ComputeThreshold(const DispatchBase &, cons dotProduct /= gradMagnitude * vectorMagnitude; } - if (vectorMagnitude >= m_StencilRadius && itk::Math::abs(dotProduct) < 0.262) + if (vectorMagnitude >= m_StencilRadius && itk::Math::Absolute(dotProduct) < 0.262) { threshold += it.GetPixel(i); ++numPixels; diff --git a/Modules/Filtering/CurvatureFlow/test/itkBinaryMinMaxCurvatureFlowImageFilterTest.cxx b/Modules/Filtering/CurvatureFlow/test/itkBinaryMinMaxCurvatureFlowImageFilterTest.cxx index 5590cc06329..9b08ac2f308 100644 --- a/Modules/Filtering/CurvatureFlow/test/itkBinaryMinMaxCurvatureFlowImageFilterTest.cxx +++ b/Modules/Filtering/CurvatureFlow/test/itkBinaryMinMaxCurvatureFlowImageFilterTest.cxx @@ -204,7 +204,7 @@ testBinaryMinMaxCurvatureFlow(itk::Size & size, // ND image siz * pixels is less than the original noise fraction. */ std::cout << "Checking the output..." << std::endl; - const PixelType tolerance = itk::Math::abs(foreground - background) * 0.1; + const PixelType tolerance = itk::Math::Absolute(foreground - background) * 0.1; unsigned long numPixelsWrong = 0; for (IteratorType outIter(swapPointer, swapPointer->GetBufferedRegion()); !outIter.IsAtEnd(); ++outIter) @@ -219,12 +219,12 @@ testBinaryMinMaxCurvatureFlow(itk::Size & size, // ND image siz } if (lhs < sqrRadius) { - if (itk::Math::abs(foreground - value) > tolerance) + if (itk::Math::Absolute(foreground - value) > tolerance) { numPixelsWrong++; } } - else if (itk::Math::abs(background - value) > tolerance) + else if (itk::Math::Absolute(background - value) > tolerance) { numPixelsWrong++; } diff --git a/Modules/Filtering/Deconvolution/include/itkInverseDeconvolutionImageFilter.h b/Modules/Filtering/Deconvolution/include/itkInverseDeconvolutionImageFilter.h index dbfac8c09ae..b084b669707 100644 --- a/Modules/Filtering/Deconvolution/include/itkInverseDeconvolutionImageFilter.h +++ b/Modules/Filtering/Deconvolution/include/itkInverseDeconvolutionImageFilter.h @@ -142,7 +142,7 @@ class ITK_TEMPLATE_EXPORT InverseDeconvolutionFunctor inline TOutput operator()(const TInput1 & I, const TInput2 & H) const { - const double absH = itk::Math::abs(H); + const double absH = itk::Math::Absolute(H); TOutput value{}; if (absH >= m_KernelZeroMagnitudeThreshold) { diff --git a/Modules/Filtering/Deconvolution/include/itkWienerDeconvolutionImageFilter.h b/Modules/Filtering/Deconvolution/include/itkWienerDeconvolutionImageFilter.h index 16cb05080b8..0c992790222 100644 --- a/Modules/Filtering/Deconvolution/include/itkWienerDeconvolutionImageFilter.h +++ b/Modules/Filtering/Deconvolution/include/itkWienerDeconvolutionImageFilter.h @@ -172,7 +172,7 @@ class ITK_TEMPLATE_EXPORT WienerDeconvolutionFunctor TPixel denominator = std::norm(H) + (Pn / (Pf - Pn)); TPixel value{}; - if (itk::Math::abs(denominator) >= m_KernelZeroMagnitudeThreshold) + if (itk::Math::Absolute(denominator) >= m_KernelZeroMagnitudeThreshold) { value = I * (std::conj(H) / denominator); } diff --git a/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx b/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx index 150632e1a82..f5721fe1164 100644 --- a/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx +++ b/Modules/Filtering/Deconvolution/test/itkParametricBlindLeastSquaresDeconvolutionImageFilterTest.cxx @@ -213,7 +213,7 @@ itkParametricBlindLeastSquaresDeconvolutionImageFilterTest(int argc, char * argv } constexpr KernelSourceType::ParametersValueType expectedSigmaX{ 2.90243 }; - if (itk::Math::abs(kernelSource->GetParameters()[0] - expectedSigmaX) > 1e-5) + if (itk::Math::Absolute(kernelSource->GetParameters()[0] - expectedSigmaX) > 1e-5) { std::cerr << "Kernel parameter[0] should have been " << expectedSigmaX << ", was " << kernelSource->GetParameters()[0] << '.' << std::endl; @@ -221,7 +221,7 @@ itkParametricBlindLeastSquaresDeconvolutionImageFilterTest(int argc, char * argv } constexpr KernelSourceType::ParametersValueType expectedSigmaY{ 2.90597 }; - if (itk::Math::abs(kernelSource->GetParameters()[1] - expectedSigmaY) > 1e-5) + if (itk::Math::Absolute(kernelSource->GetParameters()[1] - expectedSigmaY) > 1e-5) { std::cerr << "Kernel parameter[1] should have been " << expectedSigmaY << ", was " << kernelSource->GetParameters()[0] << '.' << std::endl; diff --git a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx index 6149e1d55e1..bc4f0aeb7e4 100644 --- a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx +++ b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx @@ -878,11 +878,11 @@ PatchBasedDenoisingImageFilter::Compute3x3EigenAnalys const double acos_arg = (s / n) * 1 / sqrtn; // When floating point exceptions are enabled, std::acos generates - // NaNs (domain errors) if itk::Math::abs(acos_arg) > 1.0 + // NaNs (domain errors) if itk::Math::Absolute(acos_arg) > 1.0 // We treat those out of domain arguments as 1.0 (the max allowed value // of the std::acos domain), in such case phi = acos(1.0) = acos(-1.0) = 0.0 // Compute phi = (acos((s/n) * sqrt(1/n)) / 3) - const RealTensorValueT phi = (itk::Math::abs(acos_arg) <= 1.0) ? std::acos(acos_arg) / 3 : 0.0; + const RealTensorValueT phi = (itk::Math::Absolute(acos_arg) <= 1.0) ? std::acos(acos_arg) / 3 : 0.0; // Now compute the eigenvalues // lambda1 = I1/3 + 2*sqrt(n)*cos(phi) @@ -1425,7 +1425,7 @@ PatchBasedDenoisingImageFilter::ComputeKernelBandwidt { if (!m_SigmaConverged[ic]) { - if (itk::Math::abs(sigmaUpdate[ic]) < m_KernelBandwidthSigma[ic] * m_SigmaUpdateConvergenceTolerance) + if (itk::Math::Absolute(sigmaUpdate[ic]) < m_KernelBandwidthSigma[ic] * m_SigmaUpdateConvergenceTolerance) { m_SigmaConverged[ic] = 1; } @@ -1826,7 +1826,7 @@ PatchBasedDenoisingImageFilter::ResolveSigmaUpdate() // If second derivative is zero or negative, compute update using gradient // descent - if ((Math::ExactlyEquals(itk::Math::abs(secondDerivative), RealValueType{})) || (secondDerivative < 0)) + if ((Math::ExactlyEquals(itk::Math::Absolute(secondDerivative), RealValueType{})) || (secondDerivative < 0)) { itkDebugMacro("** Second derivative NOT POSITIVE"); sigmaUpdate[ic] = -itk::Math::sgn(firstDerivative) * kernelSigma * 0.3; @@ -1840,7 +1840,7 @@ PatchBasedDenoisingImageFilter::ResolveSigmaUpdate() itkDebugMacro("update: " << sigmaUpdate[ic]); // Avoid very large updates to prevent instabilities in Newton-Raphson - if (itk::Math::abs(sigmaUpdate[ic]) > kernelSigma * 0.3) + if (itk::Math::Absolute(sigmaUpdate[ic]) > kernelSigma * 0.3) { itkDebugMacro("** Restricting large updates \n"); sigmaUpdate[ic] = itk::Math::sgn(sigmaUpdate[ic]) * kernelSigma * 0.3; diff --git a/Modules/Filtering/Denoising/test/itkPatchBasedDenoisingImageFilterTest.cxx b/Modules/Filtering/Denoising/test/itkPatchBasedDenoisingImageFilterTest.cxx index ab6a7342566..d225f0b7fda 100644 --- a/Modules/Filtering/Denoising/test/itkPatchBasedDenoisingImageFilterTest.cxx +++ b/Modules/Filtering/Denoising/test/itkPatchBasedDenoisingImageFilterTest.cxx @@ -266,7 +266,7 @@ doDenoising(const std::string & inputFileName, const double tolerance = 1e-2 * expectedValue; if (!itk::Math::FloatAlmostEqual(expectedValue, resultValue, 10, tolerance)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cout << "Error in GetKernelBandwidthSigma() " << "at index: [" << i << ']' << std::endl; std::cout << "Expected value: " << expectedValue << ", but got: " << resultValue << std::endl; diff --git a/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DReconstructionImageFilterTest.cxx b/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DReconstructionImageFilterTest.cxx index 96e314b1dc8..9356b3b4bf7 100644 --- a/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DReconstructionImageFilterTest.cxx +++ b/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DReconstructionImageFilterTest.cxx @@ -124,7 +124,7 @@ itkDiffusionTensor3DReconstructionImageFilterTest(int argc, char * argv[]) const TensorReconstructionImageFilterType::GradientDirectionType::element_type outputComponent = output[j]; if (!itk::Math::FloatAlmostEqual(gradientDirectionComponent, outputComponent, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in gradientDirection [" << i << ']' << '[' << j << ']' << std::endl; std::cerr << "Expected value " << gradientDirectionComponent << std::endl; @@ -204,7 +204,7 @@ itkDiffusionTensor3DReconstructionImageFilterTest(int argc, char * argv[]) for (unsigned int j = 0; j < 3; ++j) { std::cout << tensorImage->GetPixel(tensorImageIndex)(i, j) << ' '; - if ((itk::Math::abs(tensorImage->GetPixel(tensorImageIndex)(i, j) - expectedResult[i][j])) > precision) + if ((itk::Math::Absolute(tensorImage->GetPixel(tensorImageIndex)(i, j) - expectedResult[i][j])) > precision) { passed = false; } diff --git a/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx b/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx index 451c94784f7..b5f9a4feeaf 100644 --- a/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx +++ b/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx @@ -228,7 +228,7 @@ itkDiffusionTensor3DTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(expectedValues[i] - eigenValues[i]) > tolerance) + if (itk::Math::Absolute(expectedValues[i] - eigenValues[i]) > tolerance) { std::cerr << "Eigenvalue computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -268,7 +268,7 @@ itkDiffusionTensor3DTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(expectedValues[i] - eigenValues[i]) > tolerance) + if (itk::Math::Absolute(expectedValues[i] - eigenValues[i]) > tolerance) { std::cerr << "Eigenvalue computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -308,7 +308,7 @@ itkDiffusionTensor3DTest(int, char *[]) for (unsigned int i = 0; i < 3; ++i) { - if (itk::Math::abs(expectedValues[i] - eigenValues[i]) > tolerance) + if (itk::Math::Absolute(expectedValues[i] - eigenValues[i]) > tolerance) { std::cerr << "Eigenvalue computation failed" << std::endl; std::cerr << "expectedValues = " << expectedValues << std::endl; @@ -347,7 +347,7 @@ itkDiffusionTensor3DTest(int, char *[]) constexpr double tolerance{ 1e-4 }; const AccumulateValueType computedTrace = tensor3.GetTrace(); - if (itk::Math::abs(computedTrace - expectedTrace) > tolerance) + if (itk::Math::Absolute(computedTrace - expectedTrace) > tolerance) { std::cerr << "Error computing the Trace" << std::endl; std::cerr << "Expected trace = " << expectedTrace << std::endl; @@ -359,7 +359,7 @@ itkDiffusionTensor3DTest(int, char *[]) constexpr RealValueType expectedInternalScalarProduct{ 1829 }; const RealValueType computedInternalScalarProduct = tensor3.GetInnerScalarProduct(); - if (itk::Math::abs(computedInternalScalarProduct - expectedInternalScalarProduct) > tolerance) + if (itk::Math::Absolute(computedInternalScalarProduct - expectedInternalScalarProduct) > tolerance) { std::cerr << "Error computing Internal Scalar Product" << std::endl; std::cerr << "Expected = " << expectedInternalScalarProduct << std::endl; @@ -372,7 +372,7 @@ itkDiffusionTensor3DTest(int, char *[]) constexpr RealValueType expectedFractionalAnisotropy{ 0.349177 }; const RealValueType computedFractionalAnisotropy = tensor3.GetFractionalAnisotropy(); - if (itk::Math::abs(computedFractionalAnisotropy - expectedFractionalAnisotropy) > tolerance) + if (itk::Math::Absolute(computedFractionalAnisotropy - expectedFractionalAnisotropy) > tolerance) { std::cerr << "Error computing Fractional Anisotropy" << std::endl; std::cerr << "Expected = " << expectedFractionalAnisotropy << std::endl; @@ -384,7 +384,7 @@ itkDiffusionTensor3DTest(int, char *[]) constexpr RealValueType expectedRelativeAnisotropy{ 1.9044 }; const RealValueType computedRelativeAnisotropy = tensor3.GetRelativeAnisotropy(); - if (itk::Math::abs(computedRelativeAnisotropy - expectedRelativeAnisotropy) > tolerance) + if (itk::Math::Absolute(computedRelativeAnisotropy - expectedRelativeAnisotropy) > tolerance) { std::cerr << "Error computing Relative Anisotropy" << std::endl; std::cerr << "Expected = " << expectedRelativeAnisotropy << std::endl; diff --git a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldJacobianDeterminantFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldJacobianDeterminantFilterTest.cxx index c80301d1d32..8cb79e08e89 100644 --- a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldJacobianDeterminantFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldJacobianDeterminantFilterTest.cxx @@ -106,9 +106,9 @@ TestDisplacementJacobianDeterminantValue() const float jacobianDeterminant = output->GetPixel(index); // std::cout << "Output " << output->GetPixel(index) << std::endl; constexpr double epsilon{ 1e-13 }; - if (itk::Math::abs(jacobianDeterminant - expectedJacobianDeterminant) > epsilon) + if (itk::Math::Absolute(jacobianDeterminant - expectedJacobianDeterminant) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in pixel value at index [" << index << "]" << std::endl; std::cerr << "Expected value " << jacobianDeterminant << std::endl; diff --git a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx index 18ac02b4eb4..4458e716e88 100644 --- a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldToBSplineImageFilterTest.cxx @@ -162,7 +162,7 @@ itkDisplacementFieldToBSplineImageFilterTest(int, char *[]) VectorType v = bspliner->GetOutput()->GetPixel(index); - if (itk::Math::abs(v.GetNorm() - 1.414214) >= 0.01) + if (itk::Math::Absolute(v.GetNorm() - 1.414214) >= 0.01) { std::cerr << "Failed to find the correct forward displacement vector." << std::endl; return EXIT_FAILURE; @@ -176,7 +176,7 @@ itkDisplacementFieldToBSplineImageFilterTest(int, char *[]) v = bspliner->GetOutput()->GetPixel(index); - if (itk::Math::abs(v.GetNorm() - 1.414214) >= 0.01) + if (itk::Math::Absolute(v.GetNorm() - 1.414214) >= 0.01) { std::cerr << "Failed to find the correct inverse displacement vector." << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx index e6d78e8dc61..b1b4083fc2d 100644 --- a/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkDisplacementFieldTransformTest.cxx @@ -37,7 +37,7 @@ samePoint(const TPoint & p1, const TPoint & p2, double epsilon = 1e-8) { if (!itk::Math::FloatAlmostEqual(p1[i], p2[i], 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in point at index [" << i << "]" << std::endl; std::cerr << "Expected value " @@ -61,7 +61,7 @@ sameVector(const TVector & v1, const TVector & v2, double epsilon = 1e-8) { if (!itk::Math::FloatAlmostEqual(v1[i], v2[i], 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in vector at index [" << i << "]" << std::endl; std::cerr << "Expected value " @@ -92,7 +92,7 @@ sameVariableVector(const TVector & v1, const TVector & v2, double epsilon = 1e-8 { if (!itk::Math::FloatAlmostEqual(v1[i], v2[i], 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in variable vector at index [" << i << "]" << std::endl; std::cerr << "Expected value " @@ -116,7 +116,7 @@ sameTensor(const TTensor & t1, const TTensor & t2, double epsilon = 1e-8) { if (!itk::Math::FloatAlmostEqual(t1[i], t2[i], 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in tensor at index [" << i << "]" << std::endl; std::cerr << "Expected value " @@ -146,7 +146,7 @@ sameArray2D(const TArray2D & a1, const TArray2D_ARG1 & a2, double epsilon = 1e-8 { if (!itk::Math::FloatAlmostEqual(a1(j, i), a2(j, i), 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in array at index [" << j << ", " << i << "]" << std::endl; std::cerr << "Expected value " diff --git a/Modules/Filtering/DisplacementField/test/itkInverseDisplacementFieldImageFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkInverseDisplacementFieldImageFilterTest.cxx index c433d0e8a04..3c5974ef638 100644 --- a/Modules/Filtering/DisplacementField/test/itkInverseDisplacementFieldImageFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkInverseDisplacementFieldImageFilterTest.cxx @@ -126,7 +126,7 @@ itkInverseDisplacementFieldImageFilterTest(int argc, char * argv[]) const DisplacementFieldType::IndexType id2 = filter->GetOutput()->TransformPhysicalPointToIndex(p2); DisplacementFieldType::PixelType fp2 = filter->GetOutput()->GetPixel(id2); - if (itk::Math::abs(fp2[0] + fp1[0]) > 0.001 || itk::Math::abs(fp2[1] + fp1[1]) > 0.001) + if (itk::Math::Absolute(fp2[0] + fp1[0]) > 0.001 || itk::Math::Absolute(fp2[1] + fp1[1]) > 0.001) { std::cerr << "Loop invariant not satisfied for index " << it.GetIndex() << " : f^-1(f(p1) + p1 ) + f(p1) = 0" << std::endl; diff --git a/Modules/Filtering/DisplacementField/test/itkTimeVaryingBSplineVelocityFieldTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkTimeVaryingBSplineVelocityFieldTransformTest.cxx index 11c1c0edc04..b30eea75357 100644 --- a/Modules/Filtering/DisplacementField/test/itkTimeVaryingBSplineVelocityFieldTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkTimeVaryingBSplineVelocityFieldTransformTest.cxx @@ -66,7 +66,7 @@ itkTimeVaryingBSplineVelocityFieldTransformTest(int, char *[]) VectorType displacementPixel = displacementField->GetPixel(index); std::cout << "Estimated forward displacement vector: " << displacementPixel << std::endl; - if (itk::Math::abs(displacementPixel[0] - 0.045) > 0.01) + if (itk::Math::Absolute(displacementPixel[0] - 0.045) > 0.01) { std::cerr << "Failed to produce the correct forward integration." << std::endl; return EXIT_FAILURE; @@ -83,7 +83,7 @@ itkTimeVaryingBSplineVelocityFieldTransformTest(int, char *[]) // due to numerical computations const DisplacementFieldType * inverseField = inverseIntegrator->GetOutput(); displacementPixel = inverseField->GetPixel(index); - if (itk::Math::abs(displacementPixel[0] + 0.1) > 0.01) + if (itk::Math::Absolute(displacementPixel[0] + 0.1) > 0.01) { std::cerr << "Failed to produce the correct inverse integration." << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx b/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx index b0b4be1b27c..77ce2cb21ad 100644 --- a/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldIntegrationImageFilterTest.cxx @@ -130,7 +130,7 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) VectorType displacement = inverseField->GetPixel(index); std::cout << "Estimated inverse displacement vector: " << displacement << std::endl; - if (itk::Math::abs(displacement[0] + 0.101852) > 0.01) + if (itk::Math::Absolute(displacement[0] + 0.101852) > 0.01) { std::cerr << "Failed to produce the correct inverse integration." << std::endl; return EXIT_FAILURE; @@ -144,7 +144,7 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) displacement = displacementField->GetPixel(index); std::cout << "Estimated forward displacement vector: " << displacement << std::endl; - if (itk::Math::abs(displacement[0] - 0.045) > 0.0001) + if (itk::Math::Absolute(displacement[0] - 0.045) > 0.0001) { std::cerr << "Failed to produce the correct forward integration." << std::endl; return EXIT_FAILURE; @@ -239,8 +239,8 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) displacement = displacementField->GetPixel(index); // The analytic result is displacement = ( cos(3) - cos(2), sin(3) - sin(2), 3 - 2 ) std::cout << "Estimated forward displacement vector: " << displacement << std::endl; - if (itk::Math::abs(displacement[0] + 0.5738) > 0.0002 || itk::Math::abs(displacement[1] + 0.7682) > 0.0001 || - itk::Math::abs(displacement[2] - 1.0000) > 0.0001) + if (itk::Math::Absolute(displacement[0] + 0.5738) > 0.0002 || + itk::Math::Absolute(displacement[1] + 0.7682) > 0.0001 || itk::Math::Absolute(displacement[2] - 1.0000) > 0.0001) { std::cerr << "Failed to produce the correct forward integration." << std::endl; return EXIT_FAILURE; @@ -255,8 +255,8 @@ itkTimeVaryingVelocityFieldIntegrationImageFilterTest(int argc, char * argv[]) displacement = inverseField->GetPixel(index); // The analytic result is displacement = ( cos(1) - cos(2), sin(1) - sin(2), 1 - 2 ) std::cout << "Estimated inverse displacement vector: " << displacement << std::endl; - if (itk::Math::abs(displacement[0] - 0.9564) > 0.0001 || itk::Math::abs(displacement[1] + 0.0678) > 0.0003 || - itk::Math::abs(displacement[2] + 1.0000) > 0.0001) + if (itk::Math::Absolute(displacement[0] - 0.9564) > 0.0001 || + itk::Math::Absolute(displacement[1] + 0.0678) > 0.0003 || itk::Math::Absolute(displacement[2] + 1.0000) > 0.0001) { std::cerr << "Failed to produce the correct inverse integration." << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldTransformTest.cxx index 3fe03c933fc..a830b5d37a5 100644 --- a/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkTimeVaryingVelocityFieldTransformTest.cxx @@ -70,7 +70,7 @@ itkTimeVaryingVelocityFieldTransformTest(int, char *[]) VectorType displacementPixel = displacementField->GetPixel(index); std::cout << "Estimated forward displacement vector: " << displacementPixel << std::endl; - if (itk::Math::abs(displacementPixel[0] - 0.045) > 0.0001) + if (itk::Math::Absolute(displacementPixel[0] - 0.045) > 0.0001) { std::cerr << "Failed to produce the correct forward integration." << std::endl; return EXIT_FAILURE; @@ -88,7 +88,7 @@ itkTimeVaryingVelocityFieldTransformTest(int, char *[]) // due to numerical computations const DisplacementFieldType * inverseField = inverseIntegrator->GetOutput(); displacementPixel = inverseField->GetPixel(index); - if (itk::Math::abs(displacementPixel[0] + 0.101852) > 0.01) + if (itk::Math::Absolute(displacementPixel[0] + 0.101852) > 0.01) { std::cerr << "Failed to produce the correct inverse integration." << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.hxx index f11c9312ec0..2ee7d658261 100644 --- a/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkContourDirectedMeanDistanceImageFilter.hxx @@ -220,7 +220,7 @@ ContourDirectedMeanDistanceImageFilter::ThreadedGene if (bIsOnContour) { const RealType value = it2.Get(); - m_MeanDistance[threadId] += itk::Math::abs(value); + m_MeanDistance[threadId] += itk::Math::Absolute(value); m_Count[threadId]++; } } diff --git a/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.hxx index a43745829df..7bd8127be17 100644 --- a/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkFastChamferDistanceImageFilter.hxx @@ -207,7 +207,7 @@ FastChamferDistanceImageFilter::GenerateDataND() if (m_NarrowBand.IsNotNull()) { BandNodeType node; - if (itk::Math::abs(static_cast(center_value)) <= m_NarrowBand->GetTotalRadius()) + if (itk::Math::Absolute(static_cast(center_value)) <= m_NarrowBand->GetTotalRadius()) { node.m_Index = it.GetIndex(); // Check node state. @@ -216,7 +216,7 @@ FastChamferDistanceImageFilter::GenerateDataND() { node.m_NodeState += SIGN_MASK; } - if (itk::Math::abs(static_cast(center_value)) < m_NarrowBand->GetInnerRadius()) + if (itk::Math::Absolute(static_cast(center_value)) < m_NarrowBand->GetInnerRadius()) { node.m_NodeState += INNER_MASK; } diff --git a/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.hxx index 4a7621a8249..ed008f53666 100644 --- a/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkIsoContourDistanceImageFilter.hxx @@ -358,16 +358,18 @@ IsoContourDistanceImageFilter::ComputeValue(const Inp if (norm > NumericTraits::min()) { - const PixelRealType val = itk::Math::abs(grad[n]) * m_Spacing[n] / norm / diff; + const PixelRealType val = itk::Math::Absolute(grad[n]) * m_Spacing[n] / norm / diff; const PixelRealType valNew0 = val0 * val; const PixelRealType valNew1 = val1 * val; const std::lock_guard lockGuard(m_Mutex); - if (itk::Math::abs(static_cast(valNew0)) < itk::Math::abs(static_cast(outNeigIt.GetNext(n, 0)))) + if (itk::Math::Absolute(static_cast(valNew0)) < + itk::Math::Absolute(static_cast(outNeigIt.GetNext(n, 0)))) { outNeigIt.SetNext(n, 0, static_cast(valNew0)); } - if (itk::Math::abs(static_cast(valNew1)) < itk::Math::abs(static_cast(outNeigIt.GetNext(n, 1)))) + if (itk::Math::Absolute(static_cast(valNew1)) < + itk::Math::Absolute(static_cast(outNeigIt.GetNext(n, 1)))) { outNeigIt.SetNext(n, 1, static_cast(valNew1)); } diff --git a/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.hxx index fe58276244b..980e3558d85 100644 --- a/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkSignedMaurerDistanceMapImageFilter.hxx @@ -272,7 +272,7 @@ SignedMaurerDistanceMapImageFilter::ThreadedGenerateD { // cast to a real type is required on some platforms const auto outputValue = - static_cast(std::sqrt(static_cast(itk::Math::abs(Ot.Get())))); + static_cast(std::sqrt(static_cast(itk::Math::Absolute(Ot.Get())))); if (Math::NotExactlyEquals(It.Get(), this->m_BackgroundValue)) { @@ -384,12 +384,12 @@ SignedMaurerDistanceMapImageFilter::Voronoi(unsigned iw = static_cast(i); } - OutputPixelType d1 = itk::Math::abs(g(l)) + (h(l) - iw) * (h(l) - iw); + OutputPixelType d1 = itk::Math::Absolute(g(l)) + (h(l) - iw) * (h(l) - iw); while (l < ns) { // be sure to compute d2 *only* if l < ns - const OutputPixelType d2 = itk::Math::abs(g(l + 1)) + (h(l + 1) - iw) * (h(l + 1) - iw); + const OutputPixelType d2 = itk::Math::Absolute(g(l + 1)) + (h(l + 1) - iw) * (h(l + 1) - iw); // then compare d1 and d2 if (d1 <= d2) { @@ -438,7 +438,8 @@ SignedMaurerDistanceMapImageFilter::Remove(OutputPixe const OutputPixelType b = xf - x2; const OutputPixelType c = xf - x1; - const OutputPixelType value = (c * itk::Math::abs(d2) - b * itk::Math::abs(d1) - a * itk::Math::abs(df) - a * b * c); + const OutputPixelType value = + (c * itk::Math::Absolute(d2) - b * itk::Math::Absolute(d1) - a * itk::Math::Absolute(df) - a * b * c); return value > 0; } diff --git a/Modules/Filtering/DistanceMap/test/itkApproximateSignedDistanceMapImageFilterTest.cxx b/Modules/Filtering/DistanceMap/test/itkApproximateSignedDistanceMapImageFilterTest.cxx index f8563de4e9c..1960bf4c6cc 100644 --- a/Modules/Filtering/DistanceMap/test/itkApproximateSignedDistanceMapImageFilterTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkApproximateSignedDistanceMapImageFilterTest.cxx @@ -149,7 +149,7 @@ itkApproximateSignedDistanceMapImageFilterTest(int argc, char * argv[]) { PointType point; image->TransformIndexToPhysicalPoint(oIt.GetIndex(), point); - const OutputPixelType distance = itk::Math::abs(oIt.Get() - SimpleSignedDistance(point)); + const OutputPixelType distance = itk::Math::Absolute(oIt.Get() - SimpleSignedDistance(point)); if (distance > maxDistance) { maxDistance = distance; diff --git a/Modules/Filtering/DistanceMap/test/itkFastChamferDistanceImageFilterGTest.cxx b/Modules/Filtering/DistanceMap/test/itkFastChamferDistanceImageFilterGTest.cxx index 882d480a213..967a2fa5efe 100644 --- a/Modules/Filtering/DistanceMap/test/itkFastChamferDistanceImageFilterGTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkFastChamferDistanceImageFilterGTest.cxx @@ -36,7 +36,7 @@ SimpleSignedDistance(const TPoint & p) accum += static_cast(itk::Math::sqr(p[j] - center[j])); } accum = std::sqrt(accum); - if (itk::Math::abs(accum - radius) > 1) + if (itk::Math::Absolute(accum - radius) > 1) { if ((accum - radius) > 0) { diff --git a/Modules/Filtering/DistanceMap/test/itkIsoContourDistanceImageFilterGTest.cxx b/Modules/Filtering/DistanceMap/test/itkIsoContourDistanceImageFilterGTest.cxx index 9a51cc959c4..39c7994596e 100644 --- a/Modules/Filtering/DistanceMap/test/itkIsoContourDistanceImageFilterGTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkIsoContourDistanceImageFilterGTest.cxx @@ -132,7 +132,7 @@ TEST(IsoContourDistanceImageFilter, Test) iter.GoToBegin(); while (!iter.IsAtEnd()) { - if (itk::Math::abs(iter.Get()) < 5) + if (itk::Math::Absolute(iter.Get()) < 5) { node.m_Index = iter.GetIndex(); band->PushBack(node); diff --git a/Modules/Filtering/FFT/test/itkFFTTest.h b/Modules/Filtering/FFT/test/itkFFTTest.h index 7cd44e32a80..364314c5fbd 100644 --- a/Modules/Filtering/FFT/test/itkFFTTest.h +++ b/Modules/Filtering/FFT/test/itkFFTTest.h @@ -248,10 +248,10 @@ test_fft(unsigned int * SizeOfDimensions) { TPixel val = originalImageIterator.Value(); TPixel val2 = inverseFFTImageIterator.Value(); - TPixel diff = itk::Math::abs(val - val2); + TPixel diff = itk::Math::Absolute(val - val2); if (itk::Math::NotAlmostEquals(val, 0.0)) { - diff /= itk::Math::abs(val); + diff /= itk::Math::Absolute(val); } if (diff > 0.01) { @@ -412,11 +412,11 @@ test_fft_rtc(unsigned int * SizeOfDimensions) const unsigned int yStrideB = j * sizesB[0]; for (unsigned int k = 0; k < std::min(sizesA[0], sizesB[0]); ++k) { - const double val = itk::Math::abs(fftbufA[zStrideA + yStrideA + k]); - double diff = itk::Math::abs(fftbufA[zStrideA + yStrideA + k] - fftbufB[zStrideB + yStrideB + k]); + const double val = itk::Math::Absolute(fftbufA[zStrideA + yStrideA + k]); + double diff = itk::Math::Absolute(fftbufA[zStrideA + yStrideA + k] - fftbufB[zStrideB + yStrideB + k]); if (itk::Math::NotAlmostEquals(val, 0.0)) { - diff /= itk::Math::abs(val); + diff /= itk::Math::Absolute(val); } if (diff > 0.01) { diff --git a/Modules/Filtering/FFT/test/itkRealFFTTest.h b/Modules/Filtering/FFT/test/itkRealFFTTest.h index e49437cb4c1..e21d8bec88a 100644 --- a/Modules/Filtering/FFT/test/itkRealFFTTest.h +++ b/Modules/Filtering/FFT/test/itkRealFFTTest.h @@ -200,10 +200,10 @@ test_fft(unsigned int * SizeOfDimensions) { TPixel val = originalImageIterator.Value(); TPixel val2 = inverseFFTImageIterator.Value(); - TPixel diff = itk::Math::abs(val - val2); + TPixel diff = itk::Math::Absolute(val - val2); if (itk::Math::NotAlmostEquals(val, TPixel{})) { - diff /= itk::Math::abs(val); + diff /= itk::Math::Absolute(val); } if (diff > 0.01) { @@ -364,11 +364,11 @@ test_fft_rtc(unsigned int * SizeOfDimensions) const unsigned int yStrideB = j * sizesB[0]; for (unsigned int k = 0; k < std::min(sizesA[0], sizesB[0]); ++k) { - const double val = itk::Math::abs(fftbufA[zStrideA + yStrideA + k]); - double diff = itk::Math::abs(fftbufA[zStrideA + yStrideA + k] - fftbufB[zStrideB + yStrideB + k]); + const double val = itk::Math::Absolute(fftbufA[zStrideA + yStrideA + k]); + double diff = itk::Math::Absolute(fftbufA[zStrideA + yStrideA + k] - fftbufB[zStrideB + yStrideB + k]); if (itk::Math::NotAlmostEquals(val, 0.0)) { - diff /= itk::Math::abs(val); + diff /= itk::Math::Absolute(val); } if (diff > 0.01) { diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingQuadEdgeMeshFilterBase.hxx b/Modules/Filtering/FastMarching/include/itkFastMarchingQuadEdgeMeshFilterBase.hxx index e74e74db814..3d8523b9609 100644 --- a/Modules/Filtering/FastMarching/include/itkFastMarchingQuadEdgeMeshFilterBase.hxx +++ b/Modules/Filtering/FastMarching/include/itkFastMarchingQuadEdgeMeshFilterBase.hxx @@ -333,7 +333,7 @@ FastMarchingQuadEdgeMeshFilterBase::ComputeUpdate(const OutputV if (delta >= 0.) { - if (itk::Math::abs(f2) > epsilon) + if (itk::Math::Absolute(f2) > epsilon) { t = (-f1 - std::sqrt(delta)) / f2; @@ -345,7 +345,7 @@ FastMarchingQuadEdgeMeshFilterBase::ComputeUpdate(const OutputV } else { - if (itk::Math::abs(f1) > epsilon) + if (itk::Math::Absolute(f1) > epsilon) { t = -f0 / f1; } diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingExtensionImageFilterTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingExtensionImageFilterTest.cxx index 34b6af5c261..85eba3306e9 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingExtensionImageFilterTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingExtensionImageFilterTest.cxx @@ -266,11 +266,11 @@ itkFastMarchingExtensionImageFilterTest(int, char *[]) if (itk::Math::NotAlmostEquals(distance, 0.0)) { - if (itk::Math::abs(outputValue) / distance > 1.42) + if (itk::Math::Absolute(outputValue) / distance > 1.42) { std::cout << iterator.ComputeIndex() << ' '; - std::cout << itk::Math::abs(outputValue) / distance << ' '; - std::cout << itk::Math::abs(outputValue) << ' ' << distance << std::endl; + std::cout << itk::Math::Absolute(outputValue) / distance << ' '; + std::cout << itk::Math::Absolute(outputValue) << ' ' << distance << std::endl; passed = false; break; } diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx index ebb947c5e20..966d2008eb3 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx @@ -185,12 +185,13 @@ itkFastMarchingImageFilterRealTest1(int itkNotUsed(argc), char * itkNotUsed(argv if (distance > itk::NumericTraits::epsilon()) { - if (itk::Math::abs(outputValue) / distance > outputValueThreshold) + if (itk::Math::Absolute(outputValue) / distance > outputValueThreshold) { std::cout << "Error at index [" << iterator.ComputeIndex() << ']' << std::endl; std::cout << "Expected scaled output value be less than: " << outputValueThreshold - << ", but got: " << itk::Math::abs(outputValue) / distance - << ", where output: " << itk::Math::abs(outputValue) << "; scale factor: " << distance << std::endl; + << ", but got: " << itk::Math::Absolute(outputValue) / distance + << ", where output: " << itk::Math::Absolute(outputValue) << "; scale factor: " << distance + << std::endl; passed = false; } } diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx index b991691658c..c03ea025cf2 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx @@ -215,12 +215,13 @@ itkFastMarchingImageFilterRealTest2(int itkNotUsed(argc), char * itkNotUsed(argv if (distance > itk::NumericTraits::epsilon()) { - if (itk::Math::abs(outputValue) / distance > threshold) + if (itk::Math::Absolute(outputValue) / distance > threshold) { std::cout << "Error at index [" << iterator.ComputeIndex() << ']' << std::endl; std::cout << "Expected scaled output value be less than: " << threshold - << ", but got: " << itk::Math::abs(outputValue) / distance - << ", where output: " << itk::Math::abs(outputValue) << "; scale factor: " << distance << std::endl; + << ", but got: " << itk::Math::Absolute(outputValue) / distance + << ", where output: " << itk::Math::Absolute(outputValue) << "; scale factor: " << distance + << std::endl; passed = false; } } diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx index 56c1dcf429d..e15ade16bd7 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx @@ -215,11 +215,11 @@ itkFastMarchingTest(int argc, char * argv[]) { continue; } - if (itk::Math::abs(outputValue) / distance > 1.42) + if (itk::Math::Absolute(outputValue) / distance > 1.42) { std::cout << iterator.ComputeIndex() << ' '; - std::cout << itk::Math::abs(outputValue) / distance << ' '; - std::cout << itk::Math::abs(outputValue) << ' ' << distance << std::endl; + std::cout << itk::Math::Absolute(outputValue) / distance << ' '; + std::cout << itk::Math::Absolute(outputValue) << ' ' << distance << std::endl; passed = false; } } diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingTest2.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingTest2.cxx index f74158118c5..a2c609d4bb2 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingTest2.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingTest2.cxx @@ -191,11 +191,11 @@ itkFastMarchingTest2(int, char *[]) continue; } - if (itk::Math::abs(outputValue) / distance > 1.42) + if (itk::Math::Absolute(outputValue) / distance > 1.42) { std::cout << iterator.ComputeIndex() << ' '; - std::cout << itk::Math::abs(outputValue) / distance << ' '; - std::cout << itk::Math::abs(outputValue) << ' ' << distance << std::endl; + std::cout << itk::Math::Absolute(outputValue) / distance << ' '; + std::cout << itk::Math::Absolute(outputValue) << ' ' << distance << std::endl; passed = false; } } diff --git a/Modules/Filtering/ImageCompare/test/itkAbsoluteValueDifferenceImageFilterTest.cxx b/Modules/Filtering/ImageCompare/test/itkAbsoluteValueDifferenceImageFilterTest.cxx index 0fd6f102f89..66b9068a785 100644 --- a/Modules/Filtering/ImageCompare/test/itkAbsoluteValueDifferenceImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompare/test/itkAbsoluteValueDifferenceImageFilterTest.cxx @@ -125,7 +125,7 @@ itkAbsoluteValueDifferenceImageFilterTest(int, char *[]) while (!it4.IsAtEnd()) { std::cout << it4.Get() << std::endl; - if (itk::Math::abs(it4.Get() - outputValue) > epsilon) + if (itk::Math::Absolute(it4.Get() - outputValue) > epsilon) { std::cerr << "Error in the output" << std::endl; std::cerr << "Value should be " << outputValue << std::endl; diff --git a/Modules/Filtering/ImageCompare/test/itkSimilarityIndexImageFilterTest.cxx b/Modules/Filtering/ImageCompare/test/itkSimilarityIndexImageFilterTest.cxx index 71479e7508d..41cde3641e3 100644 --- a/Modules/Filtering/ImageCompare/test/itkSimilarityIndexImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompare/test/itkSimilarityIndexImageFilterTest.cxx @@ -105,7 +105,7 @@ itkSimilarityIndexImageFilterTest(int, char *[]) std::cout << " True index: " << trueOverlap << std::endl; std::cout << " Computed index: " << overlap << std::endl; - if (itk::Math::abs(trueOverlap - overlap) > 0.1) + if (itk::Math::Absolute(trueOverlap - overlap) > 0.1) { std::cout << "Test failed. " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/ImageCompare/test/itkSquaredDifferenceImageFilterTest.cxx b/Modules/Filtering/ImageCompare/test/itkSquaredDifferenceImageFilterTest.cxx index 7d24878f42a..9fa615020ca 100644 --- a/Modules/Filtering/ImageCompare/test/itkSquaredDifferenceImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompare/test/itkSquaredDifferenceImageFilterTest.cxx @@ -125,7 +125,7 @@ itkSquaredDifferenceImageFilterTest(int, char *[]) while (!it4.IsAtEnd()) { std::cout << it4.Get() << std::endl; - if (itk::Math::abs(it4.Get() - outputValue) > epsilon) + if (itk::Math::Absolute(it4.Get() - outputValue) > epsilon) { std::cerr << "Error in the output" << std::endl; std::cerr << "Value should be " << outputValue << std::endl; diff --git a/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx b/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx index 982f97180eb..82a9b5f52b1 100644 --- a/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx +++ b/Modules/Filtering/ImageCompare/test/itkTestingComparisonImageFilterTest.cxx @@ -108,10 +108,10 @@ itkTestingComparisonImageFilterTest(int argc, char * argv[]) auto meanDifference = static_cast(std::stod(argv[10])); constexpr double epsilon{ 1e-4 }; - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); if (!itk::Math::FloatAlmostEqual(meanDifference, filter->GetMeanDifference(), 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetMeanDifference" << std::endl; std::cerr << "Expected value " << meanDifference << std::endl; diff --git a/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h b/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h index f189127b80b..84de1585c00 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.h @@ -141,13 +141,13 @@ class ITK_TEMPLATE_EXPORT HessianToObjectnessMeasureImageFilter : public ImageTo // functor used to sort the eigenvalues are to be sorted // |e1|<=|e2|<=...<=|eN| // - // Returns ( itk::Math::abs(a) < itk::Math::abs(b) ) + // Returns ( itk::Math::Absolute(a) < itk::Math::Absolute(b) ) struct AbsLessCompare { bool operator()(EigenValueType a, EigenValueType b) { - return itk::Math::abs(a) < itk::Math::abs(b); + return itk::Math::Absolute(a) < itk::Math::Absolute(b); } }; diff --git a/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.hxx index e2a4d92f413..e1ddf775aee 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkHessianToObjectnessMeasureImageFilter.hxx @@ -101,7 +101,7 @@ HessianToObjectnessMeasureImageFilter::DynamicThreade EigenValueArrayType sortedAbsEigenValues; for (unsigned int i = 0; i < ImageDimension; ++i) { - sortedAbsEigenValues[i] = itk::Math::abs(sortedEigenValues[i]); + sortedAbsEigenValues[i] = itk::Math::Absolute(sortedEigenValues[i]); } // Initialize the objectness measure @@ -116,9 +116,9 @@ HessianToObjectnessMeasureImageFilter::DynamicThreade { rADenominatorBase *= sortedAbsEigenValues[j]; } - if (itk::Math::abs(rADenominatorBase) > 0.0) + if (itk::Math::Absolute(rADenominatorBase) > 0.0) { - if (itk::Math::abs(m_Alpha) > 0.0) + if (itk::Math::Absolute(m_Alpha) > 0.0) { rA /= std::pow(rADenominatorBase, 1.0 / (ImageDimension - m_ObjectDimension - 1)); objectnessMeasure *= 1.0 - std::exp(-0.5 * itk::Math::sqr(rA) / itk::Math::sqr(m_Alpha)); @@ -138,7 +138,7 @@ HessianToObjectnessMeasureImageFilter::DynamicThreade { rBDenominatorBase *= sortedAbsEigenValues[j]; } - if (itk::Math::abs(rBDenominatorBase) > 0.0 && itk::Math::abs(m_Beta) > 0.0) + if (itk::Math::Absolute(rBDenominatorBase) > 0.0 && itk::Math::Absolute(m_Beta) > 0.0) { rB /= std::pow(rBDenominatorBase, 1.0 / (ImageDimension - m_ObjectDimension)); @@ -150,7 +150,7 @@ HessianToObjectnessMeasureImageFilter::DynamicThreade } } - if (itk::Math::abs(m_Gamma) > 0.0) + if (itk::Math::Absolute(m_Gamma) > 0.0) { double frobeniusNormSquared = 0.0; for (unsigned int i = 0; i < ImageDimension; ++i) diff --git a/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx b/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx index cbddbd54246..ea90573b4d2 100644 --- a/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkMaskFeaturePointSelectionFilter.hxx @@ -268,7 +268,7 @@ MaskFeaturePointSelectionFilter::GenerateData() const double trace = vnl_trace(tensor.GetVnlMatrix()); // trace should be non-zero - if (itk::Math::abs(trace) < TRACE_EPSILON) + if (itk::Math::Absolute(trace) < TRACE_EPSILON) { ++rit; --numberOfPointsInserted; diff --git a/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h b/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h index 4c53a45aac8..197e92b1343 100644 --- a/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h +++ b/Modules/Filtering/ImageFeature/include/itkUnsharpMaskImageFilter.h @@ -34,7 +34,7 @@ namespace itk * It has configurable amount, radius (sigma) and threshold, * and whether to clamp the resulting values to the range of output type. * - * Formula: sharpened=original+[itk::Math::abs(original-blurred)-threshold]*amount + * Formula: sharpened=original+[itk::Math::Absolute(original-blurred)-threshold]*amount * * If clamping is turned off (it is on by default), * casting to output pixel format is done using C++ defaults, diff --git a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.hxx index a05aa414bad..071dfa4f251 100644 --- a/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkZeroCrossingImageFilter.hxx @@ -137,8 +137,8 @@ ZeroCrossingImageFilter::DynamicThreadedGenerateData( ((Math::ExactlyEquals(this_one, zero)) && (Math::NotExactlyEquals(that, zero))) || ((Math::NotExactlyEquals(this_one, zero)) && (Math::ExactlyEquals(that, zero)))) { - const InputImagePixelType abs_this_one = itk::Math::abs(this_one); - const InputImagePixelType abs_that = itk::Math::abs(that); + const InputImagePixelType abs_this_one = itk::Math::Absolute(this_one); + const InputImagePixelType abs_that = itk::Math::Absolute(that); if (abs_this_one < abs_that) { it.Set(m_ForegroundValue); diff --git a/Modules/Filtering/ImageFeature/test/itkDiscreteGaussianDerivativeImageFilterScaleSpaceTest.cxx b/Modules/Filtering/ImageFeature/test/itkDiscreteGaussianDerivativeImageFilterScaleSpaceTest.cxx index de441f23cca..4ae22c4dd97 100644 --- a/Modules/Filtering/ImageFeature/test/itkDiscreteGaussianDerivativeImageFilterScaleSpaceTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkDiscreteGaussianDerivativeImageFilterScaleSpaceTest.cxx @@ -102,7 +102,7 @@ NormalizeSineWave(double frequencyPerImage, unsigned int order, double pixelSpac { if (maxLx < oiter.Get() && !itk::Math::FloatAlmostEqual(maxLx, oiter.Get(), 10, tolerance1)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(tolerance1)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(tolerance1)))); std::cout << "Error at period: " << 1.0 / frequency << std::endl; std::cout << "Expected maximal value: " << maxLx << ", differs from: " << oiter.Get() << " by more than " << tolerance1 << std::endl; @@ -120,7 +120,7 @@ NormalizeSineWave(double frequencyPerImage, unsigned int order, double pixelSpac { if (maxLx < oiter.Get() && !itk::Math::FloatAlmostEqual(maxLx, oiter.Get(), 10, tolerance1)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(tolerance1)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(tolerance1)))); std::cout << "Error at period: " << 1.0 / frequency << std::endl; std::cout << "Expected maximal value: " << maxLx << ", differs from: " << oiter.Get() << " by more than " << tolerance1 << std::endl; diff --git a/Modules/Filtering/ImageFeature/test/itkMultiScaleHessianBasedMeasureImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkMultiScaleHessianBasedMeasureImageFilterTest.cxx index de505543f58..04694eccbf7 100644 --- a/Modules/Filtering/ImageFeature/test/itkMultiScaleHessianBasedMeasureImageFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkMultiScaleHessianBasedMeasureImageFilterTest.cxx @@ -102,7 +102,7 @@ itkMultiScaleHessianBasedMeasureImageFilterTest(int argc, char * argv[]) const double sigmaMinimum = std::stod(argv[4]); multiScaleEnhancementFilter->SetSigmaMinimum(sigmaMinimum); - if (itk::Math::abs(multiScaleEnhancementFilter->GetSigmaMinimum() - sigmaMinimum) > tolerance) + if (itk::Math::Absolute(multiScaleEnhancementFilter->GetSigmaMinimum() - sigmaMinimum) > tolerance) { std::cerr << " Error in Set/GetSigmaMinimum() " << std::endl; return EXIT_FAILURE; @@ -114,7 +114,7 @@ itkMultiScaleHessianBasedMeasureImageFilterTest(int argc, char * argv[]) const double sigmaMaximum = std::stod(argv[5]); multiScaleEnhancementFilter->SetSigmaMaximum(sigmaMaximum); - if (itk::Math::abs(multiScaleEnhancementFilter->GetSigmaMaximum() - sigmaMaximum) > tolerance) + if (itk::Math::Absolute(multiScaleEnhancementFilter->GetSigmaMaximum() - sigmaMaximum) > tolerance) { std::cerr << " Error in Set/GetSigmaMaximum() " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/ImageFeature/test/itkUnsharpMaskImageFilterTestSimple.cxx b/Modules/Filtering/ImageFeature/test/itkUnsharpMaskImageFilterTestSimple.cxx index acea19adc63..8aa2768399a 100644 --- a/Modules/Filtering/ImageFeature/test/itkUnsharpMaskImageFilterTestSimple.cxx +++ b/Modules/Filtering/ImageFeature/test/itkUnsharpMaskImageFilterTestSimple.cxx @@ -108,7 +108,7 @@ itkUnsharpMaskImageFilterTestSimple(int, char *[]) const UnsharpMaskImageFilterFilterType::SigmaArrayType::ValueType sigma2 = sigmas[i]; if (!itk::Math::FloatAlmostEqual(sigma, sigma2, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Test FAILED! "; std::cerr << "Error in the Sigma values" << std::endl; std::cerr << "Expected " << sigma << " but got " << sigma2; diff --git a/Modules/Filtering/ImageFrequency/include/itkFrequencyBandImageFilter.hxx b/Modules/Filtering/ImageFrequency/include/itkFrequencyBandImageFilter.hxx index 0ffe78fad92..8c1fe8f8246 100644 --- a/Modules/Filtering/ImageFrequency/include/itkFrequencyBandImageFilter.hxx +++ b/Modules/Filtering/ImageFrequency/include/itkFrequencyBandImageFilter.hxx @@ -139,8 +139,8 @@ FrequencyBandImageFilter::BandPass(FrequencyIter else // Cut-off box taking into account max absolute scalar frequency. { vectorFrequency = freqIt.GetFrequency(); - maxFrequency = itk::Math::abs(*std::max_element(vectorFrequency.cbegin(), vectorFrequency.cend())); - minFrequency = itk::Math::abs(*std::min_element(vectorFrequency.cbegin(), vectorFrequency.cend())); + maxFrequency = itk::Math::Absolute(*std::max_element(vectorFrequency.cbegin(), vectorFrequency.cend())); + minFrequency = itk::Math::Absolute(*std::min_element(vectorFrequency.cbegin(), vectorFrequency.cend())); scalarFrequency = std::max(maxFrequency, minFrequency); if (minFrequency < maxFrequency) { diff --git a/Modules/Filtering/ImageFrequency/test/itkFrequencyFFTLayoutImageRegionIteratorWithIndexTest.cxx b/Modules/Filtering/ImageFrequency/test/itkFrequencyFFTLayoutImageRegionIteratorWithIndexTest.cxx index 2cd14ec20ae..7334e5ae5bc 100644 --- a/Modules/Filtering/ImageFrequency/test/itkFrequencyFFTLayoutImageRegionIteratorWithIndexTest.cxx +++ b/Modules/Filtering/ImageFrequency/test/itkFrequencyFFTLayoutImageRegionIteratorWithIndexTest.cxx @@ -116,7 +116,7 @@ class itkFrequencyFFTLayoutImageRegionIteratorWithIndexTester { for (unsigned int dim = 0; dim < ImageType::ImageDimension; ++dim) { - if (itk::Math::NotAlmostEquals(it.GetFrequency()[dim], itk::Math::abs(reverseIt.GetFrequency()[dim]))) + if (itk::Math::NotAlmostEquals(it.GetFrequency()[dim], itk::Math::Absolute(reverseIt.GetFrequency()[dim]))) { std::cout << "Failed testing Hermitian property at index:" << it.GetIndex() << " freq: " << it.GetFrequency() << '\n' diff --git a/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest3.cxx b/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest3.cxx index 091454a6afe..4c0908b145b 100644 --- a/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest3.cxx +++ b/Modules/Filtering/ImageGradient/test/itkGradientRecursiveGaussianFilterTest3.cxx @@ -159,7 +159,7 @@ itkGradientRecursiveGaussianFilterTest3Compare(typename TGradImage1DType::Pointe { const typename TGradImage1DType::PixelType::ValueType truth = scalar[d] / (c + 1.0); const typename TGradImage1DType::PixelType::ValueType test = vector[d + (c * numDimensions)]; - if (itk::Math::abs(truth - test) > tolerance) + if (itk::Math::Absolute(truth - test) > tolerance) { std::cerr << "One or more components of vector gradient image pixel are not as expected: " << std::endl << "d, c, truth, test: " << d << ' ' << c << ' ' << truth << ' ' << test << std::endl diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineCenteredResampleImageFilterBase.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineCenteredResampleImageFilterBase.hxx index cee01fb825a..123f6b2af06 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineCenteredResampleImageFilterBase.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineCenteredResampleImageFilterBase.hxx @@ -336,7 +336,7 @@ BSplineCenteredResampleImageFilterBase::Expand1DImage double outVal2 = 0; for (IndexValueType k = -k0; k < this->m_HSize; k += 2L) { - const IndexValueType kk = itk::Math::abs(static_cast(k)); + const IndexValueType kk = itk::Math::Absolute(static_cast(k)); i1 = inK + (k + 1L) / 2L; if (i1 < 0L) { diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx index 2434c506f12..0f501db9f03 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx @@ -234,11 +234,11 @@ BSplineControlPointImageFilter::DynamicThreadedGenera { U[i] = static_cast(totalNumberOfSpans[i]) * static_cast(idx[i] - startIndex[i]) / static_cast(this->m_Size[i] - 1); - if (itk::Math::abs(U[i] - static_cast(totalNumberOfSpans[i])) <= epsilon[i]) + if (itk::Math::Absolute(U[i] - static_cast(totalNumberOfSpans[i])) <= epsilon[i]) { U[i] = static_cast(totalNumberOfSpans[i]) - epsilon[i]; } - if (U[i] < RealType{} && itk::Math::abs(U[i]) <= epsilon[i]) + if (U[i] < RealType{} && itk::Math::Absolute(U[i]) <= epsilon[i]) { U[i] = RealType{}; } diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.hxx index c8685b66de8..c5d326112f6 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.hxx @@ -168,11 +168,11 @@ BSplineControlPointImageFunction::Evaluate(const Point for (unsigned int i = 0; i < ImageDimension; ++i) { p[i] = params[i]; - if (itk::Math::abs(p[i] - NumericTraits::OneValue()) <= this->m_BSplineEpsilon) + if (itk::Math::Absolute(p[i] - NumericTraits::OneValue()) <= this->m_BSplineEpsilon) { p[i] = NumericTraits::OneValue() - this->m_BSplineEpsilon; } - if (p[i] < RealType{} && itk::Math::abs(p[i]) <= this->m_BSplineEpsilon) + if (p[i] < RealType{} && itk::Math::Absolute(p[i]) <= this->m_BSplineEpsilon) { p[i] = RealType{}; } @@ -317,11 +317,11 @@ BSplineControlPointImageFunction::EvaluateGradient(con for (unsigned int i = 0; i < ImageDimension; ++i) { p[i] = params[i]; - if (itk::Math::abs(p[i] - NumericTraits::OneValue()) <= this->m_BSplineEpsilon) + if (itk::Math::Absolute(p[i] - NumericTraits::OneValue()) <= this->m_BSplineEpsilon) { p[i] = NumericTraits::OneValue() - this->m_BSplineEpsilon; } - if (p[i] < RealType{} && itk::Math::abs(p[i]) <= this->m_BSplineEpsilon) + if (p[i] < RealType{} && itk::Math::Absolute(p[i]) <= this->m_BSplineEpsilon) { p[i] = RealType{}; } @@ -486,11 +486,11 @@ BSplineControlPointImageFunction::EvaluateHessian(cons for (unsigned int i = 0; i < ImageDimension; ++i) { p[i] = params[i]; - if (itk::Math::abs(p[i] - NumericTraits::OneValue()) <= this->m_BSplineEpsilon) + if (itk::Math::Absolute(p[i] - NumericTraits::OneValue()) <= this->m_BSplineEpsilon) { p[i] = NumericTraits::OneValue() - this->m_BSplineEpsilon; } - if (p[i] < RealType{} && itk::Math::abs(p[i]) <= this->m_BSplineEpsilon) + if (p[i] < RealType{} && itk::Math::Absolute(p[i]) <= this->m_BSplineEpsilon) { p[i] = RealType{}; } diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx index 5a5835a4dfd..d5cc8c32339 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx @@ -459,11 +459,11 @@ BSplineScatteredDataPointSetToImageFilter::Threade const unsigned int totalNumberOfSpans = this->m_CurrentNumberOfControlPoints[i] - this->m_SplineOrder[i]; p[i] = (point[i] - this->m_Origin[i]) * r[i]; - if (itk::Math::abs(p[i] - static_cast(totalNumberOfSpans)) <= epsilon[i]) + if (itk::Math::Absolute(p[i] - static_cast(totalNumberOfSpans)) <= epsilon[i]) { p[i] = static_cast(totalNumberOfSpans) - epsilon[i]; } - if (p[i] < RealType{} && itk::Math::abs(p[i]) <= epsilon[i]) + if (p[i] < RealType{} && itk::Math::Absolute(p[i]) <= epsilon[i]) { p[i] = RealType{}; } @@ -611,11 +611,11 @@ BSplineScatteredDataPointSetToImageFilter::Threade U[i] = static_cast(totalNumberOfSpans[i]) * static_cast(idx[i] - startIndex[i]) / static_cast(this->m_Size[i] - 1); - if (itk::Math::abs(U[i] - static_cast(totalNumberOfSpans[i])) <= epsilon[i]) + if (itk::Math::Absolute(U[i] - static_cast(totalNumberOfSpans[i])) <= epsilon[i]) { U[i] = static_cast(totalNumberOfSpans[i]) - epsilon[i]; } - if (U[i] < RealType{} && itk::Math::abs(U[i]) <= epsilon[i]) + if (U[i] < RealType{} && itk::Math::Absolute(U[i]) <= epsilon[i]) { U[i] = RealType{}; } @@ -946,11 +946,11 @@ BSplineScatteredDataPointSetToImageFilter::Threade U[i] = static_cast(totalNumberOfSpans[i]) * static_cast(point[i] - this->m_Origin[i]) / (static_cast(this->m_Size[i] - 1) * this->m_Spacing[i]); - if (itk::Math::abs(U[i] - static_cast(totalNumberOfSpans[i])) <= epsilon[i]) + if (itk::Math::Absolute(U[i] - static_cast(totalNumberOfSpans[i])) <= epsilon[i]) { U[i] = static_cast(totalNumberOfSpans[i]) - epsilon[i]; } - if (U[i] < RealType{} && itk::Math::abs(U[i]) <= epsilon[i]) + if (U[i] < RealType{} && itk::Math::Absolute(U[i]) <= epsilon[i]) { U[i] = RealType{}; } diff --git a/Modules/Filtering/ImageGrid/include/itkCoxDeBoorBSplineKernelFunction.hxx b/Modules/Filtering/ImageGrid/include/itkCoxDeBoorBSplineKernelFunction.hxx index b1594ea72e9..0dcb007ebf4 100644 --- a/Modules/Filtering/ImageGrid/include/itkCoxDeBoorBSplineKernelFunction.hxx +++ b/Modules/Filtering/ImageGrid/include/itkCoxDeBoorBSplineKernelFunction.hxx @@ -150,7 +150,7 @@ template TRealValueType CoxDeBoorBSplineKernelFunction::Evaluate(const TRealValueType & u) const { - const TRealValueType absValue = itk::Math::abs(u); + const TRealValueType absValue = itk::Math::Absolute(u); auto which = static_cast(absValue); if (this->m_SplineOrder % 2 == 0) @@ -178,7 +178,7 @@ TRealValueType CoxDeBoorBSplineKernelFunction::EvaluateNthDerivative(const TRealValueType & u, const unsigned int n) const { - const TRealValueType absValue = itk::Math::abs(u); + const TRealValueType absValue = itk::Math::Absolute(u); auto which = static_cast(absValue); if (this->m_SplineOrder % 2 == 0) diff --git a/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx index 676944439d7..c6db2d9980d 100644 --- a/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx @@ -208,7 +208,7 @@ MirrorPadImageFilter::ConvertOutputIndexToInputIndex( // 18-connected voxels and second 6-connected layer having distance 2 etc. for (unsigned int dimCtr = 0; dimCtr < ImageDimension; ++dimCtr) { - distanceFromEdge += (itk::Math::abs(outputIndex[dimCtr] - inputIndex[dimCtr]) + 1) / 2; + distanceFromEdge += (itk::Math::Absolute(outputIndex[dimCtr] - inputIndex[dimCtr]) + 1) / 2; } // TODO: see if precomputed pow look-up table will speed this up outDecayFactor = std::pow(this->m_DecayBase, distanceFromEdge); diff --git a/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.hxx index d4bcb94c902..f30123bc36a 100644 --- a/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkSliceImageFilter.hxx @@ -184,7 +184,7 @@ SliceImageFilter::GenerateInputRequestedRegion() { if (outputRequestedRegionSize[i] > 0) { - inputRequestedRegionSize[i] = (outputRequestedRegionSize[i] - 1) * itk::Math::abs(m_Step[i]) + 1; + inputRequestedRegionSize[i] = (outputRequestedRegionSize[i] - 1) * itk::Math::Absolute(m_Step[i]) + 1; } } @@ -238,7 +238,7 @@ SliceImageFilter::GenerateOutputInformation() for (unsigned int i = 0; i < TOutputImage::ImageDimension; ++i) { - outputSpacing[i] = inputSpacing[i] * itk::Math::abs(m_Step[i]); + outputSpacing[i] = inputSpacing[i] * itk::Math::Absolute(m_Step[i]); // clamp start, inclusive start interval const IndexValueType start = diff --git a/Modules/Filtering/ImageGrid/test/itkBSplineControlPointImageFunctionTest.cxx b/Modules/Filtering/ImageGrid/test/itkBSplineControlPointImageFunctionTest.cxx index f034b889100..54223c933b8 100644 --- a/Modules/Filtering/ImageGrid/test/itkBSplineControlPointImageFunctionTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkBSplineControlPointImageFunctionTest.cxx @@ -120,14 +120,14 @@ itkBSplineControlPointImageFunctionTest(int, char *[]) point[0] = 0.0; data = bspliner->EvaluateAtParametricPoint(point); - if (itk::Math::abs(data[0] - 0.166666666667) > 1e-5) + if (itk::Math::Absolute(data[0] - 0.166666666667) > 1e-5) { std::cerr << "Evaluate1: data is further away from the expected value." << std::endl; return EXIT_FAILURE; } gradient = bspliner->EvaluateGradientAtParametricPoint(point); - if (itk::Math::abs(gradient(0, 0) + 0.5) > 1e-5) + if (itk::Math::Absolute(gradient(0, 0) + 0.5) > 1e-5) { std::cerr << "Evaluate1: gradient is further away from the expected value." << std::endl; return EXIT_FAILURE; @@ -135,7 +135,7 @@ itkBSplineControlPointImageFunctionTest(int, char *[]) hessianComponent = bspliner->EvaluateHessianAtParametricPoint(point, 0); - if (itk::Math::abs(hessianComponent(0, 0) - 1.0) > 1e-5) + if (itk::Math::Absolute(hessianComponent(0, 0) - 1.0) > 1e-5) { std::cerr << "Evaluate1: hessian is further away from the expected value." << std::endl; return EXIT_FAILURE; @@ -154,21 +154,21 @@ itkBSplineControlPointImageFunctionTest(int, char *[]) point[0] = 0.351; data = bspliner->EvaluateAtParametricPoint(point); - if (itk::Math::abs(data[0] - 0.05276717) > 1e-5) + if (itk::Math::Absolute(data[0] - 0.05276717) > 1e-5) { std::cerr << "Evaluate2: data is further away from the expected value." << std::endl; return EXIT_FAILURE; } gradient = bspliner->EvaluateGradientAtParametricPoint(point); - if (itk::Math::abs(gradient(0, 0) + 0.149) > 1e-5) + if (itk::Math::Absolute(gradient(0, 0) + 0.149) > 1e-5) { std::cerr << "Evaluate2: gradient is further away from the expected value." << std::endl; return EXIT_FAILURE; } hessianComponent = bspliner->EvaluateHessianAtParametricPoint(point, 0); - if (itk::Math::abs(hessianComponent(0, 0) - 1.0) > 1e-5) + if (itk::Math::Absolute(hessianComponent(0, 0) - 1.0) > 1e-5) { std::cerr << "Evaluate2: hessian is further away from the expected value." << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/ImageGrid/test/itkBSplineResampleImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkBSplineResampleImageFilterTest.cxx index 3cd36467d06..c5617b589ab 100644 --- a/Modules/Filtering/ImageGrid/test/itkBSplineResampleImageFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkBSplineResampleImageFilterTest.cxx @@ -161,7 +161,7 @@ VerifyResultsHigherOrderSpline(ImageTypePtr2D ActualResults, double * ExpectedRe { const double val1 = ActualResultsIter.Get(); - percentErr += itk::Math::abs((val1 - *ERptr) / val1); + percentErr += itk::Math::Absolute((val1 - *ERptr) / val1); ++ActualResultsIter; ++ERptr; @@ -186,7 +186,7 @@ VerifyResults3rdOrderSpline(ImageTypePtr2D ActualResults, double * ExpectedResul while (!ActualResultsIter.IsAtEnd()) { const double val1 = ActualResultsIter.Get(); - if (itk::Math::abs(val1 - *ERptr) > 1e-6) + if (itk::Math::Absolute(val1 - *ERptr) > 1e-6) { // std::cout << "*** Error: value should be " << trueValue << std::endl; return false; @@ -209,7 +209,7 @@ VerifyResults2ndOrderSpline(ImageTypePtr2D ActualResults, double * ExpectedResul { const double val1 = ActualResultsIter.Get(); - percentErr += itk::Math::abs((val1 - *ERptr) / val1); + percentErr += itk::Math::Absolute((val1 - *ERptr) / val1); ++ActualResultsIter; ++ERptr; @@ -237,7 +237,7 @@ VerifyResultsLowerOrderSpline(ImageTypePtr2D ActualResults, double * ExpectedRes { const double val1 = ActualResultsIter.Get(); - percentErr += itk::Math::abs((val1 - *ERptr) / val1); + percentErr += itk::Math::Absolute((val1 - *ERptr) / val1); ++ActualResultsIter; ++ERptr; diff --git a/Modules/Filtering/ImageGrid/test/itkBSplineScatteredDataPointSetToImageFilterTest4.cxx b/Modules/Filtering/ImageGrid/test/itkBSplineScatteredDataPointSetToImageFilterTest4.cxx index 1819aca16b3..38b1aebe990 100644 --- a/Modules/Filtering/ImageGrid/test/itkBSplineScatteredDataPointSetToImageFilterTest4.cxx +++ b/Modules/Filtering/ImageGrid/test/itkBSplineScatteredDataPointSetToImageFilterTest4.cxx @@ -218,7 +218,7 @@ itkBSplineScatteredDataPointSetToImageFilterTest4(int, char *[]) std::cout << "True output point " << outputPoint << std::endl; std::cout << "Approximate output point " << approximateOutputPoint << std::endl; - if (itk::Math::abs(testDistance - approximateDistance) > 0.0001) + if (itk::Math::Absolute(testDistance - approximateDistance) > 0.0001) { std::cerr << "Didn't return correct distance." << std::endl; diff --git a/Modules/Filtering/ImageGrid/test/itkCoxDeBoorBSplineKernelFunctionTest2.cxx b/Modules/Filtering/ImageGrid/test/itkCoxDeBoorBSplineKernelFunctionTest2.cxx index d0ee2991554..ed438b1f8f3 100644 --- a/Modules/Filtering/ImageGrid/test/itkCoxDeBoorBSplineKernelFunctionTest2.cxx +++ b/Modules/Filtering/ImageGrid/test/itkCoxDeBoorBSplineKernelFunctionTest2.cxx @@ -37,8 +37,8 @@ itkCoxDeBoorBSplineKernelFunctionTest2(int, char *[]) for (double t = 0.0; t < static_cast(0.5 * (order + 1)); t += 0.1) { const KernelType::RealType derivative = kernel->EvaluateDerivative(t); - if (itk::Math::abs(derivative - (kernelOrderMinus1->Evaluate(t + 0.5) - kernelOrderMinus1->Evaluate(t - 0.5))) > - 1e-10) + if (itk::Math::Absolute(derivative - + (kernelOrderMinus1->Evaluate(t + 0.5) - kernelOrderMinus1->Evaluate(t - 0.5))) > 1e-10) { return EXIT_FAILURE; } diff --git a/Modules/Filtering/ImageGrid/test/itkExpandImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkExpandImageFilterTest.cxx index 389624ebb39..361691c220c 100644 --- a/Modules/Filtering/ImageGrid/test/itkExpandImageFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkExpandImageFilterTest.cxx @@ -161,9 +161,9 @@ itkExpandImageFilterTest(int, char *[]) const double trueValue = pattern.Evaluate(inputIndex); constexpr double epsilon{ 1e-4 }; - if (itk::Math::abs(trueValue - value) > epsilon) + if (itk::Math::Absolute(trueValue - value) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in Evaluate at index [" << index << "]" << std::endl; std::cerr << "Expected value " << trueValue << std::endl; diff --git a/Modules/Filtering/ImageGrid/test/itkInterpolateImagePointsFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkInterpolateImagePointsFilterTest.cxx index 691baa345ce..f8436a46a84 100644 --- a/Modules/Filtering/ImageGrid/test/itkInterpolateImagePointsFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkInterpolateImagePointsFilterTest.cxx @@ -169,7 +169,7 @@ test2DInterpolateImagePointsFilter() { const double value = outIter.Get(); std::cout.width(10); - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << "Checking image value: " << value << std::endl; if (!itk::Math::FloatAlmostEqual(value, truth[i], 10, epsilon)) { @@ -266,7 +266,7 @@ test3DInterpolateImagePointsFilter() // Write home and let mom & dad know how we're doing. std::cout << "rmse of image is " << rmse << "\n "; constexpr double epsilon{ 1e-7 }; - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); if (!itk::Math::FloatAlmostEqual(rmse, 0.0, 10, epsilon)) { std::cout << "*** Error: rmse is larger than expected." << std::endl; diff --git a/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx index 3905342b53b..416448863c8 100644 --- a/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkWarpImageFilterTest.cxx @@ -290,9 +290,9 @@ itkWarpImageFilterTest(int, char *[]) const double trueValue = pattern.Evaluate(outIter.GetIndex(), validSize, clampSize, padValue); constexpr double epsilon{ 1e-4 }; - if (itk::Math::abs(trueValue - value) > epsilon) + if (itk::Math::Absolute(trueValue - value) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in Evaluate at index [" << index << "]" << std::endl; std::cerr << "Expected value " << trueValue << std::endl; diff --git a/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx b/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx index 1a680d9ef2c..a1440e490c4 100644 --- a/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx +++ b/Modules/Filtering/ImageGrid/test/itkWarpVectorImageFilterTest.cxx @@ -265,7 +265,7 @@ itkWarpVectorImageFilterTest(int, char *[]) PixelType trueValue(pattern.Evaluate(outIter.GetIndex(), validSize, clampSize, padValue)); for (unsigned int k = 0; k < ImageDimension; ++k) { - if (itk::Math::abs(trueValue[k] - value[k]) > 1e-4) + if (itk::Math::Absolute(trueValue[k] - value[k]) > 1e-4) { std::cerr << "Test failed!" << std::endl; std::cerr << "Error in Evaluate at index [" << index << "]" << std::endl; diff --git a/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h index d904b38f726..bebca3d4f47 100644 --- a/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkAbsImageFilter.h @@ -44,7 +44,7 @@ class Abs inline TOutput operator()(const TInput & A) const { - return static_cast(itk::Math::abs(A)); + return static_cast(itk::Math::Absolute(A)); } }; } // namespace Functor @@ -52,7 +52,7 @@ class Abs /** \class AbsImageFilter * \brief Computes the absolute value of each pixel. * - * itk::Math::abs() is used to perform the computation. + * itk::Math::Absolute() is used to perform the computation. * * \ingroup IntensityImageFilters * \ingroup MultiThreaded diff --git a/Modules/Filtering/ImageIntensity/test/itkAbsImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAbsImageFilterAndAdaptorTest.cxx index 1ac06dd2fd3..db381bae627 100644 --- a/Modules/Filtering/ImageIntensity/test/itkAbsImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkAbsImageFilterAndAdaptorTest.cxx @@ -98,17 +98,17 @@ itkAbsImageFilterAndAdaptorTest(int, char *[]) it.GoToBegin(); while (!ot.IsAtEnd()) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << ot.Get() << " = "; - std::cout << itk::Math::abs(it.Get()) << std::endl; + std::cout << itk::Math::Absolute(it.Get()) << std::endl; const InputImageType::PixelType input = it.Get(); const OutputImageType::PixelType output = ot.Get(); - const OutputImageType::PixelType absolute = itk::Math::abs(input); + const OutputImageType::PixelType absolute = itk::Math::Absolute(input); if (!itk::Math::FloatAlmostEqual(absolute, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error in itkAbsImageFilterTest " << std::endl; - std::cerr << " itk::Math::abs(" << input << ") = " << absolute << std::endl; + std::cerr << " itk::Math::Absolute(" << input << ") = " << absolute << std::endl; std::cerr << " differs from " << output; std::cerr << " by more than " << epsilon << std::endl; testStatus = EXIT_FAILURE; @@ -151,12 +151,12 @@ itkAbsImageFilterAndAdaptorTest(int, char *[]) dt.GoToBegin(); while (!dt.IsAtEnd()) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << dt.Get() << std::endl; const OutputImageType::PixelType diff = dt.Get(); if (!itk::Math::FloatAlmostEqual(diff, OutputImageType::PixelType{ 0 }, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error in itkAbsImageFilterTest " << std::endl; std::cerr << "Comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkAcosImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAcosImageFilterAndAdaptorTest.cxx index b21aa0099d4..77248c73161 100644 --- a/Modules/Filtering/ImageIntensity/test/itkAcosImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkAcosImageFilterAndAdaptorTest.cxx @@ -102,7 +102,7 @@ itkAcosImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType arccosinus = std::acos(input); if (!itk::Math::FloatAlmostEqual(arccosinus, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::acos( " << input << ") = " << arccosinus << std::endl; std::cerr << " differs from " << output; @@ -148,9 +148,9 @@ itkAcosImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkAddImageAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAddImageAdaptorTest.cxx index 201141b7cc3..8b760c08d6c 100644 --- a/Modules/Filtering/ImageIntensity/test/itkAddImageAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkAddImageAdaptorTest.cxx @@ -113,7 +113,7 @@ itkAddImageAdaptorTest(int, char *[]) auto v1 = static_cast(dt.Get()); auto v2 = static_cast(additiveConstant); - const RealPixelType diff = itk::Math::abs(v1 - v2); + const RealPixelType diff = itk::Math::Absolute(v1 - v2); if (diff > itk::Math::eps) { diff --git a/Modules/Filtering/ImageIntensity/test/itkAsinImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAsinImageFilterAndAdaptorTest.cxx index 8ad4403ef63..f3685bc2aba 100644 --- a/Modules/Filtering/ImageIntensity/test/itkAsinImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkAsinImageFilterAndAdaptorTest.cxx @@ -98,7 +98,7 @@ itkAsinImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType arcsinus = std::asin(input); if (!itk::Math::FloatAlmostEqual(arcsinus, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::asin( " << input << ") = " << arcsinus << std::endl; std::cerr << " differs from " << output; @@ -144,9 +144,9 @@ itkAsinImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkAtan2ImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAtan2ImageFilterTest.cxx index 470b38b6367..94e5f825d80 100644 --- a/Modules/Filtering/ImageIntensity/test/itkAtan2ImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkAtan2ImageFilterTest.cxx @@ -113,7 +113,7 @@ itkAtan2ImageFilterTest(int, char *[]) const OutputImageType::PixelType atan2 = std::atan2(input1, input2); if (!itk::Math::FloatAlmostEqual(atan2, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::atan2( " << input1 << ", " << input2 << ") = " << atan2 << std::endl; std::cerr << " differs from " << output; diff --git a/Modules/Filtering/ImageIntensity/test/itkAtanImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkAtanImageFilterAndAdaptorTest.cxx index 5100d2dbe64..894e8d93751 100644 --- a/Modules/Filtering/ImageIntensity/test/itkAtanImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkAtanImageFilterAndAdaptorTest.cxx @@ -97,7 +97,7 @@ itkAtanImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType arctangent = std::atan(input); if (!itk::Math::FloatAlmostEqual(arctangent, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::atan( " << input << ") = " << arctangent << std::endl; std::cerr << " differs from " << output; @@ -143,9 +143,9 @@ itkAtanImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkBinaryMagnitudeImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkBinaryMagnitudeImageFilterTest.cxx index 4b3508c9a09..961a694168d 100644 --- a/Modules/Filtering/ImageIntensity/test/itkBinaryMagnitudeImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkBinaryMagnitudeImageFilterTest.cxx @@ -102,7 +102,7 @@ itkBinaryMagnitudeImageFilterTest(int, char *[]) { if (!itk::Math::FloatAlmostEqual(oIt.Get(), outputValue, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error in the output" << std::endl; std::cerr << "Value should be " << outputValue << std::endl; std::cerr << "but is " << oIt.Get() << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkBoundedReciprocalImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkBoundedReciprocalImageFilterTest.cxx index 268d003fb72..cb3509b4dfa 100644 --- a/Modules/Filtering/ImageIntensity/test/itkBoundedReciprocalImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkBoundedReciprocalImageFilterTest.cxx @@ -63,7 +63,7 @@ itkBoundedReciprocalImageFilterTest(int argc, char * argv[]) ImageIterator outIter(outputImage, outputImage->GetBufferedRegion()); constexpr double tolerance{ 10e-6 }; - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); for (; !inIter.IsAtEnd() || !outIter.IsAtEnd(); ++inIter, ++outIter) { diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToImaginaryFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToImaginaryFilterAndAdaptorTest.cxx index 5f67dcd2637..478df2ac829 100644 --- a/Modules/Filtering/ImageIntensity/test/itkComplexToImaginaryFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkComplexToImaginaryFilterAndAdaptorTest.cxx @@ -94,7 +94,7 @@ itkComplexToImaginaryFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType imag = input.imag(); if (!itk::Math::FloatAlmostEqual(imag, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " imag( " << input << ") = " << imag << std::endl; std::cerr << " differs from " << output; @@ -139,9 +139,9 @@ itkComplexToImaginaryFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToModulusFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToModulusFilterAndAdaptorTest.cxx index d167f664ff7..cf3d8b83744 100644 --- a/Modules/Filtering/ImageIntensity/test/itkComplexToModulusFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkComplexToModulusFilterAndAdaptorTest.cxx @@ -102,7 +102,7 @@ itkComplexToModulusFilterAndAdaptorTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(norm, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error in itkComplexToModulusImageFilterTest " << std::endl; std::cerr << " norm( " << input << ") = " << norm << std::endl; std::cerr << " differs from " << output; @@ -145,9 +145,9 @@ itkComplexToModulusFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error in itkComplexToModulusImageFilterTest " << std::endl; std::cerr << "Comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToPhaseFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToPhaseFilterAndAdaptorTest.cxx index b4593146d95..e06db847151 100644 --- a/Modules/Filtering/ImageIntensity/test/itkComplexToPhaseFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkComplexToPhaseFilterAndAdaptorTest.cxx @@ -98,7 +98,7 @@ itkComplexToPhaseFilterAndAdaptorTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(phase, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " phase( " << input << ") = " << phase << std::endl; std::cerr << " differs from " << output; @@ -143,9 +143,9 @@ itkComplexToPhaseFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkComplexToRealFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkComplexToRealFilterAndAdaptorTest.cxx index f50955ae9c7..30c8a1da7ba 100644 --- a/Modules/Filtering/ImageIntensity/test/itkComplexToRealFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkComplexToRealFilterAndAdaptorTest.cxx @@ -94,7 +94,7 @@ itkComplexToRealFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType real = input.real(); if (!itk::Math::FloatAlmostEqual(real, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " real( " << input << ") = " << real << std::endl; std::cerr << " differs from " << output; @@ -139,9 +139,9 @@ itkComplexToRealFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkCosImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkCosImageFilterAndAdaptorTest.cxx index fd42fdb763b..7246c01a4fe 100644 --- a/Modules/Filtering/ImageIntensity/test/itkCosImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkCosImageFilterAndAdaptorTest.cxx @@ -97,7 +97,7 @@ itkCosImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType cosinus = std::cos(input); if (!itk::Math::FloatAlmostEqual(cosinus, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " cos( " << input << ") = " << cosinus << std::endl; std::cerr << " differs from " << output; @@ -143,9 +143,9 @@ itkCosImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest.cxx index eb841306420..b67bdb7b4da 100644 --- a/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest.cxx @@ -103,7 +103,7 @@ itkDivideImageFilterTest(int, char *[]) { if (!itk::Math::FloatAlmostEqual(oIt.Get(), expectedValue, 2, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in pixel value at index [" << oIt.GetIndex() << ']' << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx b/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx index 801e156ee1f..1bd0b9047ee 100644 --- a/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx @@ -108,7 +108,7 @@ itkDivideImageFilterTest2(int, char *[]) { if (!itk::Math::FloatAlmostEqual(oIt.Get()[i], expectedValue, 2, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in pixel value at index [" << oIt.GetIndex() << ':' << i << ']' << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkEdgePotentialImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkEdgePotentialImageFilterTest.cxx index b4fbb951ad9..7eef905e2d2 100644 --- a/Modules/Filtering/ImageIntensity/test/itkEdgePotentialImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkEdgePotentialImageFilterTest.cxx @@ -101,7 +101,7 @@ itkEdgePotentialImageFilterTest(int, char *[]) const OutputImageType::PixelType pot = std::exp(-1.0 * (it.Get().GetNorm())); std::cout << ot.Get() << " = "; std::cout << pot << std::endl; - if (itk::Math::abs(pot - output) > epsilon) + if (itk::Math::Absolute(pot - output) > epsilon) { std::cerr << "Error in itkEdgePotentialImageFilterTest " << std::endl; std::cerr << " potential( " << input << ") = " << pot << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkExpImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkExpImageFilterAndAdaptorTest.cxx index d3e00ce0538..09d5c3747a2 100644 --- a/Modules/Filtering/ImageIntensity/test/itkExpImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkExpImageFilterAndAdaptorTest.cxx @@ -100,7 +100,7 @@ itkExpImageFilterAndAdaptorTest(int, char *[]) const InputImageType::PixelType input = it.Get(); const OutputImageType::PixelType output = ot.Get(); const OutputImageType::PixelType exponential = std::exp(input); - if (itk::Math::abs(exponential - output) > epsilon) + if (itk::Math::Absolute(exponential - output) > epsilon) { std::cerr << "Error in itkExpImageFilterTest " << std::endl; std::cerr << " std::exp( " << input << ") = " << exponential << std::endl; @@ -147,7 +147,7 @@ itkExpImageFilterAndAdaptorTest(int, char *[]) { std::cout << dt.Get() << std::endl; const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { std::cerr << "Error in itkExpImageFilterTest " << std::endl; std::cerr << "Comparing results with Adaptors" << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkExpNegativeImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkExpNegativeImageFilterAndAdaptorTest.cxx index abbe0742f3a..8396384fa7a 100644 --- a/Modules/Filtering/ImageIntensity/test/itkExpNegativeImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkExpNegativeImageFilterAndAdaptorTest.cxx @@ -100,7 +100,7 @@ itkExpNegativeImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType output = ot.Get(); const OutputImageType::PixelType exponential = std::exp(-input); std::cout << exponential << std::endl; - if (itk::Math::abs(exponential - output) > epsilon) + if (itk::Math::Absolute(exponential - output) > epsilon) { std::cerr << "Error in itkExpNegativeImageFilterTest " << std::endl; std::cerr << " std::exp( - " << input << ") = " << exponential << std::endl; @@ -147,7 +147,7 @@ itkExpNegativeImageFilterAndAdaptorTest(int, char *[]) { std::cout << dt.Get() << std::endl; const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { std::cerr << "Error in itkExpNegativeImageFilterTest " << std::endl; std::cerr << "Comparing results with Adaptors" << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkHistogramMatchingImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkHistogramMatchingImageFilterTest.cxx index d9b038d0ddf..7e262c05f2f 100644 --- a/Modules/Filtering/ImageIntensity/test/itkHistogramMatchingImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkHistogramMatchingImageFilterTest.cxx @@ -99,7 +99,7 @@ CompareImages(itk::ImageRegionIterator & refIter, itk::ImageRegionIte while (!outIter.IsAtEnd()) { const typename ImageType::PixelType diff = refIter.Get() - outIter.Get(); - if (itk::Math::abs(diff) > 1) + if (itk::Math::Absolute(diff) > 1) { passed = false; std::cout << "Test failed at: " << outIter.ComputeIndex() << ' '; diff --git a/Modules/Filtering/ImageIntensity/test/itkIntensityWindowingImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkIntensityWindowingImageFilterTest.cxx index 8f4957f3588..5a14057feb8 100644 --- a/Modules/Filtering/ImageIntensity/test/itkIntensityWindowingImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkIntensityWindowingImageFilterTest.cxx @@ -103,7 +103,7 @@ itkIntensityWindowingImageFilterTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(obtainedMinimum, desiredMinimum, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Error in minimum" << std::endl; std::cerr << "Expected minimum = " << desiredMinimum << std::endl; std::cerr << "Obtained minimum = " << obtainedMinimum << std::endl; @@ -112,7 +112,7 @@ itkIntensityWindowingImageFilterTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(obtainedMaximum, desiredMaximum, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Error in maximum" << std::endl; std::cerr << "Expected maximum = " << desiredMaximum << std::endl; std::cerr << "Obtained maximum = " << obtainedMaximum << std::endl; @@ -141,7 +141,7 @@ itkIntensityWindowingImageFilterTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(obtainedMinimum2, desiredMinimum, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Error in minimum" << std::endl; std::cerr << "Expected minimum = " << desiredMinimum << std::endl; std::cerr << "Obtained minimum = " << obtainedMinimum2 << std::endl; @@ -150,7 +150,7 @@ itkIntensityWindowingImageFilterTest(int, char *[]) if (!itk::Math::FloatAlmostEqual(obtainedMaximum2, desiredMaximum, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Error in maximum" << std::endl; std::cerr << "Expected maximum = " << desiredMaximum << std::endl; std::cerr << "Obtained maximum = " << obtainedMaximum2 << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkLog10ImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkLog10ImageFilterAndAdaptorTest.cxx index ba2b5567209..a690693c51f 100644 --- a/Modules/Filtering/ImageIntensity/test/itkLog10ImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkLog10ImageFilterAndAdaptorTest.cxx @@ -95,7 +95,7 @@ itkLog10ImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType naturallog = std::log10(input); if (!itk::Math::FloatAlmostEqual(naturallog, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::log10( " << input << ") = " << naturallog << std::endl; std::cerr << " differs from " << output; @@ -141,9 +141,9 @@ itkLog10ImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkLogImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkLogImageFilterAndAdaptorTest.cxx index 8fcbb4e9f0c..3287abcec1e 100644 --- a/Modules/Filtering/ImageIntensity/test/itkLogImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkLogImageFilterAndAdaptorTest.cxx @@ -96,7 +96,7 @@ itkLogImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType logarithm = std::log(input); if (!itk::Math::FloatAlmostEqual(logarithm, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::log( " << input << ") = " << logarithm << std::endl; std::cerr << " differs from " << output; @@ -142,9 +142,9 @@ itkLogImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkMultiplyImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkMultiplyImageFilterTest.cxx index 8650cf2889b..b9197d1f7a5 100644 --- a/Modules/Filtering/ImageIntensity/test/itkMultiplyImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkMultiplyImageFilterTest.cxx @@ -103,7 +103,7 @@ itkMultiplyImageFilterTest(int, char *[]) { if (!itk::Math::FloatAlmostEqual(oIt.Get(), expectedValue, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in pixel value at index [" << oIt.GetIndex() << ']' << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkNormalizeToConstantImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkNormalizeToConstantImageFilterTest.cxx index 8df0bb1e005..8df855db906 100644 --- a/Modules/Filtering/ImageIntensity/test/itkNormalizeToConstantImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkNormalizeToConstantImageFilterTest.cxx @@ -73,7 +73,7 @@ itkNormalizeToConstantImageFilterTest(int, char *[]) double epsilon = 1e-5; if (!itk::Math::FloatAlmostEqual(constant, sum, 10, epsilon)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << "First sum (" << sum << ") does not equal constant (" << constant << ')' << std::endl; return EXIT_FAILURE; } @@ -93,7 +93,7 @@ itkNormalizeToConstantImageFilterTest(int, char *[]) epsilon = 1e-3; if (!itk::Math::FloatAlmostEqual(constant, sum, 10, epsilon)) { - std::cout.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cout.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cout << "Second sum (" << sum << ") does not equal constant (" << constant << ')' << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Filtering/ImageIntensity/test/itkRGBToLuminanceImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkRGBToLuminanceImageFilterAndAdaptorTest.cxx index 45cd1fa56d6..18fe777faf1 100644 --- a/Modules/Filtering/ImageIntensity/test/itkRGBToLuminanceImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkRGBToLuminanceImageFilterAndAdaptorTest.cxx @@ -105,7 +105,7 @@ itkRGBToLuminanceImageFilterAndAdaptorTest(int, char *[]) const auto value = static_cast(input.GetLuminance()); if (!itk::Math::FloatAlmostEqual(value, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " Luminance( " << input << ") = " << value << std::endl; std::cerr << " differs from " << output; @@ -151,9 +151,9 @@ itkRGBToLuminanceImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputPixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkSigmoidImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSigmoidImageFilterTest.cxx index 97dedace41c..d5501cef9ea 100644 --- a/Modules/Filtering/ImageIntensity/test/itkSigmoidImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkSigmoidImageFilterTest.cxx @@ -117,7 +117,7 @@ itkSigmoidImageFilterTest(int, char *[]) const auto sigmoid = static_cast(x2); if (!itk::Math::FloatAlmostEqual(sigmoid, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " simoid( " << input << ") = " << sigmoid << std::endl; std::cerr << " differs from " << output; diff --git a/Modules/Filtering/ImageIntensity/test/itkSinImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSinImageFilterAndAdaptorTest.cxx index 359a9c2862e..88e97e8ed5d 100644 --- a/Modules/Filtering/ImageIntensity/test/itkSinImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkSinImageFilterAndAdaptorTest.cxx @@ -97,7 +97,7 @@ itkSinImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType sinus = std::sin(input); if (!itk::Math::FloatAlmostEqual(sinus, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::sin( " << input << ") = " << sinus << std::endl; std::cerr << " differs from " << output; @@ -143,9 +143,9 @@ itkSinImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; std::cerr << " differs from 0 "; diff --git a/Modules/Filtering/ImageIntensity/test/itkSqrtImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSqrtImageFilterAndAdaptorTest.cxx index c2267e85ec5..4bb0b3ad03b 100644 --- a/Modules/Filtering/ImageIntensity/test/itkSqrtImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkSqrtImageFilterAndAdaptorTest.cxx @@ -97,7 +97,7 @@ itkSqrtImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType sqroot = std::sqrt(input); if (!itk::Math::FloatAlmostEqual(sqroot, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " sqrt( " << input << ") = " << sqroot << std::endl; std::cerr << " differs from " << output; @@ -142,7 +142,7 @@ itkSqrtImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkSquareImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkSquareImageFilterTest.cxx index b0cbd4ccb18..c0f36c0eb41 100644 --- a/Modules/Filtering/ImageIntensity/test/itkSquareImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkSquareImageFilterTest.cxx @@ -103,7 +103,7 @@ itkSquareImageFilterTest(int, char *[]) const auto square = static_cast(x2); if (!itk::Math::FloatAlmostEqual(square, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error in itkSquareImageFilterTest " << std::endl; std::cerr << " square( " << input << ") = " << square << std::endl; std::cerr << " differs from " << output; diff --git a/Modules/Filtering/ImageIntensity/test/itkTanImageFilterAndAdaptorTest.cxx b/Modules/Filtering/ImageIntensity/test/itkTanImageFilterAndAdaptorTest.cxx index fe51f1d7479..e8c18d246d9 100644 --- a/Modules/Filtering/ImageIntensity/test/itkTanImageFilterAndAdaptorTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkTanImageFilterAndAdaptorTest.cxx @@ -96,7 +96,7 @@ itkTanImageFilterAndAdaptorTest(int, char *[]) const OutputImageType::PixelType tangent = std::tan(input); if (!itk::Math::FloatAlmostEqual(tangent, output, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << " std::tan( " << input << ") = " << tangent << std::endl; std::cerr << " differs from " << output; @@ -140,7 +140,7 @@ itkTanImageFilterAndAdaptorTest(int, char *[]) while (!dt.IsAtEnd()) { const OutputImageType::PixelType diff = dt.Get(); - if (itk::Math::abs(diff) > epsilon) + if (itk::Math::Absolute(diff) > epsilon) { std::cerr << "Error comparing results with Adaptors" << std::endl; std::cerr << " difference = " << diff << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeSquaredImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeSquaredImageFilterTest.cxx index 36d5cd39e08..c123f19e511 100644 --- a/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeSquaredImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkTernaryMagnitudeSquaredImageFilterTest.cxx @@ -127,7 +127,7 @@ itkTernaryMagnitudeSquaredImageFilterTest(int, char *[]) static_cast(it1.Get() * it1.Get() + it2.Get() * it2.Get() + it3.Get() * it3.Get()); if (!itk::Math::FloatAlmostEqual(oIt.Get(), outputValue, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Error " << std::endl; std::cerr << "Value should be " << outputValue << std::endl; std::cerr << "but is " << oIt.Get() << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkVectorExpandImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkVectorExpandImageFilterTest.cxx index b08980bc3eb..1e6cbae302e 100644 --- a/Modules/Filtering/ImageIntensity/test/itkVectorExpandImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkVectorExpandImageFilterTest.cxx @@ -189,7 +189,7 @@ itkVectorExpandImageFilterTest(int, char *[]) unsigned int k = 0; for (; k < VectorDimension; ++k) { - if (itk::Math::abs(baseValue * vectorCoeff[k] - value[k]) > 1e-4) + if (itk::Math::Absolute(baseValue * vectorCoeff[k] - value[k]) > 1e-4) { break; } diff --git a/Modules/Filtering/ImageIntensity/test/itkVectorMagnitudeImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkVectorMagnitudeImageFilterTest.cxx index 2ff9c59e4d9..5a01cdcad2a 100644 --- a/Modules/Filtering/ImageIntensity/test/itkVectorMagnitudeImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkVectorMagnitudeImageFilterTest.cxx @@ -91,7 +91,7 @@ itkVectorMagnitudeImageFilterTest(int, char *[]) while (!outputIterator.IsAtEnd()) { // Check if the magnitude of each pixel is 6.0 (to a small tolerance) - if (itk::Math::abs(outputIterator.Get() - 6.0) > 1e-5) + if (itk::Math::Absolute(outputIterator.Get() - 6.0) > 1e-5) { std::cerr << "Every pixel magnitude should be 6! This pixel is " << imageIterator.Get() << " and has magnitude " << outputIterator.Get() << std::endl; diff --git a/Modules/Filtering/ImageIntensity/test/itkVectorRescaleIntensityImageFilterTest.cxx b/Modules/Filtering/ImageIntensity/test/itkVectorRescaleIntensityImageFilterTest.cxx index 8f4e5fb6a86..7bdc783a13d 100644 --- a/Modules/Filtering/ImageIntensity/test/itkVectorRescaleIntensityImageFilterTest.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkVectorRescaleIntensityImageFilterTest.cxx @@ -103,7 +103,7 @@ itkVectorRescaleIntensityImageFilterTest(int, char *[]) static_cast(outputValue[k]), static_cast(pixelValue[k] * factor), 10, tolerance)) { std::cerr << "Test FAILED !" << std::endl; - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Input Pixel Value = " << pixelValue << std::endl; std::cerr << "Output Pixel Value = " << outputValue << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h b/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h index 9a0b2e2d331..16d14026022 100644 --- a/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h +++ b/Modules/Filtering/ImageLabel/include/itkScanlineFilterCommon.h @@ -232,7 +232,7 @@ class ScanlineFilterCommon SizeValueType diffSum = 0; for (unsigned int i = 1; i < OutputImageDimension; ++i) { - const SizeValueType diff = itk::Math::abs(A[i] - B[i]); + const SizeValueType diff = itk::Math::Absolute(A[i] - B[i]); if (diff > 1) { return false; diff --git a/Modules/Filtering/ImageSources/test/itkGaborKernelFunctionTest.cxx b/Modules/Filtering/ImageSources/test/itkGaborKernelFunctionTest.cxx index 497e78e092a..ac6da3e5c5b 100644 --- a/Modules/Filtering/ImageSources/test/itkGaborKernelFunctionTest.cxx +++ b/Modules/Filtering/ImageSources/test/itkGaborKernelFunctionTest.cxx @@ -53,7 +53,7 @@ itkGaborKernelFunctionTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) double result = gabor->Evaluate(point); if (!itk::Math::FloatAlmostEqual(expectedValue, result, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in Evaluate at point " << point << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; @@ -69,7 +69,7 @@ itkGaborKernelFunctionTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) result = gabor->Evaluate(point); if (!itk::Math::FloatAlmostEqual(expectedValue, result, 10, tolerance)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(tolerance)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(tolerance)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in Evaluate at point " << point << std::endl; std::cerr << "Expected value " << expectedValue << std::endl; diff --git a/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h b/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h index a93df0372e6..26d5e0e9c8a 100644 --- a/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h +++ b/Modules/Filtering/ImageStatistics/include/itkAdaptiveEqualizationHistogram.h @@ -142,7 +142,7 @@ class AdaptiveEqualizationHistogram { // Calculate cumulative function const RealType s = itk::Math::sgn(u - v); - const RealType ad = itk::Math::abs(2.0 * (u - v)); + const RealType ad = itk::Math::Absolute(2.0 * (u - v)); return 0.5 * s * std::pow(ad, m_Alpha) - m_Beta * 0.5 * s * ad + m_Beta * u; } diff --git a/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx b/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx index 38dd68c4c6e..0f36cdfceb5 100644 --- a/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkImageMomentsTest.cxx @@ -215,26 +215,26 @@ itkImageMomentsTest(int argc, char * argv[]) /* Compute and report max abs error in computed */ - const double tmerr = itk::Math::abs(ttm - ctm); // Error in total mass - double cgerr = 0.0; // Error in center of gravity - double pmerr = 0.0; // Error in moments - double paerr = 0.0; // Error in axes + const double tmerr = itk::Math::Absolute(ttm - ctm); // Error in total mass + double cgerr = 0.0; // Error in center of gravity + double pmerr = 0.0; // Error in moments + double paerr = 0.0; // Error in axes for (int i = 0; i < 3; ++i) { - if (itk::Math::abs(ccg[i] - tcg[i]) > cgerr) + if (itk::Math::Absolute(ccg[i] - tcg[i]) > cgerr) { - cgerr = itk::Math::abs(ccg[i] - tcg[i]); + cgerr = itk::Math::Absolute(ccg[i] - tcg[i]); } - if (itk::Math::abs(cpm[i] - tpm[i]) > pmerr) + if (itk::Math::Absolute(cpm[i] - tpm[i]) > pmerr) { - pmerr = itk::Math::abs(cpm[i] - tpm[i]); + pmerr = itk::Math::Absolute(cpm[i] - tpm[i]); } for (int j = 0; j < 3; ++j) { - if (itk::Math::abs(cpa[i][j] - tpa[i][j]) > paerr) + if (itk::Math::Absolute(cpa[i][j] - tpa[i][j]) > paerr) { - paerr = itk::Math::abs(cpa[i][j] - tpa[i][j]); + paerr = itk::Math::Absolute(cpa[i][j] - tpa[i][j]); } } } diff --git a/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx b/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx index 34e45a2c3ff..454a1cbe6ec 100644 --- a/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx +++ b/Modules/Filtering/ImageStatistics/test/itkStatisticsImageFilterTest.cxx @@ -129,7 +129,7 @@ itkStatisticsImageFilterTest(int argc, char * argv[]) const double expectedSigma = std::sqrt((maxValue - minValue) * (maxValue - minValue) / 12.0); constexpr double epsilon{ (maxValue - minValue) * .001 }; - if (itk::Math::abs(filter->GetSigma() - expectedSigma) > epsilon) + if (itk::Math::Absolute(filter->GetSigma() - expectedSigma) > epsilon) { std::cerr << "GetSigma failed! Got " << filter->GetSigma() << " but expected " << expectedSigma << std::endl; } @@ -160,15 +160,15 @@ itkStatisticsImageFilterTest(int argc, char * argv[]) ITK_TRY_EXPECT_NO_EXCEPTION(dfilter->UpdateLargestPossibleRegion()); const double testMean = dfilter->GetMean(); const double testVariance = dfilter->GetVariance(); - double diff = itk::Math::abs(testMean - knownMean); - if ((diff != 0.0 && knownMean != 0.0) && diff / itk::Math::abs(knownMean) > .01) + double diff = itk::Math::Absolute(testMean - knownMean); + if ((diff != 0.0 && knownMean != 0.0) && diff / itk::Math::Absolute(knownMean) > .01) { std::cout << "Expected mean is " << knownMean << ", computed mean is " << testMean << std::endl; return EXIT_FAILURE; } std::cout << "Expected mean is " << knownMean << ", computed mean is " << testMean << std::endl; - diff = itk::Math::abs(testVariance - knownVariance); - if ((diff != 0.0 && knownVariance != 0.0) && diff / itk::Math::abs(knownVariance) > .1) + diff = itk::Math::Absolute(testVariance - knownVariance); + if ((diff != 0.0 && knownVariance != 0.0) && diff / itk::Math::Absolute(knownVariance) > .1) { std::cout << "Expected variance is " << knownVariance << ", computed variance is " << testVariance << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx index 80c488cfb80..9e31b142568 100644 --- a/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkShapeLabelMapFilter.hxx @@ -555,7 +555,7 @@ ShapeLabelMapFilter::ComputePerimeter(LabelObjectType * lab no[0] = 0; for (unsigned int i = 0; i < ImageDimension - 1; ++i) { - no[i + 1] = itk::Math::abs(lno[i]); + no[i + 1] = itk::Math::Absolute(lno[i]); } OffsetType dno = no; // offset for the diagonal dno[0] = 1; @@ -863,7 +863,7 @@ ShapeLabelMapFilter::ComputeOrientedBoundingBox(LabelObject Vector rsize; for (unsigned int i = 0; i < ImageDimension; ++i) { - rsize[i] = itk::Math::abs(maximumPrincipalAxis[i] - minimumPrincipalAxis[i]); + rsize[i] = itk::Math::Absolute(maximumPrincipalAxis[i] - minimumPrincipalAxis[i]); } diff --git a/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.hxx b/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.hxx index ba86e2e4893..068aa58eb92 100644 --- a/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.hxx +++ b/Modules/Filtering/LabelMap/include/itkStatisticsLabelMapFilter.hxx @@ -158,13 +158,13 @@ StatisticsLabelMapFilter::ThreadedProcessLabelObject(Labe const double sigma = std::sqrt(variance); const double mean2 = mean * mean; double skewness = 0.0; - if (itk::Math::abs(variance * sigma) > itk::NumericTraits::min()) + if (itk::Math::Absolute(variance * sigma) > itk::NumericTraits::min()) { skewness = ((sum3 - 3.0 * mean * sum2) / totalFreq + 2.0 * mean * mean2) / (variance * sigma); } double kurtosis = 0.0; - if (itk::Math::abs(variance) > itk::NumericTraits::min()) + if (itk::Math::Absolute(variance) > itk::NumericTraits::min()) { kurtosis = ((sum4 - 4.0 * mean * sum3 + 6.0 * mean2 * sum2) / totalFreq - 3.0 * mean2 * mean2) / (variance * variance) - 3.0; diff --git a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx index 14b5c13052a..0dd6c3dcb10 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx +++ b/Modules/Filtering/MathematicalMorphology/include/itkFlatStructuringElement.hxx @@ -1163,7 +1163,7 @@ FlatStructuringElement::CheckParallel(LType NewVec) const LType LL = m_Lines[i]; LL.Normalize(); const float L = NN * LL; - if ((1.0 - itk::Math::abs(L)) < 0.000001) + if ((1.0 - itk::Math::Absolute(L)) < 0.000001) { return true; } diff --git a/Modules/Filtering/MathematicalMorphology/include/itkSharedMorphologyUtilities.hxx b/Modules/Filtering/MathematicalMorphology/include/itkSharedMorphologyUtilities.hxx index 6139c1c93c4..85a24290b58 100644 --- a/Modules/Filtering/MathematicalMorphology/include/itkSharedMorphologyUtilities.hxx +++ b/Modules/Filtering/MathematicalMorphology/include/itkSharedMorphologyUtilities.hxx @@ -99,7 +99,7 @@ ComputeStartEnd(const typename TImage::IndexType StartIndex, unsigned int perpdir = 0; for (unsigned int i = 0; i < TImage::RegionType::ImageDimension; ++i) { - const auto abs_line_elmt_tmp = itk::Math::abs(line[i]); + const auto abs_line_elmt_tmp = itk::Math::Absolute(line[i]); if (abs_line_elmt_tmp > domdir) { domdir = abs_line_elmt_tmp; @@ -138,8 +138,8 @@ ComputeStartEnd(const typename TImage::IndexType StartIndex, } } } - int sPos = static_cast(Tnear * itk::Math::abs(line[perpdir]) + 0.5); - int ePos = static_cast(Tfar * itk::Math::abs(line[perpdir]) + 0.5); + int sPos = static_cast(Tnear * itk::Math::Absolute(line[perpdir]) + 0.5); + int ePos = static_cast(Tfar * itk::Math::Absolute(line[perpdir]) + 0.5); // std::cout << Tnear << ' ' << Tfar << std::endl; if (Tfar < Tnear) // seems to need some margin @@ -327,7 +327,7 @@ MakeEnlargedFace(const typename TInputImage::ConstPointer itkNotUsed(input), // figure out the dominant direction of the line for (unsigned int i = 0; i < TInputImage::RegionType::ImageDimension; ++i) { - const auto abs_line_elmt_tmp = itk::Math::abs(line[i]); + const auto abs_line_elmt_tmp = itk::Math::Absolute(line[i]); if (abs_line_elmt_tmp > MaxComp) { MaxComp = abs_line_elmt_tmp; @@ -386,11 +386,11 @@ MakeEnlargedFace(const typename TInputImage::ConstPointer itkNotUsed(input), { if (i != NonFaceDim) { - auto Pad = Math::Ceil(static_cast(NonFaceLen) * line[i] / itk::Math::abs(line[NonFaceDim])); + auto Pad = Math::Ceil(static_cast(NonFaceLen) * line[i] / itk::Math::Absolute(line[NonFaceDim])); if (Pad < 0) { // just increase the size - no need to change the start - NewSize[i] += itk::Math::abs(Pad) + 1; + NewSize[i] += itk::Math::Absolute(Pad) + 1; } else { @@ -446,7 +446,7 @@ GetLinePixels(const TLine line) for (unsigned int i = 0; i < TLine::Dimension; ++i) { - const float tt = itk::Math::abs(line[i] / N); + const float tt = itk::Math::Absolute(line[i] / N); if (tt > correction) { correction = tt; diff --git a/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest.cxx b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest.cxx index ffc0890ecbf..43727e7aac5 100644 --- a/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest.cxx +++ b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest.cxx @@ -246,8 +246,8 @@ ComputeAreaError(const SEType & k, unsigned int thickness) std::cout << "Expected foreground area: " << expectedForegroundArea << std::endl; std::cout << "Computed foreground area: " << computedForegroundArea << std::endl; std::cout << "Foreground area error: " - << 100 * itk::Math::abs(expectedForegroundArea - computedForegroundArea) / expectedForegroundArea << '%' - << "\n\n"; + << 100 * itk::Math::Absolute(expectedForegroundArea - computedForegroundArea) / expectedForegroundArea + << '%' << "\n\n"; return EXIT_FAILURE; } diff --git a/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.hxx b/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.hxx index 555d3b1567c..b86a7d76c60 100644 --- a/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.hxx +++ b/Modules/Filtering/Path/include/itkOrthogonalSwath2DPathFilter.hxx @@ -77,7 +77,7 @@ OrthogonalSwath2DPathFilter::GenerateData() for (unsigned int L = 0; L < m_SwathSize[1]; ++L) { // find merit for x=1 - if (itk::Math::abs(F - L) <= 1) + if (itk::Math::Absolute(F - L) <= 1) { IndexType index2; // we need a second index here index[0] = 0; @@ -122,7 +122,7 @@ OrthogonalSwath2DPathFilter::GenerateData() { for (unsigned int L = 0; L < m_SwathSize[1]; ++L) { - if (itk::Math::abs(F - L) <= 1) // only accept closed paths + if (itk::Math::Absolute(F - L) <= 1) // only accept closed paths { const double meritTemp = MeritValue(F, L, m_SwathSize[0] - 1); if (meritTemp > meritMax) diff --git a/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx b/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx index 66f7cb4bec7..f8f575ce4c0 100644 --- a/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx +++ b/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx @@ -122,14 +122,15 @@ PolyLineParametricPath::IncrementInput(InputType & input) const -> O unsigned int maxPartialDerivativeIndex = 0; for (unsigned int i = 1; i < VDimension; ++i) { - if (itk::Math::abs(partialDerivatives[i]) > itk::Math::abs(partialDerivatives[maxPartialDerivativeIndex])) + if (itk::Math::Absolute(partialDerivatives[i]) > + itk::Math::Absolute(partialDerivatives[maxPartialDerivativeIndex])) { maxPartialDerivativeIndex = i; } } // Calculate the timestep required to effect a 1 pixel change - potentialTimestep = 1.0 / itk::Math::abs(partialDerivatives[maxPartialDerivativeIndex]); + potentialTimestep = 1.0 / itk::Math::Absolute(partialDerivatives[maxPartialDerivativeIndex]); // Check to make sure the timestep doesn't put the input past the next integral timestep //(since the derivatives can change) diff --git a/Modules/Filtering/Path/test/itkContourExtractor2DImageFilterTest.cxx b/Modules/Filtering/Path/test/itkContourExtractor2DImageFilterTest.cxx index 523b8d73a3f..e2edb941df8 100644 --- a/Modules/Filtering/Path/test/itkContourExtractor2DImageFilterTest.cxx +++ b/Modules/Filtering/Path/test/itkContourExtractor2DImageFilterTest.cxx @@ -539,9 +539,9 @@ HasCorrectOutput(itkContourExtractor2DImageFilterTestNamespace::ExtractorType::P const itkContourExtractor2DImageFilterTestNamespace::MyVertexType & correctVertex = correctVertices[j]; const itkContourExtractor2DImageFilterTestNamespace::VertexType & vertex = vertices->ElementAt(j); - if (itk::Math::abs(correctVertex.first - vertex[0]) > + if (itk::Math::Absolute(correctVertex.first - vertex[0]) > itkContourExtractor2DImageFilterTestNamespace::FLOAT_EPSILON || - itk::Math::abs(correctVertex.second - vertex[1]) > + itk::Math::Absolute(correctVertex.second - vertex[1]) > itkContourExtractor2DImageFilterTestNamespace::FLOAT_EPSILON) { return false; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx index 6548ae780b4..60b2439b74f 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx @@ -75,7 +75,7 @@ itkCleanQuadEdgeMeshFilterTest(int argc, char * argv[]) const Coord obtainedValue = filter->GetRelativeTolerance(); if (!itk::Math::FloatAlmostEqual(tol, obtainedValue, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in pixel GetRelativeTolerance" << std::endl; std::cerr << "Expected value " << tol << std::endl; diff --git a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnTensorsTest.cxx b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnTensorsTest.cxx index 4d25dea6ab4..3fd75fb8971 100644 --- a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnTensorsTest.cxx +++ b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnTensorsTest.cxx @@ -112,7 +112,7 @@ itkRecursiveGaussianImageFilterOnTensorsTest(int, char *[]) index[0] = 4; index[1] = 4; cit.SetIndex(index); - if (itk::Math::abs(cit.Get()(0, 0) - 0.160313) > tolerance) + if (itk::Math::Absolute(cit.Get()(0, 0) - 0.160313) > tolerance) { std::cout << "[FAILED] Tensor(0,0) at index (4,4) must be 0.1603 but is " << cit.Get()(0, 0) << std::endl; return EXIT_FAILURE; @@ -121,7 +121,7 @@ itkRecursiveGaussianImageFilterOnTensorsTest(int, char *[]) index[0] = 6; index[1] = 6; cit.SetIndex(index); - if (itk::Math::abs(cit.Get()(3, 3) - 0.0026944) > tolerance) + if (itk::Math::Absolute(cit.Get()(3, 3) - 0.0026944) > tolerance) { std::cout << "[FAILED] Tensor(3,3) at index (6,6) must be 0.0026944 but is " << cit.Get()(3, 3) << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnVectorImageTest.cxx b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnVectorImageTest.cxx index 5256eb1f52c..e6fe5ce88ab 100644 --- a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnVectorImageTest.cxx +++ b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterOnVectorImageTest.cxx @@ -98,7 +98,7 @@ itkRecursiveGaussianImageFilterOnVectorImageTest(int, char *[]) index[0] = 4; index[1] = 4; cit.SetIndex(index); - if (itk::Math::abs(cit.Get()[0] - 0.160313) > tolerance) + if (itk::Math::Absolute(cit.Get()[0] - 0.160313) > tolerance) { std::cout << "[FAILED] Tensor(0,0) at index (4,4) must be 0.1603 but is " << cit.Get()[0] << std::endl; return EXIT_FAILURE; @@ -107,7 +107,7 @@ itkRecursiveGaussianImageFilterOnVectorImageTest(int, char *[]) index[0] = 6; index[1] = 6; cit.SetIndex(index); - if (itk::Math::abs(cit.Get()[3] - 0.0026944) > tolerance) + if (itk::Math::Absolute(cit.Get()[3] - 0.0026944) > tolerance) { std::cout << "[FAILED] Tensor(3,3) at index (6,6) must be 0.0026944 but is " << cit.Get()[3] << std::endl; return EXIT_FAILURE; diff --git a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterTest.cxx b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterTest.cxx index 0a8aac57d15..be8673fe866 100644 --- a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterTest.cxx +++ b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianImageFilterTest.cxx @@ -224,7 +224,7 @@ itkRecursiveGaussianImageFilterTest(int, char *[]) // note: for scale space normalization, no scaling should occur // The additional scale-space testing is performed in a separate // test. - if (itk::Math::abs(valueB - valueA) > 1e-4) + if (itk::Math::Absolute(valueB - valueA) > 1e-4) { std::cout << "FAILED !" << std::endl; std::cerr << "Error, Normalization across scales is failing" << std::endl; @@ -270,7 +270,7 @@ itkRecursiveGaussianImageFilterTest(int, char *[]) // 1000.0 is the value of the impulse // compute absolute normalized error - const double error = itk::Math::abs(total - 1000.0) / 1000.0; + const double error = itk::Math::Absolute(total - 1000.0) / 1000.0; if (error > 1e-3) { std::cout << "FAILED !" << std::endl; diff --git a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianScaleSpaceTest1.cxx b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianScaleSpaceTest1.cxx index 0778d0806b1..bd6c0429f2e 100644 --- a/Modules/Filtering/Smoothing/test/itkRecursiveGaussianScaleSpaceTest1.cxx +++ b/Modules/Filtering/Smoothing/test/itkRecursiveGaussianScaleSpaceTest1.cxx @@ -114,10 +114,10 @@ NormalizeSineWave(double frequencyPerImage, unsigned int order, double pixelSpac while (!oiter.IsAtEnd()) { - if (maxLx < oiter.Get() * scaleFactor && itk::Math::abs(maxLx - oiter.Get() * scaleFactor) > tol) + if (maxLx < oiter.Get() * scaleFactor && itk::Math::Absolute(maxLx - oiter.Get() * scaleFactor) > tol) { std::cout << "FAIL: For period: " << 1.0 / frequency << " maxLx: " << maxLx - << " tolerance exceeded by: " << itk::Math::abs(maxLx - oiter.Get() * scaleFactor) << std::endl; + << " tolerance exceeded by: " << itk::Math::Absolute(maxLx - oiter.Get() * scaleFactor) << std::endl; return false; } ++oiter; @@ -130,10 +130,10 @@ NormalizeSineWave(double frequencyPerImage, unsigned int order, double pixelSpac while (!oiter.IsAtEnd()) { - if (maxLx < oiter.Get() * scaleFactor && itk::Math::abs(maxLx - oiter.Get() * scaleFactor) > tol) + if (maxLx < oiter.Get() * scaleFactor && itk::Math::Absolute(maxLx - oiter.Get() * scaleFactor) > tol) { std::cout << "FAIL: For period: " << 1.0 / frequency << " maxLx: " << maxLx - << " tolerance exceeded by: " << itk::Math::abs(maxLx - oiter.Get() * scaleFactor) << std::endl; + << " tolerance exceeded by: " << itk::Math::Absolute(maxLx - oiter.Get() * scaleFactor) << std::endl; return false; } ++oiter; @@ -142,7 +142,7 @@ NormalizeSineWave(double frequencyPerImage, unsigned int order, double pixelSpac std::cout << "f: " << frequencyPerImage << " max: " << maxLx << " expected max: " << expected_max << std::endl; - if (itk::Math::abs(maxLx - expected_max) > .01) + if (itk::Math::Absolute(maxLx - expected_max) > .01) { std::cout << "FAIL: tolerance of expected max exceeded!" << std::endl; } diff --git a/Modules/Filtering/Smoothing/test/itkSmoothingRecursiveGaussianImageFilterTest.cxx b/Modules/Filtering/Smoothing/test/itkSmoothingRecursiveGaussianImageFilterTest.cxx index 3cfaf72a969..f406b2416e8 100644 --- a/Modules/Filtering/Smoothing/test/itkSmoothingRecursiveGaussianImageFilterTest.cxx +++ b/Modules/Filtering/Smoothing/test/itkSmoothingRecursiveGaussianImageFilterTest.cxx @@ -78,7 +78,7 @@ InPlaceTest(char * inputFilename, bool normalizeAcrossScale, typename TFilter::S { if (!itk::Math::FloatAlmostEqual(static_cast(it1.Get()), static_cast(it2.Get()), 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in pixel value at index [" << std::endl; std::cerr << "Error in pixel value at index [" << it1.ComputeIndex() << ']' << std::endl; diff --git a/Modules/Filtering/Thresholding/include/itkKittlerIllingworthThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkKittlerIllingworthThresholdCalculator.hxx index efc3fa404f6..8552cd33c00 100644 --- a/Modules/Filtering/Thresholding/include/itkKittlerIllingworthThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkKittlerIllingworthThresholdCalculator.hxx @@ -119,7 +119,7 @@ KittlerIllingworthThresholdCalculator::GenerateData() const double Bs1 = B(size - 1); const double Cs1 = C(size - 1); - if (itk::Math::abs(As1) < itk::Math::eps) + if (itk::Math::Absolute(As1) < itk::Math::eps) { itkGenericExceptionMacro("As1 = 0."); } @@ -131,13 +131,13 @@ KittlerIllingworthThresholdCalculator::GenerateData() const double Bt = B(threshold); const double Ct = C(threshold); - if (itk::Math::abs(At) < itk::Math::eps) + if (itk::Math::Absolute(At) < itk::Math::eps) { itkGenericExceptionMacro("At = 0."); } const double mu = Bt / At; - if (itk::Math::abs(As1 - At) < itk::Math::eps) + if (itk::Math::Absolute(As1 - At) < itk::Math::eps) { itkWarningMacro("KittlerIllingworthThresholdCalculator: not converging: As1 = At = " << At); break; @@ -155,12 +155,12 @@ KittlerIllingworthThresholdCalculator::GenerateData() itkGenericExceptionMacro("sigma2 <= 0"); } - if (itk::Math::abs(tau2) < itk::Math::eps) + if (itk::Math::Absolute(tau2) < itk::Math::eps) { itkGenericExceptionMacro("tau2 = 0"); } - if (itk::Math::abs(p) < itk::Math::eps) + if (itk::Math::Absolute(p) < itk::Math::eps) { itkGenericExceptionMacro("p = 0"); } @@ -178,7 +178,7 @@ KittlerIllingworthThresholdCalculator::GenerateData() break; } - if (itk::Math::abs(w0) < itk::Math::eps) + if (itk::Math::Absolute(w0) < itk::Math::eps) { const double temp = -w2 / w1; diff --git a/Modules/Filtering/Thresholding/include/itkLiThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkLiThresholdCalculator.hxx index aadbe4919d2..1d3ac76af94 100644 --- a/Modules/Filtering/Thresholding/include/itkLiThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkLiThresholdCalculator.hxx @@ -139,7 +139,7 @@ LiThresholdCalculator::GenerateData() new_thresh += bin_min; - } while (itk::Math::abs(new_thresh - old_thresh) > tolerance); + } while (itk::Math::Absolute(new_thresh - old_thresh) > tolerance); this->GetOutput()->Set(static_cast(histogram->GetMeasurement(histthresh, 0))); } diff --git a/Modules/Filtering/Thresholding/include/itkMaximumEntropyThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkMaximumEntropyThresholdCalculator.hxx index fe4dbae0cfb..2ec3e8de487 100644 --- a/Modules/Filtering/Thresholding/include/itkMaximumEntropyThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkMaximumEntropyThresholdCalculator.hxx @@ -67,7 +67,7 @@ MaximumEntropyThresholdCalculator::GenerateData() int first_bin = 0; for (int ih = 0; static_cast(ih) < size; ++ih) { - if (!(itk::Math::abs(P1[ih]) < tolerance)) + if (!(itk::Math::Absolute(P1[ih]) < tolerance)) { first_bin = ih; break; @@ -78,7 +78,7 @@ MaximumEntropyThresholdCalculator::GenerateData() int last_bin = size - 1; for (int ih = size - 1; ih >= first_bin; ih--) { - if (!(itk::Math::abs(P2[ih]) < tolerance)) + if (!(itk::Math::Absolute(P2[ih]) < tolerance)) { last_bin = ih; break; diff --git a/Modules/Filtering/Thresholding/include/itkRenyiEntropyThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkRenyiEntropyThresholdCalculator.hxx index 018ae2f0a5e..5f9d2e04b88 100644 --- a/Modules/Filtering/Thresholding/include/itkRenyiEntropyThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkRenyiEntropyThresholdCalculator.hxx @@ -69,7 +69,7 @@ RenyiEntropyThresholdCalculator::GenerateData() m_FirstBin = 0; for (ih = 0; ih < m_Size; ++ih) { - if (!(itk::Math::abs(P1[ih]) < tolerance)) + if (!(itk::Math::Absolute(P1[ih]) < tolerance)) { m_FirstBin = ih; break; @@ -80,7 +80,7 @@ RenyiEntropyThresholdCalculator::GenerateData() m_LastBin = static_cast(m_Size - 1); for (ih = m_Size - 1; ih >= m_FirstBin; ih--) { - if (!(itk::Math::abs(P2[ih]) < tolerance)) + if (!(itk::Math::Absolute(P2[ih]) < tolerance)) { m_LastBin = ih; break; @@ -119,9 +119,9 @@ RenyiEntropyThresholdCalculator::GenerateData() // Adjust beta values. // Note that t_star1, t_star2, t_star3 are unsigned int. - if (itk::Math::abs(static_cast(t_star1) - static_cast(t_star2)) <= 5.) + if (itk::Math::Absolute(static_cast(t_star1) - static_cast(t_star2)) <= 5.) { - if (itk::Math::abs(static_cast(t_star2) - static_cast(t_star3)) <= 5.) + if (itk::Math::Absolute(static_cast(t_star2) - static_cast(t_star3)) <= 5.) { beta1 = 1.; beta2 = 2.; @@ -136,7 +136,7 @@ RenyiEntropyThresholdCalculator::GenerateData() } else { - if (itk::Math::abs(static_cast(t_star2) - static_cast(t_star3)) <= 5.) + if (itk::Math::Absolute(static_cast(t_star2) - static_cast(t_star3)) <= 5.) { beta1 = 3.; beta2 = 1.; diff --git a/Modules/Filtering/Thresholding/include/itkShanbhagThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkShanbhagThresholdCalculator.hxx index aaefde2fa47..7c75a2d999d 100644 --- a/Modules/Filtering/Thresholding/include/itkShanbhagThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkShanbhagThresholdCalculator.hxx @@ -67,7 +67,7 @@ ShanbhagThresholdCalculator::GenerateData() int first_bin = 0; for (int ih = 0; static_cast(ih) < size; ++ih) { - if (!(itk::Math::abs(P1[ih]) < tolerance)) + if (!(itk::Math::Absolute(P1[ih]) < tolerance)) { first_bin = ih; break; @@ -78,7 +78,7 @@ ShanbhagThresholdCalculator::GenerateData() int last_bin = size - 1; for (int ih = size - 1; ih >= first_bin; ih--) { - if (!(itk::Math::abs(P2[ih]) < tolerance)) + if (!(itk::Math::Absolute(P2[ih]) < tolerance)) { last_bin = ih; break; @@ -111,7 +111,7 @@ ShanbhagThresholdCalculator::GenerateData() ent_obj *= term; // Total entropy - const double tot_ent = itk::Math::abs(ent_back - ent_obj); + const double tot_ent = itk::Math::Absolute(ent_back - ent_obj); if (tot_ent < min_ent) { diff --git a/Modules/Filtering/Thresholding/include/itkTriangleThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkTriangleThresholdCalculator.hxx index 4d7345b9147..d94fa996878 100644 --- a/Modules/Filtering/Thresholding/include/itkTriangleThresholdCalculator.hxx +++ b/Modules/Filtering/Thresholding/include/itkTriangleThresholdCalculator.hxx @@ -82,8 +82,8 @@ TriangleThresholdCalculator::GenerateData() // Figure out which way we are looking - we want to construct our // line between the max index and the further of 1% and 99% IndexValueType ThreshIdx = 0; - if (itk::Math::abs(static_cast(MxIdx) - static_cast(onePCIdx)) > - itk::Math::abs(static_cast(MxIdx) - static_cast(nnPCIdx))) + if (itk::Math::Absolute(static_cast(MxIdx) - static_cast(onePCIdx)) > + itk::Math::Absolute(static_cast(MxIdx) - static_cast(nnPCIdx))) { // line to 1 % const double slope = Mx / (MxIdx - onePCIdx); diff --git a/Modules/IO/CSV/test/itkCSVArray2DFileReaderTest.cxx b/Modules/IO/CSV/test/itkCSVArray2DFileReaderTest.cxx index 22dd938e20b..57f645af48c 100644 --- a/Modules/IO/CSV/test/itkCSVArray2DFileReaderTest.cxx +++ b/Modules/IO/CSV/test/itkCSVArray2DFileReaderTest.cxx @@ -52,7 +52,7 @@ testMatrix(const itk::Array2D & m1, const itk::Array2D & m2) { for (unsigned int j = 0; j < m1.cols(); ++j) { - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { pass = false; } @@ -70,7 +70,7 @@ testVector(const std::vector & v1, const std::vector & v2) for (unsigned int i = 0; i < v1.size(); ++i) { - if (itk::Math::abs(v1[i] - v2[i]) > epsilon) + if (itk::Math::Absolute(v1[i] - v2[i]) > epsilon) { pass = false; } @@ -100,7 +100,7 @@ bool testValue(const T & test, const T & real) { bool pass = true; - if (itk::Math::abs(test - real) > epsilon) + if (itk::Math::Absolute(test - real) > epsilon) { pass = false; } diff --git a/Modules/IO/CSV/test/itkCSVArray2DFileReaderWriterTest.cxx b/Modules/IO/CSV/test/itkCSVArray2DFileReaderWriterTest.cxx index 55df30a326b..1b35ebbefd2 100644 --- a/Modules/IO/CSV/test/itkCSVArray2DFileReaderWriterTest.cxx +++ b/Modules/IO/CSV/test/itkCSVArray2DFileReaderWriterTest.cxx @@ -53,7 +53,7 @@ testArray(const itk::Array2D & m1, const itk::Array2D & m2) pass = false; return pass; } - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { pass = false; return pass; diff --git a/Modules/IO/DCMTK/test/itkDCMTKImageIOMultiFrameImageTest.cxx b/Modules/IO/DCMTK/test/itkDCMTKImageIOMultiFrameImageTest.cxx index da3abfbd3fd..3a19740b93d 100644 --- a/Modules/IO/DCMTK/test/itkDCMTKImageIOMultiFrameImageTest.cxx +++ b/Modules/IO/DCMTK/test/itkDCMTKImageIOMultiFrameImageTest.cxx @@ -41,8 +41,8 @@ namespace bool CloseEnough(double a, double b) { - double diff = itk::Math::abs(a - b); - double avg = (itk::Math::abs(a) + itk::Math::abs(b)) / 2.0; + double diff = itk::Math::Absolute(a - b); + double avg = (itk::Math::Absolute(a) + itk::Math::Absolute(b)) / 2.0; if (diff == 0.0 || diff < avg / 10000.00) { return true; diff --git a/Modules/IO/DCMTK/test/itkDCMTKImageIOSpacingTest.cxx b/Modules/IO/DCMTK/test/itkDCMTKImageIOSpacingTest.cxx index 0eff3230c64..a5c8231305d 100644 --- a/Modules/IO/DCMTK/test/itkDCMTKImageIOSpacingTest.cxx +++ b/Modules/IO/DCMTK/test/itkDCMTKImageIOSpacingTest.cxx @@ -41,8 +41,8 @@ namespace bool CloseEnough(double a, double b) { - double diff = itk::Math::abs(a - b); - double avg = (itk::Math::abs(a) + itk::Math::abs(b)) / 2.0; + double diff = itk::Math::Absolute(a - b); + double avg = (itk::Math::Absolute(a) + itk::Math::Absolute(b)) / 2.0; if (diff == 0.0 || diff < avg / 10000.00) { return true; diff --git a/Modules/IO/DCMTK/test/itkDCMTKSeriesStreamReadImageWrite.cxx b/Modules/IO/DCMTK/test/itkDCMTKSeriesStreamReadImageWrite.cxx index bdc6f481c0d..3432e4ffed9 100644 --- a/Modules/IO/DCMTK/test/itkDCMTKSeriesStreamReadImageWrite.cxx +++ b/Modules/IO/DCMTK/test/itkDCMTKSeriesStreamReadImageWrite.cxx @@ -37,11 +37,11 @@ static bool IsEqualTolerant(const float lm, const float rm, double tol) { - tol = itk::Math::abs(tol); - float temp = itk::Math::abs(lm - rm); - return temp <= tol * itk::Math::abs(lm) || temp <= tol * itk::Math::abs(rm) || - (itk::Math::abs(lm) < std::numeric_limits::epsilon() && - itk::Math::abs(rm) < std::numeric_limits::epsilon()); + tol = itk::Math::Absolute(tol); + float temp = itk::Math::Absolute(lm - rm); + return temp <= tol * itk::Math::Absolute(lm) || temp <= tol * itk::Math::Absolute(rm) || + (itk::Math::Absolute(lm) < std::numeric_limits::epsilon() && + itk::Math::Absolute(rm) < std::numeric_limits::epsilon()); } int diff --git a/Modules/IO/GDCM/test/itkGDCMLoadImageSpacingTest.cxx b/Modules/IO/GDCM/test/itkGDCMLoadImageSpacingTest.cxx index effec43c18f..7b993057b2c 100644 --- a/Modules/IO/GDCM/test/itkGDCMLoadImageSpacingTest.cxx +++ b/Modules/IO/GDCM/test/itkGDCMLoadImageSpacingTest.cxx @@ -67,7 +67,7 @@ itkGDCMLoadImageSpacingTest(int argc, char * argv[]) const ImageType::Pointer image = reader->GetOutput(); std::cout << image << std::endl; ImageType::SpacingType spacing = image->GetSpacing(); - if (itk::Math::abs(spacing[0] - spacing0) >= 0.000001 || itk::Math::abs(spacing[1] - spacing1) >= 0.000001) + if (itk::Math::Absolute(spacing[0] - spacing0) >= 0.000001 || itk::Math::Absolute(spacing[1] - spacing1) >= 0.000001) { return EXIT_FAILURE; } diff --git a/Modules/IO/GDCM/test/itkGDCMSeriesStreamReadImageWriteTest.cxx b/Modules/IO/GDCM/test/itkGDCMSeriesStreamReadImageWriteTest.cxx index 7be26fc78b9..f4992d4a066 100644 --- a/Modules/IO/GDCM/test/itkGDCMSeriesStreamReadImageWriteTest.cxx +++ b/Modules/IO/GDCM/test/itkGDCMSeriesStreamReadImageWriteTest.cxx @@ -37,11 +37,11 @@ static bool IsEqualTolerant(const float lm, const float rm, double tol) { - tol = itk::Math::abs(tol); - const float temp = itk::Math::abs(lm - rm); - return temp <= tol * itk::Math::abs(lm) || temp <= tol * itk::Math::abs(rm) || - (itk::Math::abs(lm) < std::numeric_limits::epsilon() && - itk::Math::abs(rm) < std::numeric_limits::epsilon()); + tol = itk::Math::Absolute(tol); + const float temp = itk::Math::Absolute(lm - rm); + return temp <= tol * itk::Math::Absolute(lm) || temp <= tol * itk::Math::Absolute(rm) || + (itk::Math::Absolute(lm) < std::numeric_limits::epsilon() && + itk::Math::Absolute(rm) < std::numeric_limits::epsilon()); } int diff --git a/Modules/IO/ImageBase/include/itkImageSeriesReader.hxx b/Modules/IO/ImageBase/include/itkImageSeriesReader.hxx index 11d39f566a2..cba45ad6a25 100644 --- a/Modules/IO/ImageBase/include/itkImageSeriesReader.hxx +++ b/Modules/IO/ImageBase/include/itkImageSeriesReader.hxx @@ -418,7 +418,7 @@ ImageSeriesReader::GenerateData() outputSpacing[this->m_NumberOfDimensionsInImage])) // either non-uniform sampling or missing slice { nonUniformSampling = true; - spacingDeviation = itk::Math::abs(outputSpacing[this->m_NumberOfDimensionsInImage] - dirNnorm); + spacingDeviation = itk::Math::Absolute(outputSpacing[this->m_NumberOfDimensionsInImage] - dirNnorm); if (spacingDeviation > maxSpacingDeviation) { maxSpacingDeviation = spacingDeviation; diff --git a/Modules/IO/ImageBase/test/itkImageIODirection2DTest.cxx b/Modules/IO/ImageBase/test/itkImageIODirection2DTest.cxx index cb7a152a5ec..20b73f65ff5 100644 --- a/Modules/IO/ImageBase/test/itkImageIODirection2DTest.cxx +++ b/Modules/IO/ImageBase/test/itkImageIODirection2DTest.cxx @@ -69,7 +69,7 @@ itkImageIODirection2DTest(int argc, char * argv[]) const double expectedValue = std::stod(argv[element++]); const double currentValue = directionCosines[row][col]; const double difference = currentValue - expectedValue; - if (itk::Math::abs(difference) > tolerance) + if (itk::Math::Absolute(difference) > tolerance) { std::cerr << "Error: " << std::endl; std::cerr << "Expected " << expectedValue << std::endl; diff --git a/Modules/IO/ImageBase/test/itkImageIODirection3DTest.cxx b/Modules/IO/ImageBase/test/itkImageIODirection3DTest.cxx index 7ec92663f05..eb08829419d 100644 --- a/Modules/IO/ImageBase/test/itkImageIODirection3DTest.cxx +++ b/Modules/IO/ImageBase/test/itkImageIODirection3DTest.cxx @@ -69,7 +69,7 @@ itkImageIODirection3DTest(int argc, char * argv[]) const double expectedValue = std::stod(argv[element++]); const double currentValue = directionCosines[row][col]; const double difference = currentValue - expectedValue; - if (itk::Math::abs(difference) > tolerance) + if (itk::Math::Absolute(difference) > tolerance) { std::cerr << "Error: " << std::endl; std::cerr << "Expected " << expectedValue << std::endl; diff --git a/Modules/IO/ImageBase/test/itkMatrixImageWriteReadTest.cxx b/Modules/IO/ImageBase/test/itkMatrixImageWriteReadTest.cxx index cdc2b94febe..fc0a3bb613c 100644 --- a/Modules/IO/ImageBase/test/itkMatrixImageWriteReadTest.cxx +++ b/Modules/IO/ImageBase/test/itkMatrixImageWriteReadTest.cxx @@ -128,7 +128,7 @@ itkMatrixImageWriteReadTest(int argc, char * argv[]) { for (unsigned int j = 0; j < 3; ++j) { - if (itk::Math::abs(matrixPixel1[i][j] - matrixPixel2[i][j]) > tolerance) + if (itk::Math::Absolute(matrixPixel1[i][j] - matrixPixel2[i][j]) > tolerance) { std::cerr << "Matrix read does not match expected values " << std::endl; std::cerr << "Index " << tItr.ComputeIndex() << std::endl; diff --git a/Modules/IO/JPEG/src/itkJPEGImageIO.cxx b/Modules/IO/JPEG/src/itkJPEGImageIO.cxx index c3cfd17468b..1015e79ef74 100644 --- a/Modules/IO/JPEG/src/itkJPEGImageIO.cxx +++ b/Modules/IO/JPEG/src/itkJPEGImageIO.cxx @@ -550,9 +550,10 @@ JPEGImageIO::WriteSlice(const std::string & fileName, const void * const buffer) const std::array densityPerCm{ static_cast(10.0 / m_Spacing[0] + 0.5), static_cast(10.0 / m_Spacing[1] + 0.5) }; - if (itk::Math::abs(25.4 / m_Spacing[0] - densityPerInch[0]) + - itk::Math::abs(25.4 / m_Spacing[1] - densityPerInch[1]) <= - itk::Math::abs(10.0 / m_Spacing[0] - densityPerCm[0]) + itk::Math::abs(10.0 / m_Spacing[1] - densityPerCm[1])) + if (itk::Math::Absolute(25.4 / m_Spacing[0] - densityPerInch[0]) + + itk::Math::Absolute(25.4 / m_Spacing[1] - densityPerInch[1]) <= + itk::Math::Absolute(10.0 / m_Spacing[0] - densityPerCm[0]) + + itk::Math::Absolute(10.0 / m_Spacing[1] - densityPerCm[1])) { cinfo.density_unit = 1; cinfo.X_density = densityPerInch[0]; diff --git a/Modules/IO/JPEG/test/itkJPEGImageIOTest2.cxx b/Modules/IO/JPEG/test/itkJPEGImageIOTest2.cxx index e0cbe9682bf..d3aec660091 100644 --- a/Modules/IO/JPEG/test/itkJPEGImageIOTest2.cxx +++ b/Modules/IO/JPEG/test/itkJPEGImageIOTest2.cxx @@ -73,7 +73,7 @@ itkJPEGImageIOTest2(int argc, char * argv[]) constexpr double tolerance{ 1e-1 }; - if (itk::Math::abs(readSpacing[0] - spacing[0]) > tolerance) + if (itk::Math::Absolute(readSpacing[0] - spacing[0]) > tolerance) { std::cerr << "Spacing read/write failed !" << std::endl; std::cerr << "Expected spacing = " << spacing << std::endl; @@ -81,7 +81,7 @@ itkJPEGImageIOTest2(int argc, char * argv[]) return EXIT_FAILURE; } - if (itk::Math::abs(readSpacing[1] - spacing[1]) > tolerance) + if (itk::Math::Absolute(readSpacing[1] - spacing[1]) > tolerance) { std::cerr << "Spacing read/write failed !" << std::endl; std::cerr << "Expected spacing = " << spacing << std::endl; diff --git a/Modules/IO/MINC/test/itkMINCImageIOTest.cxx b/Modules/IO/MINC/test/itkMINCImageIOTest.cxx index 286390fbbba..3ee87bb6989 100644 --- a/Modules/IO/MINC/test/itkMINCImageIOTest.cxx +++ b/Modules/IO/MINC/test/itkMINCImageIOTest.cxx @@ -112,7 +112,7 @@ abs_diff(const itk::RGBPixel & pix1, const itk::RGBPixel(pix1[i] - pix2[i])); + diff += itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); } return diff; } @@ -124,7 +124,7 @@ abs_diff(const itk::RGBPixel & pix1, const itk::RGBPixel & pix2) for (int i = 0; i < 3; ++i) { - diff += itk::Math::abs(static_cast(pix1[i] - pix2[i])); + diff += itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); } return diff; } @@ -137,7 +137,7 @@ abs_diff(const itk::Vector & pix1, const itk::Vector & pix2) for (int i = 0; i < 3; ++i) { - diff += itk::Math::abs(pix1[i] - pix2[i]); + diff += itk::Math::Absolute(pix1[i] - pix2[i]); } return diff; } @@ -149,7 +149,7 @@ abs_diff(const itk::Vector & pix1, const itk::Vector & pix2) for (int i = 0; i < 3; ++i) { - diff += itk::Math::abs(pix1[i] - pix2[i]); + diff += itk::Math::Absolute(pix1[i] - pix2[i]); } return diff; } @@ -162,7 +162,7 @@ abs_diff(const itk::Vector & pix1, const itk::Vector & pix2) for (int i = 0; i < 3; ++i) { - diff += itk::Math::abs(static_cast(pix1[i] - pix2[i])); + diff += itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); } return diff; } @@ -174,7 +174,7 @@ abs_diff(const itk::Vector & pix1, const itk::Vector for (int i = 0; i < 3; ++i) { - diff += itk::Math::abs(static_cast(pix1[i] - pix2[i])); + diff += itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); } return diff; } @@ -186,7 +186,7 @@ abs_diff(const itk::Vector & pix1, const itk::Vector & pix2) for (short i = 0; i < 3; ++i) { - diff += itk::Math::abs(static_cast(pix1[i] - pix2[i])); + diff += itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); } return diff; } @@ -198,7 +198,7 @@ abs_diff(const itk::Vector & pix1, const itk::Vector(pix1[i] - pix2[i])); + diff += itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); } return diff; } @@ -232,7 +232,7 @@ template static double abs_diff(const TPixel & pix1, const TPixel & pix2) { - return itk::Math::abs(static_cast(pix1 - pix2)); + return itk::Math::Absolute(static_cast(pix1 - pix2)); } template @@ -276,7 +276,7 @@ abs_vector_diff(const itk::VariableLengthVector & pix1, const itk::Varia for (size_t i = 0; i < pix1.GetSize(); ++i) { - const double d = itk::Math::abs(static_cast(pix1[i] - pix2[i])); + const double d = itk::Math::Absolute(static_cast(pix1[i] - pix2[i])); if (d > diff) { diff = d; diff --git a/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx b/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx index c28c8801f2b..d275539ac34 100644 --- a/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx +++ b/Modules/IO/MINC/test/itkMINCImageIOTest4.cxx @@ -67,23 +67,23 @@ test_image_moments(const char * input_image, if (total > 0.0) // assume that if no total was provided this test should not be performed { constexpr double epsilon{ 1e-3 }; - if (itk::Math::abs(calculator->GetTotalMass() - total) > epsilon) + if (itk::Math::Absolute(calculator->GetTotalMass() - total) > epsilon) { std::cerr << "Total sum mismatch:" << calculator->GetTotalMass() << " difference=" << (calculator->GetTotalMass() - total) << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(calculator->GetCenterOfGravity()[0] - mx) > epsilon) + if (itk::Math::Absolute(calculator->GetCenterOfGravity()[0] - mx) > epsilon) { std::cerr << "Total mx mismatch:" << calculator->GetCenterOfGravity()[0] << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(calculator->GetCenterOfGravity()[1] - my) > epsilon) + if (itk::Math::Absolute(calculator->GetCenterOfGravity()[1] - my) > epsilon) { std::cerr << "Total my mismatch:" << calculator->GetCenterOfGravity()[1] << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(calculator->GetCenterOfGravity()[2] - mz) > epsilon) + if (itk::Math::Absolute(calculator->GetCenterOfGravity()[2] - mz) > epsilon) { std::cerr << "Total mz mismatch:" << calculator->GetCenterOfGravity()[2] << std::endl; return EXIT_FAILURE; diff --git a/Modules/IO/MINC/test/itkMINCImageIOTest_2D.cxx b/Modules/IO/MINC/test/itkMINCImageIOTest_2D.cxx index e93872755e9..2a7f5e1e3da 100644 --- a/Modules/IO/MINC/test/itkMINCImageIOTest_2D.cxx +++ b/Modules/IO/MINC/test/itkMINCImageIOTest_2D.cxx @@ -59,18 +59,18 @@ test_image_moments(const char * input_image, if (total > 0.0) // assume that if no total was provided this test should not be performed { - if (itk::Math::abs(calculator->GetTotalMass() - total) > epsilon) + if (itk::Math::Absolute(calculator->GetTotalMass() - total) > epsilon) { std::cerr << "Total sum mismatch:" << calculator->GetTotalMass() << " difference=" << (calculator->GetTotalMass() - total) << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(calculator->GetCenterOfGravity()[0] - mx) > epsilon) + if (itk::Math::Absolute(calculator->GetCenterOfGravity()[0] - mx) > epsilon) { std::cerr << "Total mx mismatch:" << calculator->GetCenterOfGravity()[0] << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(calculator->GetCenterOfGravity()[1] - my) > epsilon) + if (itk::Math::Absolute(calculator->GetCenterOfGravity()[1] - my) > epsilon) { std::cerr << "Total my mismatch:" << calculator->GetCenterOfGravity()[1] << std::endl; return EXIT_FAILURE; diff --git a/Modules/IO/Meta/test/itkMetaImageIOMetaDataTest.cxx b/Modules/IO/Meta/test/itkMetaImageIOMetaDataTest.cxx index ebfc589ebdd..58d34233ae8 100644 --- a/Modules/IO/Meta/test/itkMetaImageIOMetaDataTest.cxx +++ b/Modules/IO/Meta/test/itkMetaImageIOMetaDataTest.cxx @@ -100,14 +100,14 @@ template <> bool Equal(double & a, double & b) { - double diff(itk::Math::abs(a - b)); + double diff(itk::Math::Absolute(a - b)); if (diff == 0.0) { return true; } // base test roughly on magnitude of // arguments. - diff /= itk::Math::abs(a) + itk::Math::abs(b); + diff /= itk::Math::Absolute(a) + itk::Math::Absolute(b); if (diff > 0.000001) { return false; diff --git a/Modules/IO/Meta/test/testMetaMesh.cxx b/Modules/IO/Meta/test/testMetaMesh.cxx index 3b02bb5bd37..c1ff364a1f2 100644 --- a/Modules/IO/Meta/test/testMetaMesh.cxx +++ b/Modules/IO/Meta/test/testMetaMesh.cxx @@ -140,7 +140,7 @@ TestingMetaMesh(MetaMesh * _mesh) for (int j = 0; j < static_cast(_mesh->GetCellData().size()); ++j) { if (((*it_cd)->m_Id != j) || - (itk::Math::abs(static_cast(static_cast *>(*it_cd)->m_Data) - f) > 0.001)) + (itk::Math::Absolute(static_cast(static_cast *>(*it_cd)->m_Data) - f) > 0.001)) { std::cout << "CellData ID = " << (*it_cd)->m_Id << " : " << static_cast(static_cast *>(*it_cd)->m_Data) << " : " << f << std::endl; diff --git a/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx b/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx index 1636693ea32..4d6623b7b87 100644 --- a/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx +++ b/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx @@ -222,9 +222,9 @@ NiftiImageIO::CanWriteFile(const char * FileNameToWrite) bool NiftiImageIO::MustRescale() const { - return itk::Math::abs(this->m_RescaleSlope) > std::numeric_limits::epsilon() && - (itk::Math::abs(this->m_RescaleSlope - 1.0) > std::numeric_limits::epsilon() || - itk::Math::abs(this->m_RescaleIntercept) > std::numeric_limits::epsilon()); + return itk::Math::Absolute(this->m_RescaleSlope) > std::numeric_limits::epsilon() && + (itk::Math::Absolute(this->m_RescaleSlope - 1.0) > std::numeric_limits::epsilon() || + itk::Math::Absolute(this->m_RescaleIntercept) > std::numeric_limits::epsilon()); } namespace @@ -1032,7 +1032,7 @@ NiftiImageIO::ReadImageInformation() else { this->m_RescaleSlope = m_Holder->ptr->scl_slope; - if (itk::Math::abs(this->m_RescaleSlope) < NumericTraits::epsilon()) + if (itk::Math::Absolute(this->m_RescaleSlope) < NumericTraits::epsilon()) { this->m_RescaleSlope = 1; } @@ -1092,39 +1092,40 @@ NiftiImageIO::ReadImageInformation() case 7: this->SetDimensions(6, m_Holder->ptr->nw); // NOTE: Scaling is not defined in this dimension - this->SetSpacing(6, ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->dw) : m_Holder->ptr->dw); + this->SetSpacing(6, ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->dw) : m_Holder->ptr->dw); [[fallthrough]]; case 6: this->SetDimensions(5, m_Holder->ptr->nv); // NOTE: Scaling is not defined in this dimension - this->SetSpacing(5, ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->dv) : m_Holder->ptr->dv); + this->SetSpacing(5, ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->dv) : m_Holder->ptr->dv); [[fallthrough]]; case 5: this->SetDimensions(4, m_Holder->ptr->nu); // NOTE: Scaling is not defined in this dimension - this->SetSpacing(4, ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->du) : m_Holder->ptr->du); + this->SetSpacing(4, ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->du) : m_Holder->ptr->du); [[fallthrough]]; case 4: this->SetDimensions(3, m_Holder->ptr->nt); - this->SetSpacing( - 3, ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->dt * timingscale) : m_Holder->ptr->dt * timingscale); + this->SetSpacing(3, + ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->dt * timingscale) + : m_Holder->ptr->dt * timingscale); [[fallthrough]]; case 3: this->SetDimensions(2, m_Holder->ptr->nz); this->SetSpacing(2, - ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->dz * spacingscale) + ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->dz * spacingscale) : m_Holder->ptr->dz * spacingscale); [[fallthrough]]; case 2: this->SetDimensions(1, m_Holder->ptr->ny); this->SetSpacing(1, - ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->dy * spacingscale) + ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->dy * spacingscale) : m_Holder->ptr->dy * spacingscale); [[fallthrough]]; case 1: this->SetDimensions(0, m_Holder->ptr->nx); this->SetSpacing(0, - ignore_negative_pixdim ? itk::Math::abs(m_Holder->ptr->dx * spacingscale) + ignore_negative_pixdim ? itk::Math::Absolute(m_Holder->ptr->dx * spacingscale) : m_Holder->ptr->dx * spacingscale); break; default: @@ -1582,10 +1583,10 @@ IsAffine(const mat44 & nifti_mat) // First make sure the bottom row meets the condition that it is (0, 0, 0, 1) { - double bottom_row_error = itk::Math::abs(mat[3][3] - 1.0); + double bottom_row_error = itk::Math::Absolute(mat[3][3] - 1.0); for (int i = 0; i < 3; ++i) { - bottom_row_error += itk::Math::abs(mat[3][i]); + bottom_row_error += itk::Math::Absolute(mat[3][i]); } if (bottom_row_error > std::numeric_limits::epsilon()) { @@ -1747,15 +1748,15 @@ NiftiImageIO::SetImageIOOrientationFromNIfTI(unsigned short dims, double spacing // Ensure that the scales are approximately the same for spacing directions bool sform_scales_ok{ true }; constexpr float large_value_tolerance{ 1e-3 }; // Numerical precision of sform is not very good - if (itk::Math::abs(m_Holder->ptr->dx - rotation.get_column(0).magnitude()) > large_value_tolerance) + if (itk::Math::Absolute(m_Holder->ptr->dx - rotation.get_column(0).magnitude()) > large_value_tolerance) { sform_scales_ok = false; } - else if (itk::Math::abs(m_Holder->ptr->dy - rotation.get_column(1).magnitude()) > large_value_tolerance) + else if (itk::Math::Absolute(m_Holder->ptr->dy - rotation.get_column(1).magnitude()) > large_value_tolerance) { sform_scales_ok = false; } - else if (itk::Math::abs(m_Holder->ptr->dz - rotation.get_column(2).magnitude()) > large_value_tolerance) + else if (itk::Math::Absolute(m_Holder->ptr->dz - rotation.get_column(2).magnitude()) > large_value_tolerance) { sform_scales_ok = false; } diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h b/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h index 4b9ecce9f58..5fb46cf9a15 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest.h @@ -386,7 +386,7 @@ TestImageOfSymMats(const std::string & fname) { for (unsigned int c = 0; c < VDimension; ++c) { - if (itk::Math::abs(readback->GetDirection()[r][c] - vi->GetDirection()[r][c]) > 1e-7) + if (itk::Math::Absolute(readback->GetDirection()[r][c] - vi->GetDirection()[r][c]) > 1e-7) { std::cout << "Direction is different:\n " << readback->GetDirection() << "\n != \n" << vi->GetDirection() << std::endl; diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx index 11bf7f86439..421226a3359 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest3.cxx @@ -220,7 +220,7 @@ TestImageOfVectors(const std::string & fname, const std::string & intentCode = " { for (unsigned int c = 0; c < TDimension; ++c) { - if (itk::Math::abs(readback->GetDirection()[r][c] - vi->GetDirection()[r][c]) > 1e-7) + if (itk::Math::Absolute(readback->GetDirection()[r][c] - vi->GetDirection()[r][c]) > 1e-7) { std::cout << "Direction is different:\n " << readback->GetDirection() << "\n != \n" << vi->GetDirection() << std::endl; diff --git a/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx b/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx index 5a22d1b2ae4..d8a5f8f4ce7 100644 --- a/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiImageIOTest5.cxx @@ -121,7 +121,7 @@ SlopeInterceptTest() if (!Equal(it.Value(), static_cast(i) / 256.0)) { // return EXIT_FAILURE; - const double error = itk::Math::abs(it.Value() - (static_cast(i) / 256.0)); + const double error = itk::Math::Absolute(it.Value() - (static_cast(i) / 256.0)); if (error > maxerror) { maxerror = error; @@ -201,7 +201,7 @@ SlopeInterceptWriteTest() if (!Equal(it.Value(), static_cast(i) / 256.0 - 10.0)) { // return EXIT_FAILURE; - const double error = itk::Math::abs(it.Value() - (static_cast(i) / 256.0 - 10.0)); + const double error = itk::Math::Absolute(it.Value() - (static_cast(i) / 256.0 - 10.0)); if (error > maxerror) { maxerror = error; diff --git a/Modules/IO/NIFTI/test/itkNiftiReadWriteDirectionTest.cxx b/Modules/IO/NIFTI/test/itkNiftiReadWriteDirectionTest.cxx index c9f864fdb6e..ad57117ef6f 100644 --- a/Modules/IO/NIFTI/test/itkNiftiReadWriteDirectionTest.cxx +++ b/Modules/IO/NIFTI/test/itkNiftiReadWriteDirectionTest.cxx @@ -198,7 +198,7 @@ itkNiftiReadWriteDirectionTest(int argc, char * argv[]) { for (int c = 0; c < 3; ++c) { - const double diff = itk::Math::abs(inputImageNoSformDirection[r][c] - reReadImageDirection[r][c]); + const double diff = itk::Math::Absolute(inputImageNoSformDirection[r][c] - reReadImageDirection[r][c]); if (diff > 1e-8) { isCloseQformConverted = false; diff --git a/Modules/IO/NRRD/test/itkNrrdComplexImageReadTest.cxx b/Modules/IO/NRRD/test/itkNrrdComplexImageReadTest.cxx index b267866bf28..8d5f3a64903 100644 --- a/Modules/IO/NRRD/test/itkNrrdComplexImageReadTest.cxx +++ b/Modules/IO/NRRD/test/itkNrrdComplexImageReadTest.cxx @@ -67,44 +67,44 @@ itkNrrdComplexImageReadTest(int argc, char * argv[]) coord[0] = 0; coord[1] = 0; PixelType sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - 27.985973); - err += itk::Math::abs(sample.imag() - 0.0); + err += itk::Math::Absolute(sample.real() - 27.985973); + err += itk::Math::Absolute(sample.imag() - 0.0); coord[0] = 53; coord[1] = 43; sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - -0.94961888); - err += itk::Math::abs(sample.imag() - 0.409872); + err += itk::Math::Absolute(sample.real() - -0.94961888); + err += itk::Math::Absolute(sample.imag() - 0.409872); coord[0] = 10; coord[1] = 43; sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - -0.096564025); - err += itk::Math::abs(sample.imag() - 0.0094992276); + err += itk::Math::Absolute(sample.real() - -0.096564025); + err += itk::Math::Absolute(sample.imag() - 0.0094992276); coord[0] = 10; coord[1] = 0; sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - 0.036231704); - err += itk::Math::abs(sample.imag() - -0.016659589); + err += itk::Math::Absolute(sample.real() - 0.036231704); + err += itk::Math::Absolute(sample.imag() - -0.016659589); coord[0] = 42; coord[1] = 42; sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - -0.027012844); - err += itk::Math::abs(sample.imag() - -0.012217643); + err += itk::Math::Absolute(sample.real() - -0.027012844); + err += itk::Math::Absolute(sample.imag() - -0.012217643); coord[0] = 50; coord[1] = 40; sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - 0.44949868); - err += itk::Math::abs(sample.imag() - -0.033380687); + err += itk::Math::Absolute(sample.real() - 0.44949868); + err += itk::Math::Absolute(sample.imag() - -0.033380687); coord[0] = 8; coord[1] = 9; sample = image->GetPixel(coord); - err += itk::Math::abs(sample.real() - -0.036674671); - err += itk::Math::abs(sample.imag() - -0.0061681992); + err += itk::Math::Absolute(sample.real() - -0.036674671); + err += itk::Math::Absolute(sample.imag() - -0.0061681992); constexpr double thresh{ 0.00000038 }; if (err > thresh) diff --git a/Modules/IO/NRRD/test/itkNrrdCovariantVectorImageReadTest.cxx b/Modules/IO/NRRD/test/itkNrrdCovariantVectorImageReadTest.cxx index fa34652c09e..8b4b034153f 100644 --- a/Modules/IO/NRRD/test/itkNrrdCovariantVectorImageReadTest.cxx +++ b/Modules/IO/NRRD/test/itkNrrdCovariantVectorImageReadTest.cxx @@ -70,10 +70,10 @@ itkNrrdCovariantVectorImageReadTest(int argc, char * argv[]) { coord[0] = xi; PixelType sample = image->GetPixel(coord); - err += itk::Math::abs(sample[0] - coord[0]); - err += itk::Math::abs(sample[1] - coord[1]); - err += itk::Math::abs(sample[2] - coord[2]); - err += itk::Math::abs(sample[3] - idx); + err += itk::Math::Absolute(sample[0] - coord[0]); + err += itk::Math::Absolute(sample[1] - coord[1]); + err += itk::Math::Absolute(sample[2] - coord[2]); + err += itk::Math::Absolute(sample[3] - idx); idx++; } } diff --git a/Modules/IO/NRRD/test/itkNrrdDiffusionTensor3DImageReadTest.cxx b/Modules/IO/NRRD/test/itkNrrdDiffusionTensor3DImageReadTest.cxx index b8bd4b6cedd..304da45f7c7 100644 --- a/Modules/IO/NRRD/test/itkNrrdDiffusionTensor3DImageReadTest.cxx +++ b/Modules/IO/NRRD/test/itkNrrdDiffusionTensor3DImageReadTest.cxx @@ -65,56 +65,56 @@ itkNrrdDiffusionTensor3DImageReadTest(int argc, char * argv[]) float err = 0; myImage::IndexType coord{}; PixelType sample = image->GetPixel(coord); - err += itk::Math::abs(sample(0, 0) - 4.0248222); - err += itk::Math::abs(sample(0, 1) - -0.2367909); - err += itk::Math::abs(sample(0, 2) - 0.23370844); - err += itk::Math::abs(sample(1, 1) - 1.2593846); - err += itk::Math::abs(sample(1, 2) - -0.042955428); - err += itk::Math::abs(sample(2, 2) - -0.15239859); + err += itk::Math::Absolute(sample(0, 0) - 4.0248222); + err += itk::Math::Absolute(sample(0, 1) - -0.2367909); + err += itk::Math::Absolute(sample(0, 2) - 0.23370844); + err += itk::Math::Absolute(sample(1, 1) - 1.2593846); + err += itk::Math::Absolute(sample(1, 2) - -0.042955428); + err += itk::Math::Absolute(sample(2, 2) - -0.15239859); coord[0] = 4; coord[1] = 5; coord[2] = 6; sample = image->GetPixel(coord); - err += itk::Math::abs(sample(0, 0) - 6.3746634); - err += itk::Math::abs(sample(0, 1) - -0.10792637); - err += itk::Math::abs(sample(0, 2) - 0.078167915); - err += itk::Math::abs(sample(1, 1) - 6.2988205); - err += itk::Math::abs(sample(1, 2) - 0.40197921); - err += itk::Math::abs(sample(2, 2) - 4.8993769); + err += itk::Math::Absolute(sample(0, 0) - 6.3746634); + err += itk::Math::Absolute(sample(0, 1) - -0.10792637); + err += itk::Math::Absolute(sample(0, 2) - 0.078167915); + err += itk::Math::Absolute(sample(1, 1) - 6.2988205); + err += itk::Math::Absolute(sample(1, 2) - 0.40197921); + err += itk::Math::Absolute(sample(2, 2) - 4.8993769); coord[0] = 3; coord[1] = 3; coord[2] = 3; sample = image->GetPixel(coord); - err += itk::Math::abs(sample(0, 0) - 4.9852095); - err += itk::Math::abs(sample(0, 1) - 0.51356757); - err += itk::Math::abs(sample(0, 2) - -1.1457335); - err += itk::Math::abs(sample(1, 1) - 0.6538533); - err += itk::Math::abs(sample(1, 2) - -0.19546235); - err += itk::Math::abs(sample(2, 2) - 1.3520061); + err += itk::Math::Absolute(sample(0, 0) - 4.9852095); + err += itk::Math::Absolute(sample(0, 1) - 0.51356757); + err += itk::Math::Absolute(sample(0, 2) - -1.1457335); + err += itk::Math::Absolute(sample(1, 1) - 0.6538533); + err += itk::Math::Absolute(sample(1, 2) - -0.19546235); + err += itk::Math::Absolute(sample(2, 2) - 1.3520061); coord[0] = 3; coord[1] = 0; coord[2] = 5; sample = image->GetPixel(coord); - err += itk::Math::abs(sample(0, 0) - 6.1530757); - err += itk::Math::abs(sample(0, 1) - 0.40738893); - err += itk::Math::abs(sample(0, 2) - 0.11354899); - err += itk::Math::abs(sample(1, 1) - 5.968379); - err += itk::Math::abs(sample(1, 2) - -0.22650599); - err += itk::Math::abs(sample(2, 2) - 5.0935121); + err += itk::Math::Absolute(sample(0, 0) - 6.1530757); + err += itk::Math::Absolute(sample(0, 1) - 0.40738893); + err += itk::Math::Absolute(sample(0, 2) - 0.11354899); + err += itk::Math::Absolute(sample(1, 1) - 5.968379); + err += itk::Math::Absolute(sample(1, 2) - -0.22650599); + err += itk::Math::Absolute(sample(2, 2) - 5.0935121); coord[0] = 0; coord[1] = 3; coord[2] = 6; sample = image->GetPixel(coord); - err += itk::Math::abs(sample(0, 0) - 7.3227096); - err += itk::Math::abs(sample(0, 1) - -0.34219909); - err += itk::Math::abs(sample(0, 2) - -0.2011447); - err += itk::Math::abs(sample(1, 1) - 5.6443777); - err += itk::Math::abs(sample(1, 2) - 0.43205333); - err += itk::Math::abs(sample(2, 2) - 5.3755102); + err += itk::Math::Absolute(sample(0, 0) - 7.3227096); + err += itk::Math::Absolute(sample(0, 1) - -0.34219909); + err += itk::Math::Absolute(sample(0, 2) - -0.2011447); + err += itk::Math::Absolute(sample(1, 1) - 5.6443777); + err += itk::Math::Absolute(sample(1, 2) - 0.43205333); + err += itk::Math::Absolute(sample(2, 2) - 5.3755102); constexpr double thresh{ 0.00000041 }; if (err > thresh) diff --git a/Modules/IO/NRRD/test/itkNrrdLocaleTest.cxx b/Modules/IO/NRRD/test/itkNrrdLocaleTest.cxx index 9d670842388..a25c24d0382 100644 --- a/Modules/IO/NRRD/test/itkNrrdLocaleTest.cxx +++ b/Modules/IO/NRRD/test/itkNrrdLocaleTest.cxx @@ -105,7 +105,7 @@ itkNrrdLocaleTest(int argc, char * argv[]) // Verify spacing for (unsigned int i = 0; i < Dimension; ++i) { - if (itk::Math::abs(readSpacing[i] - spacing[i]) > 1e-6) + if (itk::Math::Absolute(readSpacing[i] - spacing[i]) > 1e-6) { std::cerr << "Spacing mismatch in C locale at index " << i << std::endl; std::cerr << "Expected: " << spacing[i] << ", Got: " << readSpacing[i] << std::endl; @@ -116,7 +116,7 @@ itkNrrdLocaleTest(int argc, char * argv[]) // Verify origin for (unsigned int i = 0; i < Dimension; ++i) { - if (itk::Math::abs(readOrigin[i] - origin[i]) > 1e-6) + if (itk::Math::Absolute(readOrigin[i] - origin[i]) > 1e-6) { std::cerr << "Origin mismatch in C locale at index " << i << std::endl; std::cerr << "Expected: " << origin[i] << ", Got: " << readOrigin[i] << std::endl; @@ -148,7 +148,7 @@ itkNrrdLocaleTest(int argc, char * argv[]) // Verify spacing - this is the critical test for (unsigned int i = 0; i < Dimension; ++i) { - if (itk::Math::abs(readSpacing[i] - spacing[i]) > 1e-6) + if (itk::Math::Absolute(readSpacing[i] - spacing[i]) > 1e-6) { std::cerr << "Spacing mismatch in de_DE locale at index " << i << std::endl; std::cerr << "Expected: " << spacing[i] << ", Got: " << readSpacing[i] << std::endl; @@ -160,7 +160,7 @@ itkNrrdLocaleTest(int argc, char * argv[]) // Verify origin for (unsigned int i = 0; i < Dimension; ++i) { - if (itk::Math::abs(readOrigin[i] - origin[i]) > 1e-6) + if (itk::Math::Absolute(readOrigin[i] - origin[i]) > 1e-6) { std::cerr << "Origin mismatch in de_DE locale at index " << i << std::endl; std::cerr << "Expected: " << origin[i] << ", Got: " << readOrigin[i] << std::endl; diff --git a/Modules/IO/NRRD/test/itkNrrdVectorImageReadTest.cxx b/Modules/IO/NRRD/test/itkNrrdVectorImageReadTest.cxx index 9c67af15f31..06bafd4daca 100644 --- a/Modules/IO/NRRD/test/itkNrrdVectorImageReadTest.cxx +++ b/Modules/IO/NRRD/test/itkNrrdVectorImageReadTest.cxx @@ -72,10 +72,10 @@ itkNrrdVectorImageReadTest(int argc, char * argv[]) { coord[0] = xi; PixelType sample = image->GetPixel(coord); - err += itk::Math::abs(sample[0] - coord[0]); - err += itk::Math::abs(sample[1] - coord[1]); - err += itk::Math::abs(sample[2] - coord[2]); - err += itk::Math::abs(sample[3] - idx); + err += itk::Math::Absolute(sample[0] - coord[0]); + err += itk::Math::Absolute(sample[1] - coord[1]); + err += itk::Math::Absolute(sample[2] - coord[2]); + err += itk::Math::Absolute(sample[3] - idx); idx++; } } diff --git a/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx b/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx index c2539932bb4..52187432102 100644 --- a/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx +++ b/Modules/IO/Siemens/src/itkSiemensVisionImageIO.cxx @@ -211,7 +211,7 @@ SiemensVisionImageIO::ReadHeader(const char * FileNameToRead) text_angle_len.end()); // Remove all whitespace if (strcmp(tmpStr, "Cor") == 0) { - if (text_angle_len.empty() || itk::Math::abs(std::stod(text_angle_len)) <= 45.0) + if (text_angle_len.empty() || itk::Math::Absolute(std::stod(text_angle_len)) <= 45.0) { // hdr->imagePlane = itk::IOCommon::ITK_ANALYZE_ORIENTATION_IRP_CORONAL; hdr->coordinateOrientation = AnatomicalOrientation(itk::AnatomicalOrientation::NegativeEnum::RSP); @@ -234,7 +234,7 @@ SiemensVisionImageIO::ReadHeader(const char * FileNameToRead) } else if (strcmp(tmpStr, "Sag") == 0) { - if (text_angle_len.empty() || itk::Math::abs(std::stod(text_angle_len)) <= 45.0) + if (text_angle_len.empty() || itk::Math::Absolute(std::stod(text_angle_len)) <= 45.0) { // hdr->imagePlane = // itk::SpatialOrientationEnums::ValidCoordinateOrientations::ITK_ANALYZE_ORIENTATION_IRP_SAGITTAL; @@ -258,7 +258,7 @@ SiemensVisionImageIO::ReadHeader(const char * FileNameToRead) } else { - if (text_angle_len.empty() || itk::Math::abs(std::stod(text_angle_len)) <= 45.0) + if (text_angle_len.empty() || itk::Math::Absolute(std::stod(text_angle_len)) <= 45.0) { // hdr->imagePlane = // itk::SpatialOrientationEnums::ValidCoordinateOrientations::ITK_ANALYZE_ORIENTATION_IRP_TRANSVERSE; diff --git a/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx b/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx index 95c977dd8a0..2d64086fae5 100644 --- a/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx +++ b/Modules/Nonunit/IntegratedTest/test/itkTriangleHelperTest.cxx @@ -80,7 +80,7 @@ itkTriangleHelperTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) return EXIT_FAILURE; } - if (itk::Math::abs(TriangleHelperType::Cotangent(a, Org, b) - 1.) > 1e-6) + if (itk::Math::Absolute(TriangleHelperType::Cotangent(a, Org, b) - 1.) > 1e-6) { return EXIT_FAILURE; } @@ -96,7 +96,7 @@ itkTriangleHelperTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) return EXIT_FAILURE; } - if (itk::Math::abs(TriangleHelperType::ComputeAngle(a, Org, b) - 0.25 * itk::Math::pi) > 1e-6) + if (itk::Math::Absolute(TriangleHelperType::ComputeAngle(a, Org, b) - 0.25 * itk::Math::pi) > 1e-6) { std::cout << "TriangleHelperType::ComputeAngle( a, Org, b ) FAILED" << std::endl; return EXIT_FAILURE; @@ -127,7 +127,7 @@ itkTriangleHelperTest(int itkNotUsed(argc), char * itkNotUsed(argv)[]) } CoordinateType area = TriangleHelperType::ComputeArea(a, Org, b); - if (itk::Math::abs(area - 0.25) > 1e-6) + if (itk::Math::Absolute(area - 0.25) > 1e-6) { std::cout << "TriangleHelperType::ComputeArea( a, Org, b ) FAILED" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.hxx b/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.hxx index 41eebcd1ad8..9325346504a 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.hxx +++ b/Modules/Nonunit/Review/include/itkMultiphaseSparseFiniteDifferenceImageFilter.hxx @@ -244,7 +244,7 @@ typename MultiphaseSparseFiniteDifferenceImageFilter itk::Math::abs(current - backward)) + if (itk::Math::Absolute(forward - current) > itk::Math::Absolute(current - backward)) { offset[j] = (forward - current) / spacing[j]; } @@ -571,7 +571,7 @@ MultiphaseSparseFiniteDifferenceImageFilterm_CurrentFunctionIndex, idx, outputIt, temp_value, bounds_status); @@ -625,7 +625,7 @@ MultiphaseSparseFiniteDifferenceImageFilter= UPPER_ACTIVE_THRESHOLD || - itk::Math::abs(temp_value) < itk::Math::abs(outputIt.GetPixel(idx))) + itk::Math::Absolute(temp_value) < itk::Math::Absolute(outputIt.GetPixel(idx))) { bool bounds_status = false; UpdatePixel(this->m_CurrentFunctionIndex, idx, outputIt, temp_value, bounds_status); @@ -704,7 +704,7 @@ MultiphaseSparseFiniteDifferenceImageFilter itk::Math::abs(center - backward)) + if (itk::Math::Absolute(forward - center) > itk::Math::Absolute(center - backward)) { dx = (forward - current) / spacing[j]; } @@ -872,8 +872,8 @@ MultiphaseSparseFiniteDifferenceImageFilter::ComputeGlobalTimeSte auto * d = (GlobalDataStruct *)GlobalData; - if (itk::Math::abs(d->m_MaxCurvatureChange) > itk::Math::eps) + if (itk::Math::Absolute(d->m_MaxCurvatureChange) > itk::Math::eps) { if (d->m_MaxAdvectionChange > itk::Math::eps) { @@ -261,7 +261,7 @@ RegionBasedLevelSetFunction::ComputeUpdate(const curvature = this->ComputeCurvature(it, offset, gd); curvature_term = this->m_CurvatureWeight * curvature * this->CurvatureSpeed(it, offset, gd) * dh; - gd->m_MaxCurvatureChange = std::max(gd->m_MaxCurvatureChange, itk::Math::abs(curvature_term)); + gd->m_MaxCurvatureChange = std::max(gd->m_MaxCurvatureChange, itk::Math::Absolute(curvature_term)); } // Computing the laplacian term @@ -291,7 +291,7 @@ RegionBasedLevelSetFunction::ComputeUpdate(const advection_term += advection_field[i] * gd->m_dx_forward[i]; } - gd->m_MaxAdvectionChange = std::max(gd->m_MaxAdvectionChange, itk::Math::abs(x_energy)); + gd->m_MaxAdvectionChange = std::max(gd->m_MaxAdvectionChange, itk::Math::Absolute(x_energy)); } advection_term *= m_AdvectionWeight * dh; } @@ -308,7 +308,7 @@ RegionBasedLevelSetFunction::ComputeUpdate(const auto updateVal = static_cast(curvature_term + laplacian_term + globalTerm + advection_term); /* If MaxGlobalChange recorded is lower than the current globalTerm */ - if (itk::Math::abs(gd->m_MaxGlobalChange) < itk::Math::abs(globalTerm)) + if (itk::Math::Absolute(gd->m_MaxGlobalChange) < itk::Math::Absolute(globalTerm)) { gd->m_MaxGlobalChange = globalTerm; } diff --git a/Modules/Nonunit/Review/include/itkStochasticFractalDimensionImageFilter.hxx b/Modules/Nonunit/Review/include/itkStochasticFractalDimensionImageFilter.hxx index 301ed3a3f9e..a137b48982b 100644 --- a/Modules/Nonunit/Review/include/itkStochasticFractalDimensionImageFilter.hxx +++ b/Modules/Nonunit/Review/include/itkStochasticFractalDimensionImageFilter.hxx @@ -150,10 +150,10 @@ StochasticFractalDimensionImageFilter::Ge bool distanceFound = false; for (unsigned int k = 0; k < distances.size(); ++k) { - if (itk::Math::abs(distances[k] - distance) < 0.5 * minSpacing) + if (itk::Math::Absolute(distances[k] - distance) < 0.5 * minSpacing) { distancesFrequency[k]++; - averageAbsoluteIntensityDifference[k] += itk::Math::abs(pixel1 - pixel2); + averageAbsoluteIntensityDifference[k] += itk::Math::Absolute(pixel1 - pixel2); distanceFound = true; break; } @@ -163,7 +163,7 @@ StochasticFractalDimensionImageFilter::Ge { distances.push_back(distance); distancesFrequency.push_back(1); - averageAbsoluteIntensityDifference.push_back(itk::Math::abs(pixel1 - pixel2)); + averageAbsoluteIntensityDifference.push_back(itk::Math::Absolute(pixel1 - pixel2)); } } } diff --git a/Modules/Nonunit/Review/test/itkLabelGeometryImageFilterTest.cxx b/Modules/Nonunit/Review/test/itkLabelGeometryImageFilterTest.cxx index 9d8b0aff2a5..cb1f27f3dbf 100644 --- a/Modules/Nonunit/Review/test/itkLabelGeometryImageFilterTest.cxx +++ b/Modules/Nonunit/Review/test/itkLabelGeometryImageFilterTest.cxx @@ -190,7 +190,7 @@ LabelGeometryImageFilterTest(std::string labelImageName, typename LabelGeometryType::RealType orientation = labelGeometryFilter->GetOrientation(labelValue); // If the orientation is very close pi, we set it to 0. - orientation = itk::Math::abs(itk::Math::pi - orientation) < epsilon ? 0 : orientation; + orientation = itk::Math::Absolute(itk::Math::pi - orientation) < epsilon ? 0 : orientation; matrix(rowIndex, columnIndex++) = orientation; rowIndex++; @@ -306,11 +306,11 @@ compareMatrices(const MatrixType & m1, const MatrixType & m2, double epsilon) pass = false; return pass; } - if (itk::Math::abs(m1[i][j] - m2[i][j]) > epsilon) + if (itk::Math::Absolute(m1[i][j] - m2[i][j]) > epsilon) { std::cout << "Matrix difference:" - << "itk::Math::abs(m2[" << i << "][" << j << "] - m1[" << i << "][" << j - << "]): " << itk::Math::abs(m1[i][j] - m2[i][j]) << std::endl; + << "itk::Math::Absolute(m2[" << i << "][" << j << "] - m1[" << i << "][" << j + << "]): " << itk::Math::Absolute(m1[i][j] - m2[i][j]) << std::endl; pass = false; return pass; } diff --git a/Modules/Nonunit/Review/test/itkOptImageToImageMetricsTest.h b/Modules/Nonunit/Review/test/itkOptImageToImageMetricsTest.h index 06161d950a0..4094cb80307 100644 --- a/Modules/Nonunit/Review/test/itkOptImageToImageMetricsTest.h +++ b/Modules/Nonunit/Review/test/itkOptImageToImageMetricsTest.h @@ -103,7 +103,7 @@ class OptImageToImageMetricsTest // endVal is 10% beyond startVal. double endVal = 1.10 * startVal; // If startVal is 0, endVal needs to be fixed up. - if (itk::Math::abs(endVal - 0.0) < 1e-8) + if (itk::Math::Absolute(endVal - 0.0) < 1e-8) { endVal = startVal + 1.0; } diff --git a/Modules/Nonunit/Review/test/itkOptMattesMutualInformationImageToImageMetricThreadsTest1.cxx b/Modules/Nonunit/Review/test/itkOptMattesMutualInformationImageToImageMetricThreadsTest1.cxx index d5bc4952ab4..35269481f84 100644 --- a/Modules/Nonunit/Review/test/itkOptMattesMutualInformationImageToImageMetricThreadsTest1.cxx +++ b/Modules/Nonunit/Review/test/itkOptMattesMutualInformationImageToImageMetricThreadsTest1.cxx @@ -159,7 +159,7 @@ itkOptMattesMutualInformationImageToImageMetricThreadsTest1(int argc, char * arg { const double difference = values[i] - values[j]; - if (itk::Math::abs(difference) > tolerance) + if (itk::Math::Absolute(difference) > tolerance) { if (verbose) { diff --git a/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx b/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx index 1f18f82ffa1..9a323e8eaee 100644 --- a/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx +++ b/Modules/Numerics/FEM/include/itkFEMImageMetricLoad.hxx @@ -178,7 +178,7 @@ ImageMetricLoad::EvaluateMetricGivenSolution(Element::ArrayType float tempe = 0.0; try { - tempe = itk::Math::abs(GetMetric(InVec)); + tempe = itk::Math::Absolute(GetMetric(InVec)); } catch (const itk::ExceptionObject &) { @@ -196,7 +196,7 @@ ImageMetricLoad::EvaluateMetricGivenSolution(Element::ArrayType } // std::cout << " def e " << defe << " sim e " << energy*m_Gamma << std::endl; - return itk::Math::abs(static_cast(energy) * static_cast(m_Gamma) - static_cast(defe)); + return itk::Math::Absolute(static_cast(energy) * static_cast(m_Gamma) - static_cast(defe)); } template @@ -245,7 +245,7 @@ ImageMetricLoad::EvaluateMetricGivenSolution1(Element::ArrayTyp float tempe = 0.0; try { - tempe = itk::Math::abs(GetMetric(InVec)); + tempe = itk::Math::Absolute(GetMetric(InVec)); } catch (const itk::ExceptionObject &) { @@ -263,7 +263,7 @@ ImageMetricLoad::EvaluateMetricGivenSolution1(Element::ArrayTyp } // std::cout << " def e " << defe << " sim e " << energy*m_Gamma << std::endl; - return itk::Math::abs(static_cast(energy) * static_cast(m_Gamma) - static_cast(defe)); + return itk::Math::Absolute(static_cast(energy) * static_cast(m_Gamma) - static_cast(defe)); } template @@ -286,7 +286,7 @@ ImageMetricLoad::Fe(VectorType Gpos, VectorType Gsol) -> Vector for (unsigned int k = 0; k < ImageDimension; ++k) { if (itk::Math::isnan(Gpos[k]) || itk::Math::isinf(Gpos[k]) || itk::Math::isnan(Gsol[k]) || - itk::Math::isinf(Gsol[k]) || itk::Math::abs(Gpos[k]) > 1.e33 || itk::Math::abs(Gsol[k]) > 1.e33) + itk::Math::isinf(Gsol[k]) || itk::Math::Absolute(Gpos[k]) > 1.e33 || itk::Math::Absolute(Gsol[k]) > 1.e33) { OutVec.set_size(ImageDimension); OutVec.fill(0.0); diff --git a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h index d29deb0dd1a..c611042148d 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h +++ b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.h @@ -184,7 +184,7 @@ class ITK_TEMPLATE_EXPORT SolverCrankNicolson : public Solver inline Float GSSign(Float a, Float b) { - return b > 0.0 ? itk::Math::abs(a) : -1. * itk::Math::abs(a); + return b > 0.0 ? itk::Math::Absolute(a) : -1. * itk::Math::Absolute(a); } inline Float GSMax(Float a, Float b) diff --git a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx index 0669bbf11ed..159ea14919b 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx +++ b/Modules/Numerics/FEM/include/itkFEMSolverCrankNicolson.hxx @@ -336,8 +336,8 @@ SolverCrankNicolson::FindBracketingTriplet(Float * a, Float * b, Flo ax = 0.0; bx = 1.; Float fc; - Float fa = itk::Math::abs(EvaluateResidual(ax)); - Float fb = itk::Math::abs(EvaluateResidual(bx)); + Float fa = itk::Math::Absolute(EvaluateResidual(ax)); + Float fb = itk::Math::Absolute(EvaluateResidual(bx)); Float ulim, u, r, q, fu, dum; @@ -353,19 +353,19 @@ SolverCrankNicolson::FindBracketingTriplet(Float * a, Float * b, Flo cx = bx + Gold * (bx - ax); // first guess for c - the 3rd pt needed to // bracket the min - fc = itk::Math::abs(EvaluateResidual(cx)); + fc = itk::Math::Absolute(EvaluateResidual(cx)); - while( fb > fc /*&& itk::Math::abs(ax) < 3. && itk::Math::abs(bx) < 3. && itk::Math::abs(cx) < + while( fb > fc /*&& itk::Math::Absolute(ax) < 3. && itk::Math::Absolute(bx) < 3. && itk::Math::Absolute(cx) < 3.*/) { r = (bx - ax) * (fb - fc); q = (bx - cx) * (fb - fa); - Float denom = (2.0 * GSSign(GSMax(itk::Math::abs(q - r), Tiny), q - r)); + Float denom = (2.0 * GSSign(GSMax(itk::Math::Absolute(q - r), Tiny), q - r)); u = (bx) - ((bx - cx) * q - (bx - ax) * r) / denom; ulim = bx + Glimit * (cx - bx); if ((bx - u) * (u - cx) > 0.0) { - fu = itk::Math::abs(EvaluateResidual(u)); + fu = itk::Math::Absolute(EvaluateResidual(u)); if (fu < fc) { ax = bx; @@ -385,11 +385,11 @@ SolverCrankNicolson::FindBracketingTriplet(Float * a, Float * b, Flo } u = cx + Gold * (cx - bx); - fu = itk::Math::abs(EvaluateResidual(u)); + fu = itk::Math::Absolute(EvaluateResidual(u)); } else if ((cx - u) * (u - ulim) > 0.0) { - fu = itk::Math::abs(EvaluateResidual(u)); + fu = itk::Math::Absolute(EvaluateResidual(u)); if (fu < fc) { bx = cx; @@ -397,18 +397,18 @@ SolverCrankNicolson::FindBracketingTriplet(Float * a, Float * b, Flo u = cx + Gold * (cx - bx); fb = fc; fc = fu; - fu = itk::Math::abs(EvaluateResidual(u)); + fu = itk::Math::Absolute(EvaluateResidual(u)); } } else if ((u - ulim) * (ulim - cx) >= 0.0) { u = ulim; - fu = itk::Math::abs(EvaluateResidual(u)); + fu = itk::Math::Absolute(EvaluateResidual(u)); } else { u = cx + Gold * (cx - bx); - fu = itk::Math::abs(EvaluateResidual(u)); + fu = itk::Math::Absolute(EvaluateResidual(u)); } ax = bx; @@ -419,7 +419,7 @@ SolverCrankNicolson::FindBracketingTriplet(Float * a, Float * b, Flo fc = fu; } - if (itk::Math::abs(ax) > 1.e3 || itk::Math::abs(bx) > 1.e3 || itk::Math::abs(cx) > 1.e3) + if (itk::Math::Absolute(ax) > 1.e3 || itk::Math::Absolute(bx) > 1.e3 || itk::Math::Absolute(cx) > 1.e3) { ax = -2.0; bx = 1.0; @@ -457,19 +457,19 @@ SolverCrankNicolson::BrentsMethod(Float tol, unsigned int MaxIters) b = ((ax > cx) ? ax : cx); x = w = v = bx; - fw = fv = fx = itk::Math::abs(EvaluateResidual(x)); + fw = fv = fx = itk::Math::Absolute(EvaluateResidual(x)); for (iter = 1; iter <= MaxIters; ++iter) { xm = 0.5 * (a + b); - tol2 = 2.0 * (tol1 = tol * itk::Math::abs(x) + ZEPS); - if (itk::Math::abs(x - xm) <= (tol2 - 0.5 * (b - a))) + tol2 = 2.0 * (tol1 = tol * itk::Math::Absolute(x) + ZEPS); + if (itk::Math::Absolute(x - xm) <= (tol2 - 0.5 * (b - a))) { xmin = x; SetEnergyToMin(xmin); return fx; } - if (itk::Math::abs(e) > tol1) + if (itk::Math::Absolute(e) > tol1) { r = (x - w) * (fx - fv); q = (x - v) * (fx - fw); @@ -479,10 +479,10 @@ SolverCrankNicolson::BrentsMethod(Float tol, unsigned int MaxIters) { p = -1. * p; } - q = itk::Math::abs(q); + q = itk::Math::Absolute(q); etemp = e; e = d; - if (itk::Math::abs(p) >= itk::Math::abs(0.5 * q * etemp) || p <= q * (a - x) || p >= q * (b - x)) + if (itk::Math::Absolute(p) >= itk::Math::Absolute(0.5 * q * etemp) || p <= q * (a - x) || p >= q * (b - x)) { d = CGOLD * (e = (x >= xm ? a - x : b - x)); } @@ -505,8 +505,8 @@ SolverCrankNicolson::BrentsMethod(Float tol, unsigned int MaxIters) d = CGOLD * (e = (x >= xm ? a - x : b - x)); } - u = (itk::Math::abs(d) >= tol1 ? x + d : x + GSSign(tol1, d)); - fu = itk::Math::abs(EvaluateResidual(u)); + u = (itk::Math::Absolute(d) >= tol1 ? x + d : x + GSSign(tol1, d)); + fu = itk::Math::Absolute(EvaluateResidual(u)); if (fu <= fx) { if (u >= x) @@ -572,7 +572,7 @@ SolverCrankNicolson::GoldenSection(Float tol, unsigned int MaxIters) x0 = ax; x3 = cx; - if (itk::Math::abs(cx - bx) > itk::Math::abs(bx - ax)) + if (itk::Math::Absolute(cx - bx) > itk::Math::Absolute(bx - ax)) { x1 = bx; x2 = bx + C * (cx - bx); @@ -582,10 +582,10 @@ SolverCrankNicolson::GoldenSection(Float tol, unsigned int MaxIters) x2 = bx; x1 = bx - C * (bx - ax); } - f1 = itk::Math::abs(EvaluateResidual(x1)); - f2 = itk::Math::abs(EvaluateResidual(x2)); + f1 = itk::Math::Absolute(EvaluateResidual(x1)); + f2 = itk::Math::Absolute(EvaluateResidual(x2)); unsigned int iters = 0; - while (itk::Math::abs(x3 - x0) > tol * (itk::Math::abs(x1) + itk::Math::abs(x2)) && iters < MaxIters) + while (itk::Math::Absolute(x3 - x0) > tol * (itk::Math::Absolute(x1) + itk::Math::Absolute(x2)) && iters < MaxIters) { ++iters; if (f2 < f1) @@ -594,7 +594,7 @@ SolverCrankNicolson::GoldenSection(Float tol, unsigned int MaxIters) x1 = x2; x2 = R * x1 + C * x3; f1 = f2; - f2 = itk::Math::abs(EvaluateResidual(x2)); + f2 = itk::Math::Absolute(EvaluateResidual(x2)); } else { @@ -602,7 +602,7 @@ SolverCrankNicolson::GoldenSection(Float tol, unsigned int MaxIters) x2 = x1; x1 = R * x2 + C * x0; f2 = f1; - f1 = itk::Math::abs(EvaluateResidual(x1)); + f1 = itk::Math::Absolute(EvaluateResidual(x1)); } } @@ -724,7 +724,7 @@ SolverCrankNicolson::EvaluateResidual(Float t) } DeformationEnergy += iSolVal * TempRowVal; } - auto Energy = (Float)itk::Math::abs(DeformationEnergy - ForceEnergy); + auto Energy = (Float)itk::Math::Absolute(DeformationEnergy - ForceEnergy); return Energy; } @@ -752,9 +752,9 @@ SolverCrankNicolson::AddToDisplacements(Float optimum) { maxs2 = CurrentSolution; } - if (itk::Math::abs(CurrentSolution) > absmax) + if (itk::Math::Absolute(CurrentSolution) > absmax) { - absmax = itk::Math::abs(CurrentSolution); + absmax = itk::Math::Absolute(CurrentSolution); } // note: set rather than add - i.e. last solution of system not total solution @@ -786,9 +786,9 @@ SolverCrankNicolson::AddToDisplacements(Float optimum) this->m_LinearSystem->AddVectorValue(i, CurrentForce, m_ForceTotalIndex); CurrentTotSolution = this->m_LinearSystem->GetSolutionValue(i, m_TotalSolutionIndex); - if (itk::Math::abs(CurrentTotSolution) > maxs) + if (itk::Math::Absolute(CurrentTotSolution) > maxs) { - maxs = itk::Math::abs(CurrentTotSolution); + maxs = itk::Math::Absolute(CurrentTotSolution); } } diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx index 36fbd97b30f..3641e9b1117 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearHexahedron.cxx @@ -216,7 +216,7 @@ Element3DC0LinearHexahedron::GetLocalFromGlobalCoordinates(const VectorType & gl // compute determinants and generate improvements Float d = this->Determinant3x3(rcol, scol, tcol); - if (itk::Math::abs(d) < 1.e-20) + if (itk::Math::Absolute(d) < 1.e-20) { return false; } @@ -226,16 +226,16 @@ Element3DC0LinearHexahedron::GetLocalFromGlobalCoordinates(const VectorType & gl localPt[2] = params[2] - this->Determinant3x3(rcol, scol, fcol) / d; // check for convergence - if (((itk::Math::abs(localPt[0] - params[0])) < CONVERGED) && - ((itk::Math::abs(localPt[1] - params[1])) < CONVERGED) && - ((itk::Math::abs(localPt[2] - params[2])) < CONVERGED)) + if (((itk::Math::Absolute(localPt[0] - params[0])) < CONVERGED) && + ((itk::Math::Absolute(localPt[1] - params[1])) < CONVERGED) && + ((itk::Math::Absolute(localPt[2] - params[2])) < CONVERGED)) { converged = 1; } // Test for bad divergence (S.Hirschberg 11.12.2001) - else if ((itk::Math::abs(localPt[0]) > DIVERGED) || (itk::Math::abs(localPt[1]) > DIVERGED) || - (itk::Math::abs(localPt[2]) > DIVERGED)) + else if ((itk::Math::Absolute(localPt[0]) > DIVERGED) || (itk::Math::Absolute(localPt[1]) > DIVERGED) || + (itk::Math::Absolute(localPt[2]) > DIVERGED)) { return false; } diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx index 6c2a6218eb5..326e2310671 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangular.cxx @@ -162,7 +162,7 @@ Element3DC0LinearTriangular::GetLocalFromGlobalCoordinates(const VectorType & gl for (int i = 0; i < 3; ++i) { - // trying to avoid an expensive call to itk::Math::abs() + // trying to avoid an expensive call to itk::Math::Absolute() Float fabsn; if (n[i] < 0) { diff --git a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx index e5818e9aa40..d6965900a36 100644 --- a/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx +++ b/Modules/Numerics/FEM/src/itkFEMElement3DC0LinearTriangularLaplaceBeltrami.cxx @@ -246,7 +246,7 @@ float cottheta1=cemag/aemag; float cottheta2=cemag/bemag; float cottheta3=1.0/tan(theta3); -// if (itk::Math::abs(cottheta1-1) < 1.e-6 && itk::Math::abs(cottheta2-1) < 1.e-6) cottheta3=1.0; +// if (itk::Math::Absolute(cottheta1-1) < 1.e-6 && itk::Math::Absolute(cottheta2-1) < 1.e-6) cottheta3=1.0; // std::cout <<" ct0 " << cottheta1 <<" ct1 " << cottheta2 <<" ct2 " << cottheta3 << std::endl; cot[na][na]=(cottheta3+cottheta2)*D[0][0]; diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx index eb062520f0e..b98d6281a4c 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearLineStressTest.cxx @@ -87,7 +87,7 @@ itkFEMElement2DC0LinearLineStressTest(int argc, char * argv[]) for (int i = 0; i < numDOF; ++i) { soln[i] = solver->GetSolution(i); - if (itk::Math::abs(expectedResult[i] - soln[i]) > 0.0000001) + if (itk::Math::Absolute(expectedResult[i] - soln[i]) > 0.0000001) { std::cout << "ERROR: Index " << i << ". Expected " << expectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainItpackTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainItpackTest.cxx index 8f729e81b36..aa3e3b53a05 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainItpackTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement2DC0LinearQuadrilateralStrainItpackTest.cxx @@ -104,7 +104,7 @@ itkFEMElement2DC0LinearQuadrilateralStrainItpackTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(expectedResult[i] - soln[i]) > 1e-9) + if (itk::Math::Absolute(expectedResult[i] - soln[i]) > 1e-9) { std::cout << "ERROR: Index " << i << ". Expected " << expectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DC1BeamTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DC1BeamTest.cxx index daf0723d915..2abad8c00fd 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement2DC1BeamTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement2DC1BeamTest.cxx @@ -91,7 +91,7 @@ itkFEMElement2DC1BeamTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(expectedResult[i] - soln[i]) > 0.0000001) + if (itk::Math::Absolute(expectedResult[i] - soln[i]) > 0.0000001) { std::cout << "ERROR: Index " << i << ". Expected " << expectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement2DTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement2DTest.cxx index 56eb6bcfe2f..66a19effa94 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement2DTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement2DTest.cxx @@ -360,7 +360,7 @@ CheckDisplacements1(Solver2DType * S, int s, double * expectedResults, double to { double result = S->GetSolution(i); // std::cout << result << ' ' << expectedResults[i] << ' ' << tolerance << std::endl; - if (itk::Math::abs(expectedResults[i] - result) > tolerance) + if (itk::Math::Absolute(expectedResults[i] - result) > tolerance) { std::cout << "ERROR: Solver " << s << " Index " << i << ". Expected " << expectedResults[i] << " Solution " << result << std::endl; diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronMembraneTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronMembraneTest.cxx index f4c2a22b1a4..87d43b9f457 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronMembraneTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronMembraneTest.cxx @@ -91,7 +91,7 @@ itkFEMElement3DC0LinearHexahedronMembraneTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(exectedResult[i] - soln[i]) > 0.0000001) + if (itk::Math::Absolute(exectedResult[i] - soln[i]) > 0.0000001) { std::cout << "ERROR: Index " << i << ". Expected " << exectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronStrainTest.cxx index 29e87947869..06e33c0f92a 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronStrainTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearHexahedronStrainTest.cxx @@ -91,7 +91,7 @@ itkFEMElement3DC0LinearHexahedronStrainTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(exectedResult[i] - soln[i]) > 0.0000001) + if (itk::Math::Absolute(exectedResult[i] - soln[i]) > 0.0000001) { std::cout << "ERROR: Index " << i << ". Expected " << exectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronMembraneTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronMembraneTest.cxx index 96fad129ff7..560471ce931 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronMembraneTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronMembraneTest.cxx @@ -84,7 +84,7 @@ itkFEMElement3DC0LinearTetrahedronMembraneTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(exectedResult[i] - soln[i]) > 0.000001) + if (itk::Math::Absolute(exectedResult[i] - soln[i]) > 0.000001) { std::cout << "ERROR: Index " << i << ". Expected " << exectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronStrainTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronStrainTest.cxx index 2857c963e2a..25e813b26ca 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronStrainTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement3DC0LinearTetrahedronStrainTest.cxx @@ -93,7 +93,7 @@ itkFEMElement3DC0LinearTetrahedronStrainTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(exectedResult[i] - soln[i]) > 0.000001) + if (itk::Math::Absolute(exectedResult[i] - soln[i]) > 0.000001) { std::cout << "ERROR: Index " << i << ". Expected " << exectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMElement3DTest.cxx b/Modules/Numerics/FEM/test/itkFEMElement3DTest.cxx index c7da26261cf..2170e56b962 100644 --- a/Modules/Numerics/FEM/test/itkFEMElement3DTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElement3DTest.cxx @@ -336,7 +336,7 @@ CheckDisplacements1(SolverType * S, int s, double * expectedResults, double tole { double result = S->GetSolution(i); // std::cout << result << ' ' << expectedResults[i] << ' ' << tolerance << std::endl; - if (itk::Math::abs(expectedResults[i] - result) > tolerance) + if (itk::Math::Absolute(expectedResults[i] - result) > tolerance) { std::cout << "ERROR: Solver " << s << " Index " << i << ". Expected " << expectedResults[i] << " Solution " << result << std::endl; diff --git a/Modules/Numerics/FEM/test/itkFEMElementTest.cxx b/Modules/Numerics/FEM/test/itkFEMElementTest.cxx index cffc61c21a2..27e4e3a96c7 100644 --- a/Modules/Numerics/FEM/test/itkFEMElementTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMElementTest.cxx @@ -558,7 +558,7 @@ CheckDisplacements(itk::fem::Solver & S, int s, char comment, double * expectedR d++) { double result = S.GetSolution(dof); - if (itk::Math::abs(result - expectedResults[index]) > tolerance) + if (itk::Math::Absolute(result - expectedResults[index]) > tolerance) { std::cout << "Error: Result (" << result << ") expected (" << expectedResults[index] << ") with tolerance (" << tolerance << ')' << std::endl; diff --git a/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTest.cxx b/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTest.cxx index 5aba4aa478f..16602ea1545 100644 --- a/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTest.cxx @@ -90,7 +90,7 @@ itkFEMLoadBCMFCTest(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(expectedResult[i] - soln[i]) > 0.0001) + if (itk::Math::Absolute(expectedResult[i] - soln[i]) > 0.0001) { std::cout << "ERROR: Index " << i << ". Expected " << expectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTestUser.cxx b/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTestUser.cxx index e100866b99c..89a288db752 100644 --- a/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTestUser.cxx +++ b/Modules/Numerics/FEM/test/itkFEMLoadBCMFCTestUser.cxx @@ -213,7 +213,7 @@ itkFEMLoadBCMFCTestUser(int, char *[]) { soln[i] = solver->GetSolution(i); // std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(expectedResult[i] - soln[i]) > 0.0001) + if (itk::Math::Absolute(expectedResult[i] - soln[i]) > 0.0001) { std::cout << "ERROR: Index " << i << ". Expected " << expectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkFEMRobustSolverTest.cxx b/Modules/Numerics/FEM/test/itkFEMRobustSolverTest.cxx index 7be2818a7ad..f686a7c9a22 100644 --- a/Modules/Numerics/FEM/test/itkFEMRobustSolverTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMRobustSolverTest.cxx @@ -297,7 +297,7 @@ itkFEMRobustSolverTest(int, char *[]) std::cout << "Solution[" << i << "]:" << solution[i] << std::endl; - if (itk::Math::abs(groundTruthSolution[i] - solution[i]) > 0.0001) + if (itk::Math::Absolute(groundTruthSolution[i] - solution[i]) > 0.0001) { std::cerr << "ERROR: Index " << i << ". Groundtruth " << groundTruthSolution[i] << " Solution " << solution[i] << std::endl; diff --git a/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx b/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx index f719d29840f..93f9711d7d3 100644 --- a/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx +++ b/Modules/Numerics/FEM/test/itkFEMSolverHyperbolicTest.cxx @@ -264,7 +264,7 @@ itkFEMSolverHyperbolicTest(int argc, char * argv[]) for (unsigned int d = 0, dof; (dof = SH->GetInput()->GetNode(i)->GetDegreeOfFreedom(d)) != invalidID; ++d) { double result = SH->GetSolution(dof); - if (itk::Math::abs(result - solution[dof]) > 1.0e-5) + if (itk::Math::Absolute(result - solution[dof]) > 1.0e-5) { std::cerr << "Error: Solution outside the expected range: " << result << ", " << dof << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/FEM/test/itkFEMSolverTest3D.cxx b/Modules/Numerics/FEM/test/itkFEMSolverTest3D.cxx index a9108eea2a5..50fd273799d 100644 --- a/Modules/Numerics/FEM/test/itkFEMSolverTest3D.cxx +++ b/Modules/Numerics/FEM/test/itkFEMSolverTest3D.cxx @@ -91,7 +91,7 @@ itkFEMSolverTest3D(int argc, char * argv[]) { soln[i] = solver->GetSolution(i); std::cout << "Solution[" << i << "]:" << soln[i] << std::endl; - if (itk::Math::abs(exectedResult[i] - soln[i]) > 0.0000001) + if (itk::Math::Absolute(exectedResult[i] - soln[i]) > 0.0000001) { std::cout << "ERROR: Index " << i << ". Expected " << exectedResult[i] << " Solution " << soln[i] << std::endl; foundError = true; diff --git a/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter2DTest.cxx b/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter2DTest.cxx index 496a7b0faaa..b00ed0fd73e 100644 --- a/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter2DTest.cxx +++ b/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter2DTest.cxx @@ -252,8 +252,8 @@ itkImageToRectilinearFEMObjectFilter2DTest(int argc, char * argv[]) loc[0] = std::stod(argv[9 + i * 3 + 1]); loc[1] = std::stod(argv[9 + i * 3 + 2]); std::cout << "Node (" << nodeNumber << ") Test " << i << ": "; - if ((itk::Math::abs(femObject->GetNode(nodeNumber)->GetCoordinates()[0] - loc[0]) > tolerance) || - (itk::Math::abs(femObject->GetNode(nodeNumber)->GetCoordinates()[1] - loc[1]) > tolerance)) + if ((itk::Math::Absolute(femObject->GetNode(nodeNumber)->GetCoordinates()[0] - loc[0]) > tolerance) || + (itk::Math::Absolute(femObject->GetNode(nodeNumber)->GetCoordinates()[1] - loc[1]) > tolerance)) { std::cout << "[FAILED]" << std::endl; std::cout << "\tExpected (" << loc[0] << ',' << loc[1] << "), Got ("; diff --git a/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter3DTest.cxx b/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter3DTest.cxx index b1b97ae2583..c17e58858cf 100644 --- a/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter3DTest.cxx +++ b/Modules/Numerics/FEM/test/itkImageToRectilinearFEMObjectFilter3DTest.cxx @@ -259,9 +259,9 @@ itkImageToRectilinearFEMObjectFilter3DTest(int argc, char * argv[]) loc[1] = std::stod(argv[11 + i * 4 + 2]); loc[2] = std::stod(argv[11 + i * 4 + 3]); std::cout << "Node (" << nodeNumber << ") Test " << i << ": "; - if ((itk::Math::abs(femObject->GetNode(nodeNumber)->GetCoordinates()[0] - loc[0]) > tolerance) || - (itk::Math::abs(femObject->GetNode(nodeNumber)->GetCoordinates()[1] - loc[1]) > tolerance) || - (itk::Math::abs(femObject->GetNode(nodeNumber)->GetCoordinates()[2] - loc[2]) > tolerance)) + if ((itk::Math::Absolute(femObject->GetNode(nodeNumber)->GetCoordinates()[0] - loc[0]) > tolerance) || + (itk::Math::Absolute(femObject->GetNode(nodeNumber)->GetCoordinates()[1] - loc[1]) > tolerance) || + (itk::Math::Absolute(femObject->GetNode(nodeNumber)->GetCoordinates()[2] - loc[2]) > tolerance)) { std::cout << "[FAILED]" << std::endl; std::cout << "\tExpected (" << loc[0] << ',' << loc[1] << ',' << loc[2] << "), Got ("; diff --git a/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx index 3b9405d8851..f977634b599 100644 --- a/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx @@ -189,7 +189,7 @@ AmoebaOptimizer::StartOptimization() InternalParametersType automaticDelta(n); for (unsigned int i = 0; i < n; ++i) { - if (itk::Math::abs(parameters[i]) > zeroTermDelta) + if (itk::Math::Absolute(parameters[i]) > zeroTermDelta) { automaticDelta[i] = relativeDiameter * parameters[i]; } @@ -222,12 +222,12 @@ AmoebaOptimizer::StartOptimization() double maxAbs = 0.0; for (unsigned int j = 0; j < n; ++j) { - if (maxAbs < itk::Math::abs(bestPosition[j] - parameters[j])) + if (maxAbs < itk::Math::Absolute(bestPosition[j] - parameters[j])) { - maxAbs = itk::Math::abs(bestPosition[j] - parameters[j]); + maxAbs = itk::Math::Absolute(bestPosition[j] - parameters[j]); } } - converged = itk::Math::abs(bestValue - currentValue) < this->m_FunctionConvergenceTolerance && + converged = itk::Math::Absolute(bestValue - currentValue) < this->m_FunctionConvergenceTolerance && maxAbs < this->m_ParametersConvergenceTolerance; // this comparison is valid both for min and max because the // adaptor is set to always return the function value diff --git a/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx index 18b7124f242..3fbe8df5ec9 100644 --- a/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx @@ -124,12 +124,12 @@ CumulativeGaussianOptimizer::FindParametersOfGaussian(MeasureType * sampledGauss averageSumOfSquaredDifferences = FindAverageSumOfSquaredDifferences(extendedArray, extendedArrayCopy); // Stop if there is a very very very small change between iterations. - if (itk::Math::abs(temp - averageSumOfSquaredDifferences) <= m_DifferenceTolerance) + if (itk::Math::Absolute(temp - averageSumOfSquaredDifferences) <= m_DifferenceTolerance) { m_StopConditionDescription.str(""); m_StopConditionDescription << this->GetNameOfClass() << ": " << "Change between iterations (" - << itk::Math::abs(temp - averageSumOfSquaredDifferences) + << itk::Math::Absolute(temp - averageSumOfSquaredDifferences) << ") is less than DifferenceTolerance (" << m_DifferenceTolerance << ")."; break; } diff --git a/Modules/Numerics/Optimizers/src/itkFRPROptimizer.cxx b/Modules/Numerics/Optimizers/src/itkFRPROptimizer.cxx index 763a7425d1e..f6251cc4349 100644 --- a/Modules/Numerics/Optimizers/src/itkFRPROptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkFRPROptimizer.cxx @@ -131,8 +131,8 @@ FRPROptimizer::StartOptimization() double fret = fp; this->LineOptimize(&p, xi, &fret, tempCoord); - if (2.0 * itk::Math::abs(fret - fp) <= - this->GetValueTolerance() * (itk::Math::abs(fret) + itk::Math::abs(fp) + FRPR_TINY)) + if (2.0 * itk::Math::Absolute(fret - fp) <= + this->GetValueTolerance() * (itk::Math::Absolute(fret) + itk::Math::Absolute(fp) + FRPR_TINY)) { if (limitCount < this->GetSpaceDimension()) { diff --git a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx index 72295c6b053..995d6aa0d7b 100644 --- a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx +++ b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx @@ -262,7 +262,7 @@ ParticleSwarmOptimizerBase::StartOptimization() for (unsigned int j = 0; j < this->m_NumberOfParticles; ++j) { parameterDiffs[j] = - itk::Math::abs(this->m_Particles[j].m_BestParameters[k] - this->m_ParametersBestValue[k]); + itk::Math::Absolute(this->m_Particles[j].m_BestParameters[k] - this->m_ParametersBestValue[k]); } std::nth_element(parameterDiffs.begin(), parameterDiffs.begin() + percentileIndex, parameterDiffs.end()); converged = converged && parameterDiffs[percentileIndex] < this->m_ParametersConvergenceTolerance[k]; diff --git a/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx index 01d403807e3..bf8a761336c 100644 --- a/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx @@ -250,10 +250,10 @@ PowellOptimizer::BracketedLineOptimize(double ax, const double middle_range = (a + b) / 2; /* Step at this iteration */ - const double tolerance1 = m_StepTolerance * itk::Math::abs(x) + POWELL_TINY; + const double tolerance1 = m_StepTolerance * itk::Math::Absolute(x) + POWELL_TINY; const double tolerance2 = 2.0 * tolerance1; - if (itk::Math::abs(x - middle_range) <= (tolerance2 - 0.5 * (b - a)) || 0.5 * (b - a) < m_StepTolerance) + if (itk::Math::Absolute(x - middle_range) <= (tolerance2 - 0.5 * (b - a)) || 0.5 * (b - a) < m_StepTolerance) { *extX = x; *extVal = functionValueOfX; @@ -268,7 +268,7 @@ PowellOptimizer::BracketedLineOptimize(double ax, double new_step = goldenSectionRatio * (x < middle_range ? b - x : a - x); /* Decide if the interpolation can be tried */ - if (itk::Math::abs(x - w) >= tolerance1) /* If x and w are distinct */ + if (itk::Math::Absolute(x - w) >= tolerance1) /* If x and w are distinct */ { const double t = (x - w) * (functionValueOfX - functionValueOfV); @@ -291,7 +291,7 @@ PowellOptimizer::BracketedLineOptimize(double ax, /* Check if x+p/q falls in [a,b] and not too close to a and b and isn't too large */ - if (itk::Math::abs(p) < itk::Math::abs(new_step * q) && p > q * (a - x + 2 * tolerance1) && + if (itk::Math::Absolute(p) < itk::Math::Absolute(new_step * q) && p > q * (a - x + 2 * tolerance1) && p < q * (b - x - 2 * tolerance1)) { new_step = p / q; /* it is accepted */ @@ -302,7 +302,7 @@ PowellOptimizer::BracketedLineOptimize(double ax, } /* Adjust the step to be not less than tolerance*/ - if (itk::Math::abs(new_step) < tolerance1) + if (itk::Math::Absolute(new_step) < tolerance1) { if (new_step > 0.0) { @@ -438,14 +438,14 @@ PowellOptimizer::StartOptimization() this->SetCurrentLinePoint(xx, fx); p = this->GetCurrentPosition(); - if (itk::Math::abs(fptt - fx) > del) + if (itk::Math::Absolute(fptt - fx) > del) { - del = itk::Math::abs(fptt - fx); + del = itk::Math::Absolute(fptt - fx); ibig = i; } } - if (2.0 * itk::Math::abs(fp - fx) <= m_ValueTolerance * (itk::Math::abs(fp) + itk::Math::abs(fx))) + if (2.0 * itk::Math::Absolute(fp - fx) <= m_ValueTolerance * (itk::Math::Absolute(fp) + itk::Math::Absolute(fx))) { m_StopConditionDescription << "Cost function values at the current parameter (" << fx << ") and at the local extrema (" << fp << ") are within Value Tolerance (" diff --git a/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx index 7d2f25415ec..9ba4c2a7c86 100644 --- a/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx @@ -370,7 +370,7 @@ SPSAOptimizer::GuessParameters(SizeValueType numberOfGradientEstimates, double i this->ComputeGradient(initialPosition, m_Gradient); for (unsigned int j = 0; j < spaceDimension; ++j) { - averageAbsoluteGradient[j] += itk::Math::abs(m_Gradient[j]); + averageAbsoluteGradient[j] += itk::Math::Absolute(m_Gradient[j]); } } averageAbsoluteGradient /= static_cast(numberOfGradientEstimates); diff --git a/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx index 0d9da62c770..e885020dbd3 100644 --- a/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkAmoebaOptimizerTest.cxx @@ -362,7 +362,7 @@ AmoebaTest1() for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > xTolerance) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > xTolerance) { pass = false; } @@ -377,7 +377,7 @@ AmoebaTest1() // Get the final value of the optimizer std::cout << "Testing optimizers GetValue() : "; OptimizerType::MeasureType finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 9.99998) > 0.01) + if (itk::Math::Absolute(finalValue + 9.99998) > 0.01) { std::cerr << "failed\n"; std::cerr << "[TEST 1 FAILURE]\n"; @@ -435,7 +435,7 @@ AmoebaTest1() for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > xTolerance) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > xTolerance) { pass = false; } @@ -450,7 +450,7 @@ AmoebaTest1() // Get the final value of the optimizer std::cout << "Testing optimizer's GetValue() [invokes additional function evaluation]: "; finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 9.99998) > 0.01) + if (itk::Math::Absolute(finalValue + 9.99998) > 0.01) { std::cerr << "failed\n"; std::cerr << "[TEST 1 FAILURE]\n"; @@ -526,7 +526,7 @@ AmoebaTest2() std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; std::cout << "Converged to local minimum." << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cerr << "[TEST 2 FAILURE]\n"; return EXIT_FAILURE; @@ -560,7 +560,7 @@ AmoebaTest2() std::cout << "Estimated parameters = " << finalParameters << std::endl; std::cout << "Converged to global minimum." << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cerr << "[TEST 2 FAILURE]\n"; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizers/test/itkConjugateGradientOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkConjugateGradientOptimizerTest.cxx index da0b5c9cadd..da1f74a53c9 100644 --- a/Modules/Numerics/Optimizers/test/itkConjugateGradientOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkConjugateGradientOptimizerTest.cxx @@ -244,7 +244,7 @@ itkConjugateGradientOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } @@ -259,7 +259,7 @@ itkConjugateGradientOptimizerTest(int, char *[]) // Get the final value of the optimizer std::cout << "Testing GetValue() : "; const OptimizerType::MeasureType finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 10.0) > 0.01) + if (itk::Math::Absolute(finalValue + 10.0) > 0.01) { std::cout << "[FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizers/test/itkCumulativeGaussianOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkCumulativeGaussianOptimizerTest.cxx index f1fc33e4c17..6dfdffc9e23 100644 --- a/Modules/Numerics/Optimizers/test/itkCumulativeGaussianOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkCumulativeGaussianOptimizerTest.cxx @@ -99,10 +99,10 @@ itkCumulativeGaussianOptimizerTest(int, char *[]) // The test passes if the difference between the given parameters and estimated parameters // is less than or equal to 0.1. - if (itk::Math::abs(optimizer->GetComputedMean() - mean) <= 0.1 && - itk::Math::abs(optimizer->GetComputedStandardDeviation() - standardDeviation) <= 0.1 && - itk::Math::abs(optimizer->GetUpperAsymptote() - upperAsymptote) <= 0.1 && - itk::Math::abs(optimizer->GetLowerAsymptote() - lowerAsymptote) <= 0.1) + if (itk::Math::Absolute(optimizer->GetComputedMean() - mean) <= 0.1 && + itk::Math::Absolute(optimizer->GetComputedStandardDeviation() - standardDeviation) <= 0.1 && + itk::Math::Absolute(optimizer->GetUpperAsymptote() - upperAsymptote) <= 0.1 && + itk::Math::Absolute(optimizer->GetLowerAsymptote() - lowerAsymptote) <= 0.1) { std::cerr << std::endl << "Test Passed with a Fit Error of " << optimizer->GetFitError() << std::endl << std::endl; diff --git a/Modules/Numerics/Optimizers/test/itkExhaustiveOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkExhaustiveOptimizerTest.cxx index 880b5b45cd1..c635ef914e3 100644 --- a/Modules/Numerics/Optimizers/test/itkExhaustiveOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkExhaustiveOptimizerTest.cxx @@ -217,12 +217,12 @@ itkExhaustiveOptimizerTest(int, char *[]) } - const bool minimumValuePass = itk::Math::abs(itkOptimizer->GetMinimumMetricValue() - -10) < 1E-3; + const bool minimumValuePass = itk::Math::Absolute(itkOptimizer->GetMinimumMetricValue() - -10) < 1E-3; std::cout << "MinimumMetricValue = " << itkOptimizer->GetMinimumMetricValue() << std::endl; std::cout << "Minimum Position = " << itkOptimizer->GetMinimumMetricValuePosition() << std::endl; - const bool maximumValuePass = itk::Math::abs(itkOptimizer->GetMaximumMetricValue() - 926) < 1E-3; + const bool maximumValuePass = itk::Math::Absolute(itkOptimizer->GetMaximumMetricValue() - 926) < 1E-3; std::cout << "MaximumMetricValue = " << itkOptimizer->GetMaximumMetricValue() << std::endl; std::cout << "Maximum Position = " << itkOptimizer->GetMaximumMetricValuePosition() << std::endl; @@ -259,7 +259,7 @@ itkExhaustiveOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { trueParamsPass = false; } diff --git a/Modules/Numerics/Optimizers/test/itkFRPROptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkFRPROptimizerTest.cxx index f92a56fd9f4..09cd5c29b59 100644 --- a/Modules/Numerics/Optimizers/test/itkFRPROptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkFRPROptimizerTest.cxx @@ -174,7 +174,7 @@ itkFRPROptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } @@ -229,7 +229,7 @@ itkFRPROptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizers/test/itkGradientDescentOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkGradientDescentOptimizerTest.cxx index 36ce52afdd1..8a2f02ff441 100644 --- a/Modules/Numerics/Optimizers/test/itkGradientDescentOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkGradientDescentOptimizerTest.cxx @@ -182,7 +182,7 @@ itkGradientDescentOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx index ac8b1130079..ac85a8a626f 100644 --- a/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkInitializationBiasedParticleSwarmOptimizerTest.cxx @@ -202,7 +202,7 @@ IBPSOTest1(typename OptimizerType::CoefficientType inertiaCoefficient, std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cout << "[Test 1 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -230,7 +230,7 @@ IBPSOTest1(typename OptimizerType::CoefficientType inertiaCoefficient, std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cout << "[Test 1 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -329,8 +329,8 @@ IBPSOTest2(typename OptimizerType::CoefficientType inertiaCoefficient, std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 2 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -428,8 +428,8 @@ IBPSOTest3(typename OptimizerType::CoefficientType inertiaCoefficient, std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 3 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -461,8 +461,8 @@ IBPSOTest3(typename OptimizerType::CoefficientType inertiaCoefficient, std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 3 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -495,8 +495,8 @@ IBPSOTest3(typename OptimizerType::CoefficientType inertiaCoefficient, std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 3 FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizers/test/itkLBFGSBOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkLBFGSBOptimizerTest.cxx index f9c293bfe09..85c2c5de9c0 100644 --- a/Modules/Numerics/Optimizers/test/itkLBFGSBOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkLBFGSBOptimizerTest.cxx @@ -302,21 +302,21 @@ itkLBFGSBOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 4.0 / 3.0, -1.0 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; errorIn = "solution"; } } - if (itk::Math::abs(itkOptimizer->GetValue() - -7.66667) > 0.01) + if (itk::Math::Absolute(itkOptimizer->GetValue() - -7.66667) > 0.01) { pass = false; errorIn = "final function value"; } - if (itk::Math::abs(itkOptimizer->GetInfinityNormOfProjectedGradient() - 1.77636e-15) > 0.01) + if (itk::Math::Absolute(itkOptimizer->GetInfinityNormOfProjectedGradient() - 1.77636e-15) > 0.01) { pass = false; errorIn = "infinity norm of projected gradient"; diff --git a/Modules/Numerics/Optimizers/test/itkLBFGSOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkLBFGSOptimizerTest.cxx index 55ccd96a1e1..e89d9c06738 100644 --- a/Modules/Numerics/Optimizers/test/itkLBFGSOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkLBFGSOptimizerTest.cxx @@ -222,7 +222,7 @@ itkLBFGSOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } @@ -237,7 +237,7 @@ itkLBFGSOptimizerTest(int, char *[]) // Get the final value of the optimizer std::cout << "Testing GetValue() : "; const OptimizerType::MeasureType finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 10.0) > 0.01) + if (itk::Math::Absolute(finalValue + 10.0) > 0.01) { std::cout << "[FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizers/test/itkLevenbergMarquardtOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkLevenbergMarquardtOptimizerTest.cxx index 81ad9bbdf96..99621a2972e 100644 --- a/Modules/Numerics/Optimizers/test/itkLevenbergMarquardtOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkLevenbergMarquardtOptimizerTest.cxx @@ -374,7 +374,7 @@ itkRunLevenbergMarquardOptimization(bool useGradient, constexpr double trueParameters[3]{ ra, rb, rc }; for (unsigned int j = 0; j < LMCostFunction::SpaceDimension; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } @@ -391,7 +391,7 @@ itkRunLevenbergMarquardOptimization(bool useGradient, OptimizerType::MeasureType finalValue = optimizer->GetValue(); // We compare only the first value for this test - if (itk::Math::abs(finalValue[0] - 0.0) > 0.01) + if (itk::Math::Absolute(finalValue[0] - 0.0) > 0.01) { std::cout << "[FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizers/test/itkOnePlusOneEvolutionaryOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkOnePlusOneEvolutionaryOptimizerTest.cxx index 0c85667596a..6c8eeea762f 100644 --- a/Modules/Numerics/Optimizers/test/itkOnePlusOneEvolutionaryOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkOnePlusOneEvolutionaryOptimizerTest.cxx @@ -126,7 +126,7 @@ class OnePlusOneCommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; @@ -237,7 +237,7 @@ itkOnePlusOneEvolutionaryOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizers/test/itkOptimizersHierarchyTest.cxx b/Modules/Numerics/Optimizers/test/itkOptimizersHierarchyTest.cxx index 1568dbff9d7..b29ea83f793 100644 --- a/Modules/Numerics/Optimizers/test/itkOptimizersHierarchyTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkOptimizersHierarchyTest.cxx @@ -61,7 +61,7 @@ itkOptimizersHierarchyTest(int, char *[]) for (unsigned int i = 0; i < spaceDimension; ++i) { - if (itk::Math::abs(parameterScaleGot[i] - parameterScale[i]) > tolerance) + if (itk::Math::Absolute(parameterScaleGot[i] - parameterScale[i]) > tolerance) { std::cout << "Test failed." << std::endl; std::cout << "Scale parameters are damaged after being set." << std::endl; @@ -75,7 +75,7 @@ itkOptimizersHierarchyTest(int, char *[]) for (unsigned int i = 0; i < spaceDimension; ++i) { - if (itk::Math::abs(initialPositionGot[i] - initialPosition[i]) > tolerance) + if (itk::Math::Absolute(initialPositionGot[i] - initialPosition[i]) > tolerance) { std::cout << "Test failed." << std::endl; std::cout << "InitialPosition parameters are damaged after being set." << std::endl; diff --git a/Modules/Numerics/Optimizers/test/itkParticleSwarmOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkParticleSwarmOptimizerTest.cxx index 5b5004aa461..c81576b8cb0 100644 --- a/Modules/Numerics/Optimizers/test/itkParticleSwarmOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkParticleSwarmOptimizerTest.cxx @@ -157,7 +157,7 @@ PSOTest1() finalParameters = itkOptimizer->GetCurrentPosition(); std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cout << "[Test 1 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -181,7 +181,7 @@ PSOTest1() finalParameters = itkOptimizer->GetCurrentPosition(); std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cout << "[Test 1 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -256,8 +256,8 @@ PSOTest2() finalParameters = itkOptimizer->GetCurrentPosition(); std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 2 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -336,7 +336,7 @@ PSOTest3() itkOptimizer->SetParametersConvergenceTolerance(xTolerance, costFunction->GetNumberOfParameters()); itkOptimizer->SetFunctionConvergenceTolerance(fTolerance); - if (itk::Math::abs(itkOptimizer->GetFunctionConvergenceTolerance() - fTolerance) > tolerance) + if (itk::Math::Absolute(itkOptimizer->GetFunctionConvergenceTolerance() - fTolerance) > tolerance) { std::cerr << "Error in Set/Get method for FunctionConvergenceTolerance"; return EXIT_FAILURE; @@ -345,7 +345,7 @@ PSOTest3() constexpr double percentageParticlesConverged{ 0.6 }; itkOptimizer->SetPercentageParticlesConverged(percentageParticlesConverged); - if (itk::Math::abs(itkOptimizer->GetPercentageParticlesConverged() - percentageParticlesConverged) > tolerance) + if (itk::Math::Absolute(itkOptimizer->GetPercentageParticlesConverged() - percentageParticlesConverged) > tolerance) { std::cerr << "Error in Set/Get methods for percentage particles converged parameter"; return EXIT_FAILURE; @@ -353,7 +353,7 @@ PSOTest3() constexpr double inertiaCoefficient{ 0.7298 }; itkOptimizer->SetInertiaCoefficient(inertiaCoefficient); - if (itk::Math::abs(itkOptimizer->GetInertiaCoefficient() - inertiaCoefficient)) + if (itk::Math::Absolute(itkOptimizer->GetInertiaCoefficient() - inertiaCoefficient)) { std::cerr << "Error in Set/Get method for inertia coefficient parameter"; return EXIT_FAILURE; @@ -361,7 +361,7 @@ PSOTest3() constexpr double personalCoefficient{ 1.496 }; itkOptimizer->SetPersonalCoefficient(personalCoefficient); - if (itk::Math::abs(itkOptimizer->GetPersonalCoefficient() - personalCoefficient)) + if (itk::Math::Absolute(itkOptimizer->GetPersonalCoefficient() - personalCoefficient)) { std::cerr << "Error in Set/Get method for personal coefficient parameter"; return EXIT_FAILURE; @@ -369,7 +369,7 @@ PSOTest3() constexpr double gobalCoefficient{ 1.496 }; itkOptimizer->SetGlobalCoefficient(gobalCoefficient); - if (itk::Math::abs(itkOptimizer->GetGlobalCoefficient() - gobalCoefficient)) + if (itk::Math::Absolute(itkOptimizer->GetGlobalCoefficient() - gobalCoefficient)) { std::cerr << "Error in Set/Get method for global coefficient parameter"; return EXIT_FAILURE; @@ -401,8 +401,8 @@ PSOTest3() OptimizerType::ParametersType finalParameters = itkOptimizer->GetCurrentPosition(); std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 3 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -430,8 +430,8 @@ PSOTest3() finalParameters = itkOptimizer->GetCurrentPosition(); std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 3 FAILURE]" << std::endl; return EXIT_FAILURE; @@ -466,8 +466,8 @@ PSOTest3() finalParameters = itkOptimizer->GetCurrentPosition(); std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters[0]) > xTolerance || - itk::Math::abs(finalParameters[1] - knownParameters[1]) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters[0]) > xTolerance || + itk::Math::Absolute(finalParameters[1] - knownParameters[1]) > xTolerance) { std::cout << "[Test 3 FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizers/test/itkPowellOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkPowellOptimizerTest.cxx index 425f070a221..b564b994abc 100644 --- a/Modules/Numerics/Optimizers/test/itkPowellOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkPowellOptimizerTest.cxx @@ -187,7 +187,7 @@ itkPowellOptimizerTest(int argc, char * argv[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizers/test/itkRegularStepGradientDescentOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkRegularStepGradientDescentOptimizerTest.cxx index fb6dbdad8c0..311ae664f65 100644 --- a/Modules/Numerics/Optimizers/test/itkRegularStepGradientDescentOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkRegularStepGradientDescentOptimizerTest.cxx @@ -177,7 +177,7 @@ itkRegularStepGradientDescentOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } @@ -210,7 +210,7 @@ itkRegularStepGradientDescentOptimizerTest(int, char *[]) pass = true; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizers/test/itkSPSAOptimizerTest.cxx b/Modules/Numerics/Optimizers/test/itkSPSAOptimizerTest.cxx index d0ac17a8187..7c6d4ad33cc 100644 --- a/Modules/Numerics/Optimizers/test/itkSPSAOptimizerTest.cxx +++ b/Modules/Numerics/Optimizers/test/itkSPSAOptimizerTest.cxx @@ -229,7 +229,7 @@ itkSPSAOptimizerTest(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizersv4/include/itkGradientDescentLineSearchOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkGradientDescentLineSearchOptimizerv4.hxx index 89ad04b6a56..ca20860d948 100644 --- a/Modules/Numerics/Optimizersv4/include/itkGradientDescentLineSearchOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkGradientDescentLineSearchOptimizerv4.hxx @@ -127,7 +127,7 @@ GradientDescentLineSearchOptimizerv4Template::Gol { x = b - this->m_Resphi * (b - a); } - if (itk::Math::abs(c - a) < this->m_Epsilon * (itk::Math::abs(b) + itk::Math::abs(x))) + if (itk::Math::Absolute(c - a) < this->m_Epsilon * (itk::Math::Absolute(b) + itk::Math::Absolute(x))) { return (c + a) / 2; } diff --git a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx index 3893c60d89e..a511067cf84 100644 --- a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx @@ -254,10 +254,10 @@ PowellOptimizerv4::BracketedLineOptimize(double { const double middle_range = (a + b) / 2; - double tolerance1 = m_StepTolerance * itk::Math::abs(x) + POWELL_TINY; + double tolerance1 = m_StepTolerance * itk::Math::Absolute(x) + POWELL_TINY; double tolerance2 = 2.0 * tolerance1; - if (itk::Math::abs(x - middle_range) <= (tolerance2 - 0.5 * (b - a)) || 0.5 * (b - a) < m_StepTolerance) + if (itk::Math::Absolute(x - middle_range) <= (tolerance2 - 0.5 * (b - a)) || 0.5 * (b - a) < m_StepTolerance) { *extX = x; *extVal = functionValueOfX; @@ -272,7 +272,7 @@ PowellOptimizerv4::BracketedLineOptimize(double double new_step = goldenSectionRatio * (x < middle_range ? b - x : a - x); /* Step at this iteration */ /* Decide if the interpolation can be tried */ - if (itk::Math::abs(x - w) >= tolerance1) /* If x and w are distinct */ + if (itk::Math::Absolute(x - w) >= tolerance1) /* If x and w are distinct */ { const double t = (x - w) * (functionValueOfX - functionValueOfV); @@ -292,7 +292,7 @@ PowellOptimizerv4::BracketedLineOptimize(double /* Check if x+p/q falls in [a,b] and not too close to a and b and isn't too large */ - if (itk::Math::abs(p) < itk::Math::abs(new_step * q) && p > q * (a - x + 2 * tolerance1) && + if (itk::Math::Absolute(p) < itk::Math::Absolute(new_step * q) && p > q * (a - x + 2 * tolerance1) && p < q * (b - x - 2 * tolerance1)) { new_step = p / q; /* it is accepted */ @@ -303,7 +303,7 @@ PowellOptimizerv4::BracketedLineOptimize(double } /* Adjust the step to be not less than tolerance*/ - if (itk::Math::abs(new_step) < tolerance1) + if (itk::Math::Absolute(new_step) < tolerance1) { if (new_step > 0.0) { @@ -438,14 +438,14 @@ PowellOptimizerv4::StartOptimization(bool /* doOn this->SetCurrentLinePoint(xx, fx); p = this->GetCurrentPosition(); - if (itk::Math::abs(fptt - fx) > del) + if (itk::Math::Absolute(fptt - fx) > del) { - del = itk::Math::abs(fptt - fx); + del = itk::Math::Absolute(fptt - fx); ibig = i; } } - if (2.0 * itk::Math::abs(fp - fx) <= m_ValueTolerance * (itk::Math::abs(fp) + itk::Math::abs(fx))) + if (2.0 * itk::Math::Absolute(fp - fx) <= m_ValueTolerance * (itk::Math::Absolute(fp) + itk::Math::Absolute(fx))) { m_StopConditionDescription << "Cost function values at the current parameter (" << fx << ") and at the local extrema (" << fp << ") are within Value Tolerance (" diff --git a/Modules/Numerics/Optimizersv4/include/itkQuasiNewtonOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkQuasiNewtonOptimizerv4.hxx index fe175d7d561..3339bdc4dcb 100644 --- a/Modules/Numerics/Optimizersv4/include/itkQuasiNewtonOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkQuasiNewtonOptimizerv4.hxx @@ -245,7 +245,7 @@ QuasiNewtonOptimizerv4Template::ModifyCombinedNew } } - if (itk::Math::abs(this->m_LearningRate - NumericTraits::OneValue()) > 0.01) + if (itk::Math::Absolute(this->m_LearningRate - NumericTraits::OneValue()) > 0.01) { this->m_NewtonStep *= this->m_LearningRate; } @@ -367,8 +367,8 @@ QuasiNewtonOptimizerv4Template::ComputeHessianAnd TInternalComputationValueType dot_dg_dx = inner_product(dg, dx); TInternalComputationValueType dot_edg_dx = inner_product(edg, dx); - if (itk::Math::abs(dot_dg_dx) <= NumericTraits::epsilon() || - itk::Math::abs(dot_edg_dx) <= NumericTraits::epsilon()) + if (itk::Math::Absolute(dot_dg_dx) <= NumericTraits::epsilon() || + itk::Math::Absolute(dot_edg_dx) <= NumericTraits::epsilon()) { return false; } @@ -389,7 +389,7 @@ QuasiNewtonOptimizerv4Template::ComputeHessianAnd TInternalComputationValueType threshold = NumericTraits::epsilon(); - if (itk::Math::abs(vnl_determinant(newHessian)) <= threshold) + if (itk::Math::Absolute(vnl_determinant(newHessian)) <= threshold) { return false; } diff --git a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesFromShiftBase.hxx b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesFromShiftBase.hxx index a06ddcb8134..890d00445c3 100644 --- a/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesFromShiftBase.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkRegistrationParameterScalesFromShiftBase.hxx @@ -140,7 +140,7 @@ RegistrationParameterScalesFromShiftBase::EstimateStepScale(const Param FloatType maxStep{}; for (typename ParametersType::SizeValueType p = 0; p < step.GetSize(); ++p) { - maxStep = std::max(maxStep, itk::Math::abs(step[p])); + maxStep = std::max(maxStep, itk::Math::Absolute(step[p])); } if (maxStep <= NumericTraits::epsilon()) { diff --git a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx index 671555de74d..655303b8f2b 100644 --- a/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkWindowConvergenceMonitoringFunction.hxx @@ -45,7 +45,7 @@ WindowConvergenceMonitoringFunction::AddEnergyValue(const EnergyValueTy { this->m_EnergyValues.pop_front(); } - this->m_TotalEnergy += itk::Math::abs(value); + this->m_TotalEnergy += itk::Math::Absolute(value); this->Modified(); } diff --git a/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx b/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx index 35626176af6..31d8849a8a0 100644 --- a/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx +++ b/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx @@ -165,7 +165,7 @@ AmoebaOptimizerv4::StartOptimization(bool /* doOnlyInitialization */) InternalParametersType automaticDelta(n); for (unsigned int i = 0; i < n; ++i) { - if (itk::Math::abs(parameters[i]) > zeroTermDelta) + if (itk::Math::Absolute(parameters[i]) > zeroTermDelta) { automaticDelta[i] = relativeDiameter * parameters[i]; } @@ -196,12 +196,12 @@ AmoebaOptimizerv4::StartOptimization(bool /* doOnlyInitialization */) double maxAbs = 0.0; for (unsigned int j = 0; j < n; ++j) { - if (maxAbs < itk::Math::abs(bestPosition[j] - parameters[j])) + if (maxAbs < itk::Math::Absolute(bestPosition[j] - parameters[j])) { - maxAbs = itk::Math::abs(bestPosition[j] - parameters[j]); + maxAbs = itk::Math::Absolute(bestPosition[j] - parameters[j]); } } - converged = itk::Math::abs(bestValue - currentValue) < this->m_FunctionConvergenceTolerance && + converged = itk::Math::Absolute(bestValue - currentValue) < this->m_FunctionConvergenceTolerance && maxAbs < this->m_ParametersConvergenceTolerance; // this comparison is valid because the // adaptor is set to always return the function value diff --git a/Modules/Numerics/Optimizersv4/src/itkObjectToObjectOptimizerBase.cxx b/Modules/Numerics/Optimizersv4/src/itkObjectToObjectOptimizerBase.cxx index bc7290b614c..d5cb560afd0 100644 --- a/Modules/Numerics/Optimizersv4/src/itkObjectToObjectOptimizerBase.cxx +++ b/Modules/Numerics/Optimizersv4/src/itkObjectToObjectOptimizerBase.cxx @@ -130,7 +130,7 @@ ObjectToObjectOptimizerBaseTemplate::StartOptimiz /* Check if the scales are identity. Consider to be identity if * within a tolerance, to allow for automatically estimated scales * that may not be exactly 1.0 when in principle they should be. */ - const SValueType difference = itk::Math::abs(NumericTraits::OneValue() - this->m_Scales[i]); + const SValueType difference = itk::Math::Absolute(NumericTraits::OneValue() - this->m_Scales[i]); auto tolerance = static_cast(0.01); if (difference > tolerance) { @@ -161,7 +161,7 @@ ObjectToObjectOptimizerBaseTemplate::StartOptimiz this->m_WeightsAreIdentity = true; for (SizeType i = 0; i < this->m_Weights.Size(); ++i) { - const SValueType difference = itk::Math::abs(NumericTraits::OneValue() - this->m_Weights[i]); + const SValueType difference = itk::Math::Absolute(NumericTraits::OneValue() - this->m_Weights[i]); auto tolerance = static_cast(1e-4); if (difference > tolerance) { diff --git a/Modules/Numerics/Optimizersv4/test/itkAmoebaOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkAmoebaOptimizerv4Test.cxx index 96c0e429c21..860ef99bbf2 100644 --- a/Modules/Numerics/Optimizersv4/test/itkAmoebaOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkAmoebaOptimizerv4Test.cxx @@ -434,7 +434,7 @@ AmoebaTest1() for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > xTolerance) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > xTolerance) { pass = false; } @@ -449,7 +449,7 @@ AmoebaTest1() // Get the final value of the optimizer std::cout << "Testing optimizers GetValue() : "; const OptimizerType::MeasureType finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 9.99998) > 0.01) + if (itk::Math::Absolute(finalValue + 9.99998) > 0.01) { std::cerr << "failed\n"; std::cerr << "[TEST 1 FAILURE]\n"; @@ -526,7 +526,7 @@ AmoebaTest2() std::cout << "Known parameters = " << knownParameters << " "; std::cout << "Estimated parameters = " << finalParameters << std::endl; std::cout << "Converged to local minimum." << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cerr << "[TEST 2 FAILURE]\n"; return EXIT_FAILURE; @@ -560,7 +560,7 @@ AmoebaTest2() std::cout << "Estimated parameters = " << finalParameters << std::endl; std::cout << "Converged to global minimum." << std::endl; - if (itk::Math::abs(finalParameters[0] - knownParameters) > xTolerance) + if (itk::Math::Absolute(finalParameters[0] - knownParameters) > xTolerance) { std::cerr << "[TEST 2 FAILURE]\n"; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx index 605b0d9847a..35d001c8874 100644 --- a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationOnVectorTest.cxx @@ -206,7 +206,7 @@ itkAutoScaledGradientDescentRegistrationOnVectorTestTemplated(int // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx index 662e70cb5d4..8fd31918d8f 100644 --- a/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkAutoScaledGradientDescentRegistrationTest.cxx @@ -239,7 +239,7 @@ itkAutoScaledGradientDescentRegistrationTestTemplated(int number // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Numerics/Optimizersv4/test/itkConjugateGradientLineSearchOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkConjugateGradientLineSearchOptimizerv4Test.cxx index a62ee5c49bd..4394aa4f47f 100644 --- a/Modules/Numerics/Optimizersv4/test/itkConjugateGradientLineSearchOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkConjugateGradientLineSearchOptimizerv4Test.cxx @@ -187,7 +187,7 @@ ConjugateGradientLineSearchOptimizerv4RunTest(itk::ConjugateGradientLineSearchOp constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { std::cerr << "Results do not match: " << std::endl << "expected: " << trueParameters[0] << ", " << trueParameters[1] << std::endl @@ -314,7 +314,7 @@ itkConjugateGradientLineSearchOptimizerv4Test(int, char *[]) bool identical = true; for (unsigned int j = 0; j < spaceDimension; ++j) { - if (itk::Math::abs(firstFinalPosition[j] - secondFinalPosition[j]) > itk::NumericTraits::epsilon()) + if (itk::Math::Absolute(firstFinalPosition[j] - secondFinalPosition[j]) > itk::NumericTraits::epsilon()) { identical = false; } diff --git a/Modules/Numerics/Optimizersv4/test/itkExhaustiveOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkExhaustiveOptimizerv4Test.cxx index 96a6a02d8c1..cca49665226 100644 --- a/Modules/Numerics/Optimizersv4/test/itkExhaustiveOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkExhaustiveOptimizerv4Test.cxx @@ -267,12 +267,12 @@ itkExhaustiveOptimizerv4Test(int, char *[]) } - const bool minimumValuePass = itk::Math::abs(itkOptimizer->GetMinimumMetricValue() - -10) < 1E-3; + const bool minimumValuePass = itk::Math::Absolute(itkOptimizer->GetMinimumMetricValue() - -10) < 1E-3; std::cout << "MinimumMetricValue = " << itkOptimizer->GetMinimumMetricValue() << std::endl; std::cout << "Minimum Position = " << itkOptimizer->GetMinimumMetricValuePosition() << std::endl; - const bool maximumValuePass = itk::Math::abs(itkOptimizer->GetMaximumMetricValue() - 926) < 1E-3; + const bool maximumValuePass = itk::Math::Absolute(itkOptimizer->GetMaximumMetricValue() - 926) < 1E-3; std::cout << "MaximumMetricValue = " << itkOptimizer->GetMaximumMetricValue() << std::endl; std::cout << "Maximum Position = " << itkOptimizer->GetMaximumMetricValuePosition() << std::endl; @@ -311,7 +311,7 @@ itkExhaustiveOptimizerv4Test(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { trueParamsPass = false; } diff --git a/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx index 23fb6b2c39c..60370946614 100644 --- a/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkGradientDescentLineSearchOptimizerv4Test.cxx @@ -189,7 +189,7 @@ GradientDescentLineSearchOptimizerv4RunTest(itk::GradientDescentLineSearchOptimi double trueParameters[2] = { 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { std::cerr << "Results do not match: " << std::endl << "expected: " << trueParameters << std::endl diff --git a/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test.cxx index 6b3fb4aba9a..fc41b206cd3 100644 --- a/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test.cxx @@ -183,7 +183,7 @@ GradientDescentOptimizerv4RunTest(itk::GradientDescentOptimizerv4::Pointer & constexpr ParametersType::ValueType eps{ 0.03 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > eps) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > eps) { std::cerr << "Results do not match: " << std::endl << "expected: " << trueParameters << std::endl diff --git a/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test2.cxx b/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test2.cxx index 6d3fb84654f..94b48bf97c3 100644 --- a/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test2.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkGradientDescentOptimizerv4Test2.cxx @@ -204,7 +204,7 @@ itkGradientDescentOptimizerv4Test2(int, char *[]) // for (NumberOfParametersType j = 0; j < metric->GetNumberOfParameters(); ++j) { - if (itk::Math::abs(finalPosition[j] - truth[j]) > 0.000001) + if (itk::Math::Absolute(finalPosition[j] - truth[j]) > 0.000001) { std::cerr << "Results do not match: " << std::endl << "expected: " << truth << std::endl diff --git a/Modules/Numerics/Optimizersv4/test/itkLBFGS2Optimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkLBFGS2Optimizerv4Test.cxx index a0992dac37e..ca81c3c876d 100644 --- a/Modules/Numerics/Optimizersv4/test/itkLBFGS2Optimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkLBFGS2Optimizerv4Test.cxx @@ -310,7 +310,7 @@ itkLBFGS2Optimizerv4Test(int, char *[]) // Get the final value of the optimizer std::cout << "Testing GetValue() : "; const OptimizerType::MeasureType finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 10.0) > 0.01) + if (itk::Math::Absolute(finalValue + 10.0) > 0.01) { std::cout << "[FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizersv4/test/itkLBFGSOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkLBFGSOptimizerv4Test.cxx index 13bf3af7297..282a6a5a128 100644 --- a/Modules/Numerics/Optimizersv4/test/itkLBFGSOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkLBFGSOptimizerv4Test.cxx @@ -284,7 +284,7 @@ itkLBFGSOptimizerv4Test(int, char *[]) // Get the final value of the optimizer std::cout << "Testing GetValue() : "; const OptimizerType::MeasureType finalValue = itkOptimizer->GetValue(); - if (itk::Math::abs(finalValue + 10.0) > 0.01) + if (itk::Math::Absolute(finalValue + 10.0) > 0.01) { std::cout << "[FAILURE]" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Optimizersv4/test/itkMultiGradientOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkMultiGradientOptimizerv4Test.cxx index 51355e1804c..5780a4d9f55 100644 --- a/Modules/Numerics/Optimizersv4/test/itkMultiGradientOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkMultiGradientOptimizerv4Test.cxx @@ -312,7 +312,7 @@ MultiGradientOptimizerv4RunTest(itk::MultiGradientOptimizerv4::Pointer & itkOpti trueParameters[1] = -1.5; for (itk::SizeValueType j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { std::cerr << "Results do not match: " << std::endl << "expected: " << trueParameters << std::endl diff --git a/Modules/Numerics/Optimizersv4/test/itkMultiStartOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkMultiStartOptimizerv4Test.cxx index 8857e7d24e5..6066a657720 100644 --- a/Modules/Numerics/Optimizersv4/test/itkMultiStartOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkMultiStartOptimizerv4Test.cxx @@ -190,7 +190,7 @@ MultiStartOptimizerv4RunTest(itk::MultiStartOptimizerv4::Pointer & itkOptimizer) trueParameters[1] = -2.0; for (itk::SizeValueType j = 0; j < 2; ++j) { - if (itk::Math::abs(bestPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(bestPosition[j] - trueParameters[j]) > 0.01) { std::cerr << "Results do not match: " << std::endl << "expected: " << trueParameters << std::endl diff --git a/Modules/Numerics/Optimizersv4/test/itkOnePlusOneEvolutionaryOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkOnePlusOneEvolutionaryOptimizerv4Test.cxx index 93f82fbf2cb..52564825d43 100644 --- a/Modules/Numerics/Optimizersv4/test/itkOnePlusOneEvolutionaryOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkOnePlusOneEvolutionaryOptimizerv4Test.cxx @@ -176,7 +176,7 @@ class OnePlusOneCommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; @@ -272,7 +272,7 @@ itkOnePlusOneEvolutionaryOptimizerv4Test(int, char *[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizersv4/test/itkPowellOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkPowellOptimizerv4Test.cxx index 7cb3d9a999c..d8b4f46e86d 100644 --- a/Modules/Numerics/Optimizersv4/test/itkPowellOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkPowellOptimizerv4Test.cxx @@ -228,7 +228,7 @@ itkPowellOptimizerv4Test(int argc, char * argv[]) constexpr double trueParameters[2]{ 2, -2 }; for (unsigned int j = 0; j < 2; ++j) { - if (itk::Math::abs(finalPosition[j] - trueParameters[j]) > 0.01) + if (itk::Math::Absolute(finalPosition[j] - trueParameters[j]) > 0.01) { pass = false; } diff --git a/Modules/Numerics/Optimizersv4/test/itkQuasiNewtonOptimizerv4Test.cxx b/Modules/Numerics/Optimizersv4/test/itkQuasiNewtonOptimizerv4Test.cxx index e81e95782ec..628a89146e2 100644 --- a/Modules/Numerics/Optimizersv4/test/itkQuasiNewtonOptimizerv4Test.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkQuasiNewtonOptimizerv4Test.cxx @@ -197,7 +197,7 @@ itkQuasiNewtonOptimizerv4TestTemplated(int numberOfIterations, // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx index 52dc61eb28e..c28ff634206 100644 --- a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesEstimatorTest.cxx @@ -320,7 +320,7 @@ itkRegistrationParameterScalesEstimatorTest(int, char *[]) bool randomPass = true; for (itk::SizeValueType p = 0; p < jacobianScales.GetSize(); ++p) { - if (itk::Math::abs((jacobianScales[p] - theoreticalJacobianScales[p]) / theoreticalJacobianScales[p]) > 0.3) + if (itk::Math::Absolute((jacobianScales[p] - theoreticalJacobianScales[p]) / theoreticalJacobianScales[p]) > 0.3) { randomPass = false; break; diff --git a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromIndexShiftTest.cxx b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromIndexShiftTest.cxx index ba4e41a6c9e..6d7101aee74 100644 --- a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromIndexShiftTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromIndexShiftTest.cxx @@ -190,7 +190,7 @@ itkRegistrationParameterScalesFromIndexShiftTest(int, char *[]) bool affinePass = true; for (itk::SizeValueType p = 0; p < theoreticalMovingScales.GetSize(); ++p) { - if (itk::Math::abs((movingScales[p] - theoreticalMovingScales[p]) / theoreticalMovingScales[p]) > 0.01) + if (itk::Math::Absolute((movingScales[p] - theoreticalMovingScales[p]) / theoreticalMovingScales[p]) > 0.01) { affinePass = false; break; @@ -240,7 +240,7 @@ itkRegistrationParameterScalesFromIndexShiftTest(int, char *[]) // compare truth and test bool stepScalePass = false; - if (itk::Math::abs((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) + if (itk::Math::Absolute((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) { stepScalePass = true; } @@ -287,7 +287,7 @@ itkRegistrationParameterScalesFromIndexShiftTest(int, char *[]) bool displacementPass = true; for (itk::SizeValueType p = 0; p < theoreticalLocalScales.GetSize(); ++p) { - if (itk::Math::abs((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) + if (itk::Math::Absolute((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) { displacementPass = false; break; @@ -313,7 +313,7 @@ itkRegistrationParameterScalesFromIndexShiftTest(int, char *[]) bool localStepScalePass = false; const FloatType theoreticalLocalStepScale = std::sqrt(2.0); - if (itk::Math::abs((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) + if (itk::Math::Absolute((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) { localStepScalePass = true; } @@ -344,7 +344,7 @@ itkRegistrationParameterScalesFromIndexShiftTest(int, char *[]) bool translationPass = true; for (itk::SizeValueType p = 0; p < theoreticalFixedScales.GetSize(); ++p) { - if (itk::Math::abs((fixedScales[p] - theoreticalFixedScales[p]) / theoreticalFixedScales[p]) > 0.01) + if (itk::Math::Absolute((fixedScales[p] - theoreticalFixedScales[p]) / theoreticalFixedScales[p]) > 0.01) { translationPass = false; break; diff --git a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromJacobianTest.cxx b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromJacobianTest.cxx index e9da380c099..af7fa5e18d9 100644 --- a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromJacobianTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromJacobianTest.cxx @@ -194,7 +194,7 @@ itkRegistrationParameterScalesFromJacobianTest(int, char *[]) bool jacobianPass = true; for (itk::SizeValueType p = 0; p < jacobianScales.GetSize(); ++p) { - if (itk::Math::abs((jacobianScales[p] - theoreticalJacobianScales[p]) / theoreticalJacobianScales[p]) > 0.01) + if (itk::Math::Absolute((jacobianScales[p] - theoreticalJacobianScales[p]) / theoreticalJacobianScales[p]) > 0.01) { jacobianPass = false; break; @@ -247,7 +247,7 @@ itkRegistrationParameterScalesFromJacobianTest(int, char *[]) theoreticalStepScale /= count; bool stepScalePass = false; - if (itk::Math::abs((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) + if (itk::Math::Absolute((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) { stepScalePass = true; } @@ -292,7 +292,7 @@ itkRegistrationParameterScalesFromJacobianTest(int, char *[]) bool displacementPass = true; for (itk::SizeValueType p = 0; p < theoreticalLocalScales.GetSize(); ++p) { - if (itk::Math::abs((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) + if (itk::Math::Absolute((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) { displacementPass = false; break; @@ -318,7 +318,7 @@ itkRegistrationParameterScalesFromJacobianTest(int, char *[]) bool localStepScalePass = false; const FloatType theoreticalLocalStepScale = std::sqrt(2.0); - if (itk::Math::abs((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) + if (itk::Math::Absolute((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) { localStepScalePass = true; } diff --git a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftPointSetTest.cxx b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftPointSetTest.cxx index 5add7e1b6ad..e54edbe3435 100644 --- a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftPointSetTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftPointSetTest.cxx @@ -168,7 +168,7 @@ itkRegistrationParameterScalesFromPhysicalShiftPointSetTest(int, char *[]) bool affinePass = true; for (itk::SizeValueType p = 0; p < theoreticalMovingScales.GetSize(); ++p) { - if (itk::Math::abs((movingScales[p] - theoreticalMovingScales[p]) / theoreticalMovingScales[p]) > 0.01) + if (itk::Math::Absolute((movingScales[p] - theoreticalMovingScales[p]) / theoreticalMovingScales[p]) > 0.01) { affinePass = false; break; @@ -218,7 +218,7 @@ itkRegistrationParameterScalesFromPhysicalShiftPointSetTest(int, char *[]) // compare truth and test bool stepScalePass = false; - if (itk::Math::abs((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) + if (itk::Math::Absolute((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) { stepScalePass = true; } @@ -247,7 +247,7 @@ itkRegistrationParameterScalesFromPhysicalShiftPointSetTest(int, char *[]) bool translationPass = true; for (itk::SizeValueType p = 0; p < theoreticalFixedScales.GetSize(); ++p) { - if (itk::Math::abs((fixedScales[p] - theoreticalFixedScales[p]) / theoreticalFixedScales[p]) > 0.01) + if (itk::Math::Absolute((fixedScales[p] - theoreticalFixedScales[p]) / theoreticalFixedScales[p]) > 0.01) { translationPass = false; break; @@ -265,7 +265,7 @@ itkRegistrationParameterScalesFromPhysicalShiftPointSetTest(int, char *[]) bool uniformForTranslation = true; for (itk::SizeValueType p = 1; p < fixedScales.GetSize(); ++p) { - if (itk::Math::abs(fixedScales[p] - fixedScales[0]) > 1e-6) + if (itk::Math::Absolute(fixedScales[p] - fixedScales[0]) > 1e-6) { uniformForTranslation = false; std::cerr << "fixedScales[" << p << "] - fixedScales[0]: " << fixedScales[p] - fixedScales[0] << std::endl; @@ -319,7 +319,7 @@ itkRegistrationParameterScalesFromPhysicalShiftPointSetTest(int, char *[]) bool displacementPass = true; for (itk::SizeValueType p = 0; p < theoreticalLocalScales.GetSize(); ++p) { - if (itk::Math::abs((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) + if (itk::Math::Absolute((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) { displacementPass = false; break; @@ -345,7 +345,7 @@ itkRegistrationParameterScalesFromPhysicalShiftPointSetTest(int, char *[]) bool localStepScalePass = false; const FloatType theoreticalLocalStepScale = std::sqrt(2.0); - if (itk::Math::abs((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) + if (itk::Math::Absolute((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) { localStepScalePass = true; } diff --git a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftTest.cxx b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftTest.cxx index 08935c3497a..83f41de6492 100644 --- a/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkRegistrationParameterScalesFromPhysicalShiftTest.cxx @@ -193,7 +193,7 @@ itkRegistrationParameterScalesFromPhysicalShiftTest(int, char *[]) bool affinePass = true; for (itk::SizeValueType p = 0; p < theoreticalMovingScales.GetSize(); ++p) { - if (itk::Math::abs((movingScales[p] - theoreticalMovingScales[p]) / theoreticalMovingScales[p]) > 0.01) + if (itk::Math::Absolute((movingScales[p] - theoreticalMovingScales[p]) / theoreticalMovingScales[p]) > 0.01) { affinePass = false; break; @@ -242,7 +242,7 @@ itkRegistrationParameterScalesFromPhysicalShiftTest(int, char *[]) // compare truth and test bool stepScalePass = false; - if (itk::Math::abs((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) + if (itk::Math::Absolute((stepScale - theoreticalStepScale) / theoreticalStepScale) < 0.01) { stepScalePass = true; } @@ -271,7 +271,7 @@ itkRegistrationParameterScalesFromPhysicalShiftTest(int, char *[]) bool translationPass = true; for (itk::SizeValueType p = 0; p < theoreticalFixedScales.GetSize(); ++p) { - if (itk::Math::abs((fixedScales[p] - theoreticalFixedScales[p]) / theoreticalFixedScales[p]) > 0.01) + if (itk::Math::Absolute((fixedScales[p] - theoreticalFixedScales[p]) / theoreticalFixedScales[p]) > 0.01) { translationPass = false; break; @@ -334,7 +334,7 @@ itkRegistrationParameterScalesFromPhysicalShiftTest(int, char *[]) bool displacementPass = true; for (itk::SizeValueType p = 0; p < theoreticalLocalScales.GetSize(); ++p) { - if (itk::Math::abs((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) + if (itk::Math::Absolute((localScales[p] - theoreticalLocalScales[p]) / theoreticalLocalScales[p]) > 0.01) { displacementPass = false; break; @@ -360,7 +360,7 @@ itkRegistrationParameterScalesFromPhysicalShiftTest(int, char *[]) bool localStepScalePass = false; const FloatType theoreticalLocalStepScale = std::sqrt(2.0); - if (itk::Math::abs((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) + if (itk::Math::Absolute((localStepScale - theoreticalLocalStepScale) / theoreticalLocalStepScale) < 0.01) { localStepScalePass = true; } diff --git a/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.hxx b/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.hxx index 28e6c56d35e..a59a57f1157 100644 --- a/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.hxx +++ b/Modules/Numerics/Statistics/include/itkEuclideanDistanceMetric.hxx @@ -79,7 +79,7 @@ EuclideanDistanceMetric::Evaluate(const ValueType & a, const ValueType { const double temp = a - b; - return itk::Math::abs(temp); + return itk::Math::Absolute(temp); } } // namespace itk::Statistics diff --git a/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx b/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx index 923ee9c132d..c8824e8e0f4 100644 --- a/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx +++ b/Modules/Numerics/Statistics/include/itkGaussianMixtureModelComponent.hxx @@ -192,7 +192,7 @@ GaussianMixtureModelComponent::GenerateData() typename MeanEstimatorType::MeasurementVectorType meanEstimate = m_MeanEstimator->GetMean(); for (MeasurementVectorSizeType i = 0; i < measurementVectorSize; ++i) { - const double changes = itk::Math::abs(m_Mean[i] - meanEstimate[i]); + const double changes = itk::Math::Absolute(m_Mean[i] - meanEstimate[i]); if (changes > this->GetMinimalParametersChange()) { @@ -227,7 +227,7 @@ GaussianMixtureModelComponent::GenerateData() for (MeasurementVectorSizeType j = 0; j < measurementVectorSize; ++j) { const double temp = m_Covariance.GetVnlMatrix().get(i, j) - covEstimate.GetVnlMatrix().get(i, j); - const double changes = itk::Math::abs(temp); + const double changes = itk::Math::Absolute(temp); if (changes > this->GetMinimalParametersChange()) { changed = true; diff --git a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.hxx b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.hxx index 64f71019501..e6f7ab76b39 100644 --- a/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.hxx +++ b/Modules/Numerics/Statistics/include/itkMahalanobisDistanceMetric.hxx @@ -106,7 +106,7 @@ MahalanobisDistanceMetric::CalculateInverseCovariance() { for (unsigned int band_y = 0; band_y < m_Covariance.rows(); ++band_y) { - cov_sum += itk::Math::abs(m_Covariance[band_x][band_y]); + cov_sum += itk::Math::Absolute(m_Covariance[band_x][band_y]); } } // check if it is a zero covariance, if it is, we make its diff --git a/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.hxx b/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.hxx index 1aae886ad3d..c2cc534e4d6 100644 --- a/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.hxx +++ b/Modules/Numerics/Statistics/include/itkManhattanDistanceMetric.hxx @@ -37,7 +37,7 @@ ManhattanDistanceMetric::Evaluate(const MeasurementVectorType & x) cons double distance = 0.0; for (unsigned int i = 0; i < measurementVectorSize; ++i) { - const double temp = itk::Math::abs(this->GetOrigin()[i] - x[i]); + const double temp = itk::Math::Absolute(this->GetOrigin()[i] - x[i]); distance += temp; } return distance; @@ -57,7 +57,7 @@ ManhattanDistanceMetric::Evaluate(const MeasurementVectorType & x1, con double distance = 0.0; for (unsigned int i = 0; i < measurementVectorSize; ++i) { - const double temp = itk::Math::abs(x1[i] - x2[i]); + const double temp = itk::Math::Absolute(x1[i] - x2[i]); distance += temp; } return distance; diff --git a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx index 2a214e8d7e0..1502f078518 100644 --- a/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkScalarImageToCooccurrenceMatrixFilter.hxx @@ -136,7 +136,7 @@ ScalarImageToCooccurrenceMatrixFilter minRadius) { minRadius = distance; diff --git a/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx b/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx index 030e7e8a048..ba0ed824489 100644 --- a/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx +++ b/Modules/Numerics/Statistics/src/itkMaximumRatioDecisionRule.cxx @@ -62,7 +62,7 @@ MaximumRatioDecisionRule::SetPriorProbabilities(const PriorProbabilityVectorType auto pit = p.begin(); for (auto it = m_PriorProbabilities.begin(); pit != p.end(); ++pit, ++it) { - if (itk::Math::abs(*pit - *it) > itk::Math::eps) + if (itk::Math::Absolute(*pit - *it) > itk::Math::eps) { break; } diff --git a/Modules/Numerics/Statistics/test/itkChiSquareDistributionTest.cxx b/Modules/Numerics/Statistics/test/itkChiSquareDistributionTest.cxx index f29fe45590d..74b4fd43528 100644 --- a/Modules/Numerics/Statistics/test/itkChiSquareDistributionTest.cxx +++ b/Modules/Numerics/Statistics/test/itkChiSquareDistributionTest.cxx @@ -72,7 +72,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateCDF(x); - const double diff = itk::Math::abs(value - expected1[i]); + const double diff = itk::Math::Absolute(value - expected1[i]); std::cout << "Chi-Square cdf at "; std::cout.width(2); @@ -108,7 +108,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateInverseCDF(expected1[i]); - const double diff = itk::Math::abs(value - static_cast(i)); + const double diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Chi-Square cdf at "; std::cout.width(20); @@ -164,7 +164,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateCDF(x); - const double diff = itk::Math::abs(value - expected11[i]); + const double diff = itk::Math::Absolute(value - expected11[i]); std::cout << "Chi-Square cdf at "; std::cout.width(2); @@ -200,7 +200,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateInverseCDF(expected11[i]); - const double diff = itk::Math::abs(value - static_cast(2 * i)); + const double diff = itk::Math::Absolute(value - static_cast(2 * i)); std::cout << "Chi-Square cdf at "; std::cout.width(20); @@ -246,7 +246,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateCDF(x); - const double diff = itk::Math::abs(value - expected100[i]); + const double diff = itk::Math::Absolute(value - expected100[i]); std::cout << "Chi-Square cdf at "; std::cout.width(2); @@ -282,7 +282,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateInverseCDF(expected100[i]); - const double diff = itk::Math::abs(value - static_cast(50 + 20 * i)); + const double diff = itk::Math::Absolute(value - static_cast(50 + 20 * i)); std::cout << "Chi-Square cdf at "; std::cout.width(20); @@ -327,7 +327,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateCDF(x, params); - const double diff = itk::Math::abs(value - expected100[i]); + const double diff = itk::Math::Absolute(value - expected100[i]); std::cout << "Chi-Square cdf at "; std::cout.width(2); @@ -364,7 +364,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateInverseCDF(expected100[i], params); - const double diff = itk::Math::abs(value - static_cast(50 + 20 * i)); + const double diff = itk::Math::Absolute(value - static_cast(50 + 20 * i)); std::cout << "Chi-Square cdf at "; std::cout.width(20); @@ -409,7 +409,7 @@ itkChiSquareDistributionTest(int, char *[]) last_x = x; const double value = distributionFunction->EvaluateCDF(x, static_cast(params[0])); - const double diff = itk::Math::abs(value - expected100[i]); + const double diff = itk::Math::Absolute(value - expected100[i]); std::cout << "Chi-Square cdf at "; std::cout.width(2); @@ -446,7 +446,7 @@ itkChiSquareDistributionTest(int, char *[]) const double value = distributionFunction->EvaluateInverseCDF(expected100[i], static_cast(params[0])); - const double diff = itk::Math::abs(value - static_cast(50 + 20 * i)); + const double diff = itk::Math::Absolute(value - static_cast(50 + 20 * i)); std::cout << "Chi-Square cdf at "; std::cout.width(20); diff --git a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest.cxx b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest.cxx index a5ef685574d..97fbc2db60d 100644 --- a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest.cxx @@ -125,8 +125,8 @@ itkCovarianceSampleFilterTest(int, char *[]) std::cout << "Mean: " << mean << std::endl; CovarianceSampleFilterType::MeasurementVectorRealType mean2 = covarianceFilter->GetMean(); - if ((itk::Math::abs(mean[0] - mean2[0]) > epsilon) || (itk::Math::abs(mean[1] - mean2[1]) > epsilon) || - (itk::Math::abs(mean[2] - mean2[2]) > epsilon)) + if ((itk::Math::Absolute(mean[0] - mean2[0]) > epsilon) || (itk::Math::Absolute(mean[1] - mean2[1]) > epsilon) || + (itk::Math::Absolute(mean[2] - mean2[2]) > epsilon)) { std::cerr << "Mean parameter value retrieved using GetMean() and the decorator are not the same:: " << mean << ',' << mean2 << std::endl; @@ -155,9 +155,9 @@ itkCovarianceSampleFilterTest(int, char *[]) MeanSampleFilterType::MeasurementVectorRealType meanCalculatedUsingMeanSampleFilter = meanFilter->GetMean(); - if ((itk::Math::abs(meanCalculatedUsingMeanSampleFilter[0] - mean[0]) > epsilon) || - (itk::Math::abs(meanCalculatedUsingMeanSampleFilter[1] - mean[1]) > epsilon) || - (itk::Math::abs(meanCalculatedUsingMeanSampleFilter[2] - mean[2]) > epsilon)) + if ((itk::Math::Absolute(meanCalculatedUsingMeanSampleFilter[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanCalculatedUsingMeanSampleFilter[1] - mean[1]) > epsilon) || + (itk::Math::Absolute(meanCalculatedUsingMeanSampleFilter[2] - mean[2]) > epsilon)) { std::cerr << "Mean calculated using the MeanSampleFilter is different from the one calculated using the covariance filter " diff --git a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest2.cxx b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest2.cxx index cd1a29ee38f..6dad88e44d6 100644 --- a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest2.cxx +++ b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest2.cxx @@ -89,7 +89,7 @@ itkCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -114,7 +114,7 @@ itkCovarianceSampleFilterTest2(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - covarianceOutput[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - covarianceOutput[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -176,7 +176,7 @@ itkCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected2[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected2[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -201,7 +201,7 @@ itkCovarianceSampleFilterTest2(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) { - if (itk::Math::abs(matrixExpected2[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected2[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -271,7 +271,7 @@ itkCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -295,7 +295,7 @@ itkCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) - if (itk::Math::abs(matrixExpected3[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected3[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx index 71e8887fa4b..9344ae9c8aa 100644 --- a/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx +++ b/Modules/Numerics/Statistics/test/itkCovarianceSampleFilterTest3.cxx @@ -179,7 +179,7 @@ itkCovarianceSampleFilterTest3(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanOutput[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanOutput[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; std::cerr << "computed mean = " << meanOutput << std::endl; @@ -194,7 +194,7 @@ itkCovarianceSampleFilterTest3(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) { - if (itk::Math::abs(covariance[i][j] - covarianceOutput[i][j]) > epsilon) + if (itk::Math::Absolute(covariance[i][j] - covarianceOutput[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect:" << i << ',' << j << '=' << covariance[i][j] << ',' << covarianceOutput[i][j] << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkDistanceToCentroidMembershipFunctionTest.cxx b/Modules/Numerics/Statistics/test/itkDistanceToCentroidMembershipFunctionTest.cxx index 6470c19a769..81e0113f98c 100644 --- a/Modules/Numerics/Statistics/test/itkDistanceToCentroidMembershipFunctionTest.cxx +++ b/Modules/Numerics/Statistics/test/itkDistanceToCentroidMembershipFunctionTest.cxx @@ -84,9 +84,9 @@ itkDistanceToCentroidMembershipFunctionTest(int, char *[]) constexpr double tolerance{ 0.001 }; - if (itk::Math::abs(function->GetCentroid()[0] - origin[0]) > tolerance || - itk::Math::abs(function->GetCentroid()[1] - origin[1]) > tolerance || - itk::Math::abs(function->GetCentroid()[2] - origin[2]) > tolerance) + if (itk::Math::Absolute(function->GetCentroid()[0] - origin[0]) > tolerance || + itk::Math::Absolute(function->GetCentroid()[1] - origin[1]) > tolerance || + itk::Math::Absolute(function->GetCentroid()[2] - origin[2]) > tolerance) { std::cerr << "Error in GetCentroid() method" << std::endl; return EXIT_FAILURE; @@ -101,7 +101,7 @@ itkDistanceToCentroidMembershipFunctionTest(int, char *[]) constexpr double trueValue{ 3.31662 }; const double distanceComputed = function->Evaluate(measurement); - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkEuclideanDistanceMetricTest.cxx b/Modules/Numerics/Statistics/test/itkEuclideanDistanceMetricTest.cxx index cfbc031f892..171afb1237a 100644 --- a/Modules/Numerics/Statistics/test/itkEuclideanDistanceMetricTest.cxx +++ b/Modules/Numerics/Statistics/test/itkEuclideanDistanceMetricTest.cxx @@ -79,7 +79,7 @@ itkEuclideanDistanceMetricTest(int, char *[]) const double distanceComputed = distance->Evaluate(measurement); constexpr double tolerance{ 0.001 }; - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; @@ -96,7 +96,7 @@ itkEuclideanDistanceMetricTest(int, char *[]) constexpr double trueValue2{ 1.136 }; const double distanceComputed2 = distance->Evaluate(measurement, measurement2); - if (itk::Math::abs(distanceComputed2 - trueValue2) > tolerance) + if (itk::Math::Absolute(distanceComputed2 - trueValue2) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue2 << "ComputedValue=" << distanceComputed2 << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkEuclideanSquareDistanceMetricTest.cxx b/Modules/Numerics/Statistics/test/itkEuclideanSquareDistanceMetricTest.cxx index 42fb29d86ed..08e48070c98 100644 --- a/Modules/Numerics/Statistics/test/itkEuclideanSquareDistanceMetricTest.cxx +++ b/Modules/Numerics/Statistics/test/itkEuclideanSquareDistanceMetricTest.cxx @@ -81,7 +81,7 @@ itkEuclideanSquareDistanceMetricTest(int, char *[]) const double distanceComputed = distance->Evaluate(measurement); constexpr double tolerance{ 0.001 }; - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; @@ -98,7 +98,7 @@ itkEuclideanSquareDistanceMetricTest(int, char *[]) constexpr double trueValue2{ 1.29 }; const double distanceComputed2 = distance->Evaluate(measurement, measurement2); - if (itk::Math::abs(distanceComputed2 - trueValue2) > tolerance) + if (itk::Math::Absolute(distanceComputed2 - trueValue2) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue2 << "ComputedValue=" << distanceComputed2 << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkGaussianDistributionTest.cxx b/Modules/Numerics/Statistics/test/itkGaussianDistributionTest.cxx index 232111ad38d..74c77878f72 100644 --- a/Modules/Numerics/Statistics/test/itkGaussianDistributionTest.cxx +++ b/Modules/Numerics/Statistics/test/itkGaussianDistributionTest.cxx @@ -65,7 +65,7 @@ itkGaussianDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x); - double diff = itk::Math::abs(value - expected1[i + 5]); + double diff = itk::Math::Absolute(value - expected1[i + 5]); std::cout << "Gaussian cdf at "; std::cout.width(2); @@ -94,7 +94,7 @@ itkGaussianDistributionTest(int, char *[]) { double value = distributionFunction->EvaluateInverseCDF(expected1[i + 5]); - double diff = itk::Math::abs(value - static_cast(i)); + double diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Inverse Gaussian cdf at "; std::cout.width(22); @@ -136,7 +136,7 @@ itkGaussianDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x); - double diff = itk::Math::abs(value - expected2[i + 5]); + double diff = itk::Math::Absolute(value - expected2[i + 5]); std::cout << "Gaussian cdf at "; std::cout.width(2); @@ -181,7 +181,7 @@ itkGaussianDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x, params); - double diff = itk::Math::abs(value - expected3[i + 5]); + double diff = itk::Math::Absolute(value - expected3[i + 5]); std::cout << "Gaussian cdf at "; std::cout.width(2); @@ -219,7 +219,7 @@ itkGaussianDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x, params[0], params[1]); - double diff = itk::Math::abs(value - expected4[i + 5]); + double diff = itk::Math::Absolute(value - expected4[i + 5]); std::cout << "Gaussian cdf at "; std::cout.width(2); @@ -249,7 +249,7 @@ itkGaussianDistributionTest(int, char *[]) { double value = distributionFunction->EvaluateInverseCDF(expected2[i + 5]); - double diff = itk::Math::abs(value - static_cast(i)); + double diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Inverse Gaussian cdf at "; std::cout.width(22); diff --git a/Modules/Numerics/Statistics/test/itkGaussianMembershipFunctionTest.cxx b/Modules/Numerics/Statistics/test/itkGaussianMembershipFunctionTest.cxx index f753720e104..77061dba762 100644 --- a/Modules/Numerics/Statistics/test/itkGaussianMembershipFunctionTest.cxx +++ b/Modules/Numerics/Statistics/test/itkGaussianMembershipFunctionTest.cxx @@ -69,7 +69,7 @@ itkGaussianMembershipFunctionTest(int, char *[]) constexpr double tolerance{ 0.001 }; - if (itk::Math::abs(function->GetMean()[0] - mean[0]) > tolerance) + if (itk::Math::Absolute(function->GetMean()[0] - mean[0]) > tolerance) { std::cerr << "Error in GetMean() method" << std::endl; return EXIT_FAILURE; @@ -82,7 +82,7 @@ itkGaussianMembershipFunctionTest(int, char *[]) constexpr double trueValue{ 0.3989 }; const double distanceComputed = function->Evaluate(measurement); - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << ", ComputedValue=" << distanceComputed << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkHistogramTest.cxx b/Modules/Numerics/Statistics/test/itkHistogramTest.cxx index 3ab928ed5dd..f2eae5736db 100644 --- a/Modules/Numerics/Statistics/test/itkHistogramTest.cxx +++ b/Modules/Numerics/Statistics/test/itkHistogramTest.cxx @@ -545,9 +545,9 @@ itkHistogramTest(int, char *[]) { const HistogramType::MeasurementType minA = binMinimums[dim][k]; const HistogramType::MeasurementType minB = binDimensionMinimums[k]; - if (itk::Math::abs(minA - minB) > epsilon) + if (itk::Math::Absolute(minA - minB) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in itk:Statistics::Histogram::GetMins/GetDimensionMins at index [" << k << "]" << std::endl; @@ -558,9 +558,9 @@ itkHistogramTest(int, char *[]) } const HistogramType::MeasurementType minC = histogram->GetBinMin(dim, k); - if (itk::Math::abs(minA - minC) > epsilon) + if (itk::Math::Absolute(minA - minC) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in itk:Statistics::Histogram::GetMins/GetBinMin at index [" << k << "]" << std::endl; std::cerr << "Expected value " << minA << std::endl; @@ -580,9 +580,9 @@ itkHistogramTest(int, char *[]) { const HistogramType::MeasurementType maxA = binMaximums[dim][k]; const HistogramType::MeasurementType maxB = binDimensionMaximums[k]; - if (itk::Math::abs(maxA - maxB) > epsilon) + if (itk::Math::Absolute(maxA - maxB) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in itk:Statistics::Histogram::GetMaxs/GetDimensionMaxs at index [" << k << "]" << std::endl; @@ -593,9 +593,9 @@ itkHistogramTest(int, char *[]) } const HistogramType::MeasurementType maxC = histogram->GetBinMax(dim, k); - if (itk::Math::abs(maxA - maxC) > epsilon) + if (itk::Math::Absolute(maxA - maxC) > epsilon) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in itk:Statistics::Histogram::GetMaxs/GetBinMax at index [" << k << "]" << std::endl; std::cerr << "Expected value " << maxA << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkHistogramToTextureFeaturesFilterTest.cxx b/Modules/Numerics/Statistics/test/itkHistogramToTextureFeaturesFilterTest.cxx index b413640c855..b3acdfc32d1 100644 --- a/Modules/Numerics/Statistics/test/itkHistogramToTextureFeaturesFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkHistogramToTextureFeaturesFilterTest.cxx @@ -151,28 +151,28 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) const double haralickCorrelation = filter->GetHaralickCorrelation(); - if (itk::Math::abs(energy - trueEnergy) > 0.001) + if (itk::Math::Absolute(energy - trueEnergy) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Energy calculated wrong. Expected: " << trueEnergy << ", got: " << energy << std::endl; passed = false; } - if (itk::Math::abs(entropy - trueEntropy) > 0.001) + if (itk::Math::Absolute(entropy - trueEntropy) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Entropy calculated wrong. Expected: " << trueEntropy << ", got: " << entropy << std::endl; passed = false; } - if (itk::Math::abs(correlation - trueCorrelation) > 0.001) + if (itk::Math::Absolute(correlation - trueCorrelation) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Correlation calculated wrong. Expected: " << trueCorrelation << ", got: " << correlation << std::endl; passed = false; } - if (itk::Math::abs(inverseDifferenceMoment - trueInverseDifferenceMoment) > 0.001) + if (itk::Math::Absolute(inverseDifferenceMoment - trueInverseDifferenceMoment) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "InverseDifferenceMoment calculated wrong. Expected: " << trueInverseDifferenceMoment @@ -180,14 +180,14 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(inertia - trueInertia) > 0.001) + if (itk::Math::Absolute(inertia - trueInertia) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Inertia calculated wrong. Expected: " << trueInertia << ", got: " << inertia << std::endl; passed = false; } - if (itk::Math::abs(clusterShade - trueClusterShade) > 0.001) + if (itk::Math::Absolute(clusterShade - trueClusterShade) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "ClusterShade calculated wrong. Expected: " << trueClusterShade << ", got: " << clusterShade @@ -195,7 +195,7 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(clusterProminence - trueClusterProminence) > 0.001) + if (itk::Math::Absolute(clusterProminence - trueClusterProminence) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "ClusterProminence calculated wrong. Expected: " << trueClusterProminence @@ -203,7 +203,7 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(haralickCorrelation - trueHaralickCorrelation) > 0.001) + if (itk::Math::Absolute(haralickCorrelation - trueHaralickCorrelation) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Haralick's Correlation calculated wrong. Expected: " << trueHaralickCorrelation @@ -236,21 +236,21 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) const double haralickCorrelation2 = filter->GetFeature(itk::Statistics::HistogramToTextureFeaturesFilterEnums::TextureFeature::HaralickCorrelation); - if (itk::Math::abs(energy2 - trueEnergy) > 0.001) + if (itk::Math::Absolute(energy2 - trueEnergy) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Energy calculated wrong. Expected: " << trueEnergy << ", got: " << energy2 << std::endl; passed = false; } - if (itk::Math::abs(entropy2 - trueEntropy) > 0.001) + if (itk::Math::Absolute(entropy2 - trueEntropy) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Entropy calculated wrong. Expected: " << trueEntropy << ", got: " << entropy2 << std::endl; passed = false; } - if (itk::Math::abs(correlation2 - trueCorrelation) > 0.001) + if (itk::Math::Absolute(correlation2 - trueCorrelation) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Correlation calculated wrong. Expected: " << trueCorrelation << ", got: " << correlation2 @@ -258,7 +258,7 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(inverseDifferenceMoment2 - trueInverseDifferenceMoment) > 0.001) + if (itk::Math::Absolute(inverseDifferenceMoment2 - trueInverseDifferenceMoment) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "InverseDifferenceMoment calculated wrong. Expected: " << trueInverseDifferenceMoment @@ -266,14 +266,14 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(inertia2 - trueInertia) > 0.001) + if (itk::Math::Absolute(inertia2 - trueInertia) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Inertia calculated wrong. Expected: " << trueInertia << ", got: " << inertia2 << std::endl; passed = false; } - if (itk::Math::abs(clusterShade2 - trueClusterShade) > 0.001) + if (itk::Math::Absolute(clusterShade2 - trueClusterShade) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "ClusterShade calculated wrong. Expected: " << trueClusterShade << ", got: " << clusterShade2 @@ -281,7 +281,7 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(clusterProminence2 - trueClusterProminence) > 0.001) + if (itk::Math::Absolute(clusterProminence2 - trueClusterProminence) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "ClusterProminence calculated wrong. Expected: " << trueClusterProminence @@ -289,7 +289,7 @@ itkHistogramToTextureFeaturesFilterTest(int, char *[]) passed = false; } - if (itk::Math::abs(haralickCorrelation2 - trueHaralickCorrelation) > 0.001) + if (itk::Math::Absolute(haralickCorrelation2 - trueHaralickCorrelation) > 0.001) { std::cerr << "Error:" << std::endl; std::cerr << "Haralick's Correlation calculated wrong. Expected: " << trueHaralickCorrelation diff --git a/Modules/Numerics/Statistics/test/itkImageToListSampleFilterTest3.cxx b/Modules/Numerics/Statistics/test/itkImageToListSampleFilterTest3.cxx index 3639ee84b45..cb3cd610a59 100644 --- a/Modules/Numerics/Statistics/test/itkImageToListSampleFilterTest3.cxx +++ b/Modules/Numerics/Statistics/test/itkImageToListSampleFilterTest3.cxx @@ -126,7 +126,7 @@ itkImageToListSampleFilterTest3(int, char *[]) constexpr double epsilon{ 1e-6 }; - if (itk::Math::abs(sum - 420.0) > epsilon) + if (itk::Math::Absolute(sum - 420.0) > epsilon) { std::cerr << "Computed sum of pixels in the list sample (masked) is : " << sum << " but should be 420.0"; return EXIT_FAILURE; diff --git a/Modules/Numerics/Statistics/test/itkKdTreeBasedKmeansEstimatorTest.cxx b/Modules/Numerics/Statistics/test/itkKdTreeBasedKmeansEstimatorTest.cxx index 65ccf377505..abbd9e65f70 100644 --- a/Modules/Numerics/Statistics/test/itkKdTreeBasedKmeansEstimatorTest.cxx +++ b/Modules/Numerics/Statistics/test/itkKdTreeBasedKmeansEstimatorTest.cxx @@ -115,7 +115,7 @@ itkKdTreeBasedKmeansEstimatorTest(int argc, char * argv[]) // Set the centroid position change threshold estimator->SetCentroidPositionChangesThreshold(0.0); constexpr double tolerance{ 0.1 }; - if (itk::Math::abs(estimator->GetCentroidPositionChangesThreshold() - 0.0) > tolerance) + if (itk::Math::Absolute(estimator->GetCentroidPositionChangesThreshold() - 0.0) > tolerance) { std::cerr << "Set/GetCentroidPositionChangesThreshold() " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Statistics/test/itkKdTreeTest1.cxx b/Modules/Numerics/Statistics/test/itkKdTreeTest1.cxx index 6b5ad55784d..93017c776cc 100644 --- a/Modules/Numerics/Statistics/test/itkKdTreeTest1.cxx +++ b/Modules/Numerics/Statistics/test/itkKdTreeTest1.cxx @@ -180,7 +180,7 @@ itkKdTreeTest1(int argc, char * argv[]) } } - if (itk::Math::abs(min_dist - result_dist) > 10.0 * itk::NumericTraits::epsilon() * min_dist) + if (itk::Math::Absolute(min_dist - result_dist) > 10.0 * itk::NumericTraits::epsilon() * min_dist) { std::cerr << "Problem found " << std::endl; std::cerr << "Query point " << queryPoint << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkListSampleTest.cxx b/Modules/Numerics/Statistics/test/itkListSampleTest.cxx index 95b685b5126..240b7a5e9e9 100644 --- a/Modules/Numerics/Statistics/test/itkListSampleTest.cxx +++ b/Modules/Numerics/Statistics/test/itkListSampleTest.cxx @@ -629,7 +629,7 @@ itkListSampleTest(int argc, char * argv[]) MeasurementVectorType vector9b = sample->GetMeasurementVector(7); for (unsigned int kitr = 0; kitr < measurementVectorSize; ++kitr) { - if (itk::Math::abs(vector9b[kitr] - vector9a[kitr])) + if (itk::Math::Absolute(vector9b[kitr] - vector9a[kitr])) { std::cerr << "Constructor with container followed by increments failed" << std::endl; std::cerr << "Expected " << vector9b << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkMahalanobisDistanceMetricTest.cxx b/Modules/Numerics/Statistics/test/itkMahalanobisDistanceMetricTest.cxx index d9089a6259e..889d7e8224b 100644 --- a/Modules/Numerics/Statistics/test/itkMahalanobisDistanceMetricTest.cxx +++ b/Modules/Numerics/Statistics/test/itkMahalanobisDistanceMetricTest.cxx @@ -51,9 +51,9 @@ itkMahalanobisDistanceMetricTest(int, char *[]) // double value comparison tolerance constexpr double tolerance{ 0.001 }; - if (itk::Math::abs(distance->GetMean()[0] - origin[0]) > tolerance || - itk::Math::abs(distance->GetMean()[1] - origin[1]) > tolerance || - itk::Math::abs(distance->GetMean()[2] - origin[2]) > tolerance) + if (itk::Math::Absolute(distance->GetMean()[0] - origin[0]) > tolerance || + itk::Math::Absolute(distance->GetMean()[1] - origin[1]) > tolerance || + itk::Math::Absolute(distance->GetMean()[2] - origin[2]) > tolerance) { std::cerr << " Set/Get Origin error " << std::endl; return EXIT_FAILURE; @@ -68,7 +68,7 @@ itkMahalanobisDistanceMetricTest(int, char *[]) double trueValue = 3.31662; double distanceComputed = distance->Evaluate(measurement); - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; @@ -94,20 +94,20 @@ itkMahalanobisDistanceMetricTest(int, char *[]) distance->SetDoubleMax(doubleMax); // Test Set/Get Epsilon method - if (itk::Math::abs(distance->GetEpsilon() - epsilon) > tolerance) + if (itk::Math::Absolute(distance->GetEpsilon() - epsilon) > tolerance) { std::cerr << "Get/SetEpsilon method error" << std::endl; return EXIT_FAILURE; } // Test Set/Get DoubleMax method - if (itk::Math::abs(distance->GetDoubleMax() - doubleMax) > tolerance) + if (itk::Math::Absolute(distance->GetDoubleMax() - doubleMax) > tolerance) { std::cerr << "Get/SetDoubleMax method error" << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; @@ -170,15 +170,15 @@ itkMahalanobisDistanceMetricTest(int, char *[]) // Get the computed inverse covariance matrix DistanceMetricType::CovarianceMatrixType computedInverseCovarianceMatrix = distance->GetInverseCovariance(); - if (itk::Math::abs(trueInverseCovarianceMatrix[0][0] - computedInverseCovarianceMatrix[0][0]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[0][1] - computedInverseCovarianceMatrix[0][1]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[0][2] - computedInverseCovarianceMatrix[0][2]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[1][0] - computedInverseCovarianceMatrix[1][0]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[1][1] - computedInverseCovarianceMatrix[1][1]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[1][2] - computedInverseCovarianceMatrix[1][2]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[2][0] - computedInverseCovarianceMatrix[2][0]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[2][1] - computedInverseCovarianceMatrix[2][1]) > tolerance || - itk::Math::abs(trueInverseCovarianceMatrix[2][2] - computedInverseCovarianceMatrix[2][2]) > tolerance) + if (itk::Math::Absolute(trueInverseCovarianceMatrix[0][0] - computedInverseCovarianceMatrix[0][0]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[0][1] - computedInverseCovarianceMatrix[0][1]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[0][2] - computedInverseCovarianceMatrix[0][2]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[1][0] - computedInverseCovarianceMatrix[1][0]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[1][1] - computedInverseCovarianceMatrix[1][1]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[1][2] - computedInverseCovarianceMatrix[1][2]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[2][0] - computedInverseCovarianceMatrix[2][0]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[2][1] - computedInverseCovarianceMatrix[2][1]) > tolerance || + itk::Math::Absolute(trueInverseCovarianceMatrix[2][2] - computedInverseCovarianceMatrix[2][2]) > tolerance) { std::cerr << "Inverse computation error" << std::endl; return EXIT_FAILURE; @@ -193,7 +193,7 @@ itkMahalanobisDistanceMetricTest(int, char *[]) origin[0] = 1.5; distance->SetMean(origin); - if (itk::Math::abs(distance->GetMean()[0] - origin[0]) > tolerance) + if (itk::Math::Absolute(distance->GetMean()[0] - origin[0]) > tolerance) { std::cerr << " Set/Get Origin error " << std::endl; return EXIT_FAILURE; @@ -209,7 +209,7 @@ itkMahalanobisDistanceMetricTest(int, char *[]) trueValue = 1.0; distanceComputed = distance->Evaluate(measurementSingleComponent); - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; @@ -224,7 +224,7 @@ itkMahalanobisDistanceMetricTest(int, char *[]) trueValue = 1.0; distanceComputed = distance->Evaluate(measurementSingleComponent, measurementSingleComponent2); - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkManhattanDistanceMetricTest.cxx b/Modules/Numerics/Statistics/test/itkManhattanDistanceMetricTest.cxx index 1ccb9b64cfc..1d84d327bd9 100644 --- a/Modules/Numerics/Statistics/test/itkManhattanDistanceMetricTest.cxx +++ b/Modules/Numerics/Statistics/test/itkManhattanDistanceMetricTest.cxx @@ -80,7 +80,7 @@ itkManhattanDistanceMetricTest(int, char *[]) const double distanceComputed = distance->Evaluate(measurement); constexpr double tolerance{ 0.001 }; - if (itk::Math::abs(distanceComputed - trueValue) > tolerance) + if (itk::Math::Absolute(distanceComputed - trueValue) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue << "ComputedValue=" << distanceComputed << std::endl; @@ -97,7 +97,7 @@ itkManhattanDistanceMetricTest(int, char *[]) constexpr double trueValue2{ 1.7 }; const double distanceComputed2 = distance->Evaluate(measurement, measurement2); - if (itk::Math::abs(distanceComputed2 - trueValue2) > tolerance) + if (itk::Math::Absolute(distanceComputed2 - trueValue2) > tolerance) { std::cerr << "Distance computed not correct: " << "truevalue= " << trueValue2 << "ComputedValue=" << distanceComputed2 << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest.cxx b/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest.cxx index c2e2864cdd1..c8c2fcd9b43 100644 --- a/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest.cxx @@ -101,7 +101,8 @@ itkMeanSampleFilterTest(int, char *[]) constexpr FilterType::MeasurementVectorType::ValueType epsilon{ 1e-6 }; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { pass = false; failureMeassage = "The result is not what is expected"; diff --git a/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest2.cxx b/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest2.cxx index fc8f284f283..052113c2fc3 100644 --- a/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest2.cxx +++ b/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest2.cxx @@ -82,8 +82,8 @@ itkMeanSampleFilterTest2(int, char *[]) // FilterType::MeasurementVectorType::ValueType is an int in this case constexpr FilterType::MeasurementVectorType::ValueType epsilon{ 0 }; - if ((itk::Math::abs(meanOutput[0] - expectedMean[0]) > epsilon) || - (itk::Math::abs(meanOutput[1] - expectedMean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - expectedMean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - expectedMean[1]) > epsilon)) { pass = false; failureMeassage = "The result is not what is expected"; diff --git a/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest3.cxx b/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest3.cxx index 34f4e6fb2c9..c136de188c8 100644 --- a/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest3.cxx +++ b/Modules/Numerics/Statistics/test/itkMeanSampleFilterTest3.cxx @@ -124,7 +124,7 @@ itkMeanSampleFilterTest3(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanOutput[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanOutput[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; std::cerr << "computed mean = " << meanOutput << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkScalarImageToRunLengthFeaturesFilterTest.cxx b/Modules/Numerics/Statistics/test/itkScalarImageToRunLengthFeaturesFilterTest.cxx index e887a795817..4cd9b2aa63c 100644 --- a/Modules/Numerics/Statistics/test/itkScalarImageToRunLengthFeaturesFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkScalarImageToRunLengthFeaturesFilterTest.cxx @@ -199,7 +199,7 @@ itkScalarImageToRunLengthFeaturesFilterTest(int, char *[]) RunLengthFilterType::FeatureValueVector::ConstIterator mIt = means->Begin(); for (int counter = 0; mIt != means->End(); ++mIt, counter++) { - if (itk::Math::abs(expectedMeans[counter] - mIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedMeans[counter] - mIt.Value()) > 0.0001) { std::cerr << "Error. Mean for feature " << counter << " is " << mIt.Value() << ", expected " << expectedMeans[counter] << '.' << std::endl; @@ -213,7 +213,7 @@ itkScalarImageToRunLengthFeaturesFilterTest(int, char *[]) RunLengthFilterType::FeatureValueVector::ConstIterator sIt = stds->Begin(); for (int counter = 0; sIt != stds->End(); ++sIt, counter++) { - if (itk::Math::abs(expectedDeviations[counter] - sIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedDeviations[counter] - sIt.Value()) > 0.0001) { std::cerr << "Error. Deviation for feature " << counter << " is " << sIt.Value() << ", expected " << expectedDeviations[counter] << '.' << std::endl; @@ -234,7 +234,7 @@ itkScalarImageToRunLengthFeaturesFilterTest(int, char *[]) RunLengthFilterType::FeatureValueVector::ConstIterator mIt = means->Begin(); for (int counter = 0; mIt != means->End(); ++mIt, counter++) { - if (itk::Math::abs(expectedMeans2[counter] - mIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedMeans2[counter] - mIt.Value()) > 0.0001) { std::cerr << "Error2. Mean for feature " << counter << " is " << mIt.Value() << ", expected " << expectedMeans2[counter] << '.' << std::endl; @@ -246,7 +246,7 @@ itkScalarImageToRunLengthFeaturesFilterTest(int, char *[]) RunLengthFilterType::FeatureValueVector::ConstIterator sIt = stds->Begin(); for (int counter = 0; sIt != stds->End(); ++sIt, counter++) { - if (itk::Math::abs(expectedDeviations2[counter] - sIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedDeviations2[counter] - sIt.Value()) > 0.0001) { std::cerr << "Error2. Deviation for feature " << counter << " is " << sIt.Value() << ", expected " << expectedDeviations2[counter] << '.' << std::endl; @@ -297,7 +297,7 @@ itkScalarImageToRunLengthFeaturesFilterTest(int, char *[]) RunLengthFilterType::FeatureValueVector::ConstIterator mIt = means->Begin(); for (int counter = 0; mIt != means->End(); ++mIt, counter++) { - if (itk::Math::abs(expectedMeans3[counter] - mIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedMeans3[counter] - mIt.Value()) > 0.0001) { std::cerr << "Error3. Mean for feature " << counter << " is " << mIt.Value() << ", expected " << expectedMeans3[counter] << '.' << std::endl; @@ -310,7 +310,7 @@ itkScalarImageToRunLengthFeaturesFilterTest(int, char *[]) RunLengthFilterType::FeatureValueVector::ConstIterator sIt = stds->Begin(); for (int counter = 0; sIt != stds->End(); ++sIt, counter++) { - if (itk::Math::abs(expectedDeviations3[counter] - sIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedDeviations3[counter] - sIt.Value()) > 0.0001) { std::cerr << "Error3. Deviation for feature " << counter << " is " << sIt.Value() << ", expected " << expectedDeviations3[counter] << '.' << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkScalarImageToTextureFeaturesFilterTest.cxx b/Modules/Numerics/Statistics/test/itkScalarImageToTextureFeaturesFilterTest.cxx index 5f8ea318960..e7d089c1e3f 100644 --- a/Modules/Numerics/Statistics/test/itkScalarImageToTextureFeaturesFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkScalarImageToTextureFeaturesFilterTest.cxx @@ -200,7 +200,7 @@ itkScalarImageToTextureFeaturesFilterTest(int, char *[]) TextureFilterType::FeatureValueVector::ConstIterator mIt = means->Begin(); for (int counter = 0; mIt != means->End(); ++mIt, counter++) { - if (itk::Math::abs(expectedMeans[counter] - mIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedMeans[counter] - mIt.Value()) > 0.0001) { std::cerr << "Error. Mean for feature " << counter << " is " << mIt.Value() << ", expected " << expectedMeans[counter] << '.' << std::endl; @@ -213,7 +213,7 @@ itkScalarImageToTextureFeaturesFilterTest(int, char *[]) TextureFilterType::FeatureValueVector::ConstIterator sIt = stds->Begin(); for (int counter = 0; sIt != stds->End(); ++sIt, counter++) { - if (itk::Math::abs(expectedDeviations[counter] - sIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedDeviations[counter] - sIt.Value()) > 0.0001) { std::cerr << "Error. Deviation for feature " << counter << " is " << sIt.Value() << ", expected " << expectedDeviations[counter] << '.' << std::endl; @@ -235,7 +235,7 @@ itkScalarImageToTextureFeaturesFilterTest(int, char *[]) TextureFilterType::FeatureValueVector::ConstIterator mIt = means->Begin(); for (int counter = 0; mIt != means->End(); ++mIt, counter++) { - if (itk::Math::abs(expectedMeans2[counter] - mIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedMeans2[counter] - mIt.Value()) > 0.0001) { std::cerr << "Error. Mean for feature " << counter << " is " << mIt.Value() << ", expected " << expectedMeans2[counter] << '.' << std::endl; @@ -248,7 +248,7 @@ itkScalarImageToTextureFeaturesFilterTest(int, char *[]) TextureFilterType::FeatureValueVector::ConstIterator sIt = stds->Begin(); for (int counter = 0; sIt != stds->End(); ++sIt, counter++) { - if (itk::Math::abs(expectedDeviations2[counter] - sIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedDeviations2[counter] - sIt.Value()) > 0.0001) { std::cerr << "Error. Deviation for feature " << counter << " is " << sIt.Value() << ", expected " << expectedDeviations2[counter] << '.' << std::endl; @@ -294,7 +294,7 @@ itkScalarImageToTextureFeaturesFilterTest(int, char *[]) TextureFilterType::FeatureValueVector::ConstIterator mIt = means->Begin(); for (int counter = 0; mIt != means->End(); ++mIt, counter++) { - if (itk::Math::abs(expectedMeans3[counter] - mIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedMeans3[counter] - mIt.Value()) > 0.0001) { std::cerr << "Error. Mean for feature " << counter << " is " << mIt.Value() << ", expected " << expectedMeans3[counter] << '.' << std::endl; @@ -307,7 +307,7 @@ itkScalarImageToTextureFeaturesFilterTest(int, char *[]) TextureFilterType::FeatureValueVector::ConstIterator sIt = stds->Begin(); for (int counter = 0; sIt != stds->End(); ++sIt, counter++) { - if (itk::Math::abs(expectedDeviations3[counter] - sIt.Value()) > 0.0001) + if (itk::Math::Absolute(expectedDeviations3[counter] - sIt.Value()) > 0.0001) { std::cerr << "Error. Deviation for feature " << counter << " is " << sIt.Value() << ", expected " << expectedDeviations3[counter] << '.' << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkStandardDeviationPerComponentSampleFilterTest.cxx b/Modules/Numerics/Statistics/test/itkStandardDeviationPerComponentSampleFilterTest.cxx index d6c9015ebb1..17fb96baeeb 100644 --- a/Modules/Numerics/Statistics/test/itkStandardDeviationPerComponentSampleFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkStandardDeviationPerComponentSampleFilterTest.cxx @@ -142,9 +142,9 @@ itkStandardDeviationPerComponentSampleFilterTest(int, char *[]) MeasurementVectorRealType standardDeviation2 = standardDeviationFilter->GetStandardDeviationPerComponent(); - if ((itk::Math::abs(standardDeviation[0] - standardDeviation2[0]) > epsilon) || - (itk::Math::abs(standardDeviation[1] - standardDeviation2[1]) > epsilon) || - (itk::Math::abs(standardDeviation[2] - standardDeviation2[2]) > epsilon)) + if ((itk::Math::Absolute(standardDeviation[0] - standardDeviation2[0]) > epsilon) || + (itk::Math::Absolute(standardDeviation[1] - standardDeviation2[1]) > epsilon) || + (itk::Math::Absolute(standardDeviation[2] - standardDeviation2[2]) > epsilon)) { std::cerr << "Standard Deviation value retrieved using Get() and the decorator are not the same:: " << standardDeviation << ',' << standardDeviation2 << std::endl; @@ -168,9 +168,9 @@ itkStandardDeviationPerComponentSampleFilterTest(int, char *[]) CovarianceSampleFilterType::MeasurementVectorRealType meanCalculatedUsingCovarianceSampleFilter = covarianceFilter->GetMean(); - if ((itk::Math::abs(meanCalculatedUsingCovarianceSampleFilter[0] - mean[0]) > epsilon) || - (itk::Math::abs(meanCalculatedUsingCovarianceSampleFilter[1] - mean[1]) > epsilon) || - (itk::Math::abs(meanCalculatedUsingCovarianceSampleFilter[2] - mean[2]) > epsilon)) + if ((itk::Math::Absolute(meanCalculatedUsingCovarianceSampleFilter[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanCalculatedUsingCovarianceSampleFilter[1] - mean[1]) > epsilon) || + (itk::Math::Absolute(meanCalculatedUsingCovarianceSampleFilter[2] - mean[2]) > epsilon)) { std::cerr << "Mean calculated using the CovarianceSampleFilter is different from the one calculated using the " "StandardDeviationPerComponentSampleFilter " @@ -186,7 +186,7 @@ itkStandardDeviationPerComponentSampleFilterTest(int, char *[]) const double variance = covarianceCalculatedUsingCovarianceSampleFilter(k, k); const double standardDeviationValue = std::sqrt(variance); - if ((itk::Math::abs(standardDeviationValue - standardDeviation[k]) > epsilon)) + if ((itk::Math::Absolute(standardDeviationValue - standardDeviation[k]) > epsilon)) { std::cerr << "Standard deviation calculated using the CovarianceSampleFilter"; std::cerr << " (as the square root of the diagonal) is different from "; diff --git a/Modules/Numerics/Statistics/test/itkStatisticsAlgorithmTest.cxx b/Modules/Numerics/Statistics/test/itkStatisticsAlgorithmTest.cxx index 1da33580094..f7c5f1b3b8e 100644 --- a/Modules/Numerics/Statistics/test/itkStatisticsAlgorithmTest.cxx +++ b/Modules/Numerics/Statistics/test/itkStatisticsAlgorithmTest.cxx @@ -95,14 +95,14 @@ itkStatisticsAlgorithmTest(int, char *[]) for (unsigned int j = 0; j < measurementVectorSize; ++j) { - if (itk::Math::abs(lower[j] - realLower[j]) > epsilon) + if (itk::Math::Absolute(lower[j] - realLower[j]) > epsilon) { std::cerr << "FindSampleBound() failed" << std::endl; std::cerr << "Expected lower = " << realLower << std::endl; std::cerr << "Computed lower = " << lower << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(upper[j] - realUpper[j]) > epsilon) + if (itk::Math::Absolute(upper[j] - realUpper[j]) > epsilon) { std::cerr << "FindSampleBound() failed" << std::endl; std::cerr << "Expected upper = " << realUpper << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkSubsampleTest2.cxx b/Modules/Numerics/Statistics/test/itkSubsampleTest2.cxx index e87e7fffc59..af9f172d336 100644 --- a/Modules/Numerics/Statistics/test/itkSubsampleTest2.cxx +++ b/Modules/Numerics/Statistics/test/itkSubsampleTest2.cxx @@ -299,7 +299,7 @@ itkSubsampleTest2(int, char *[]) MeasurementVectorType vector9b = subSample2->GetMeasurementVector(targetEntry); for (unsigned int kitr = 0; kitr < measurementVectorSize; ++kitr) { - if (itk::Math::abs(vector9b[kitr] - vector9a[kitr])) + if (itk::Math::Absolute(vector9b[kitr] - vector9a[kitr])) { std::cerr << "Constructor with container followed by increments failed" << std::endl; std::cerr << "Expected " << vector9b << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkSubsampleTest3.cxx b/Modules/Numerics/Statistics/test/itkSubsampleTest3.cxx index e627bc62ce3..8501506ad8b 100644 --- a/Modules/Numerics/Statistics/test/itkSubsampleTest3.cxx +++ b/Modules/Numerics/Statistics/test/itkSubsampleTest3.cxx @@ -86,7 +86,8 @@ itkSubsampleTest3(int, char *[]) constexpr FilterType::MeasurementVectorType::ValueType epsilon{ 1e-6 }; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { std::cerr << "The result is not what is expected" << std::endl; return EXIT_FAILURE; @@ -121,7 +122,8 @@ itkSubsampleTest3(int, char *[]) std::cout << meanOutput[0] << ' ' << mean[0] << ' ' << meanOutput[1] << ' ' << mean[1] << ' ' << std::endl; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { std::cerr << "The result is not what is expected" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Statistics/test/itkTDistributionTest.cxx b/Modules/Numerics/Statistics/test/itkTDistributionTest.cxx index d8c4d4613fe..4d68feb3b76 100644 --- a/Modules/Numerics/Statistics/test/itkTDistributionTest.cxx +++ b/Modules/Numerics/Statistics/test/itkTDistributionTest.cxx @@ -66,7 +66,7 @@ itkTDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x); - double diff = itk::Math::abs(value - expected1[i + 5]); + double diff = itk::Math::Absolute(value - expected1[i + 5]); std::cout << "Student-t cdf at "; std::cout.width(2); @@ -102,7 +102,7 @@ itkTDistributionTest(int, char *[]) double value = distributionFunction->EvaluateInverseCDF(expected1[i + 5]); - double diff = itk::Math::abs(value - static_cast(i)); + double diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Student-t cdf at "; std::cout.width(20); @@ -151,7 +151,7 @@ itkTDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x); - double diff = itk::Math::abs(value - expected11[i + 5]); + double diff = itk::Math::Absolute(value - expected11[i + 5]); std::cout << "Student-t cdf at "; std::cout.width(2); @@ -187,7 +187,7 @@ itkTDistributionTest(int, char *[]) double value = distributionFunction->EvaluateInverseCDF(expected11[i + 5]); - double diff = itk::Math::abs(value - static_cast(i)); + double diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Student-t cdf at "; std::cout.width(20); @@ -234,7 +234,7 @@ itkTDistributionTest(int, char *[]) double value = distributionFunction->EvaluateCDF(x, params); - double diff = itk::Math::abs(value - expected11[i + 5]); + double diff = itk::Math::Absolute(value - expected11[i + 5]); std::cout << "Student-t cdf at "; std::cout.width(2); @@ -271,7 +271,7 @@ itkTDistributionTest(int, char *[]) double value = distributionFunction->EvaluateInverseCDF(expected11[i + 5], params); - double diff = itk::Math::abs(value - static_cast(i)); + double diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Student-t cdf at "; std::cout.width(20); @@ -317,7 +317,7 @@ itkTDistributionTest(int, char *[]) value = distributionFunction->EvaluateCDF(x, static_cast(params[0])); - diff = itk::Math::abs(value - expected11[i + 5]); + diff = itk::Math::Absolute(value - expected11[i + 5]); std::cout << "Student-t cdf at "; std::cout.width(2); @@ -353,7 +353,7 @@ itkTDistributionTest(int, char *[]) { value = distributionFunction->EvaluateInverseCDF(expected11[i + 5], static_cast(params[0])); - diff = itk::Math::abs(value - static_cast(i)); + diff = itk::Math::Absolute(value - static_cast(i)); std::cout << "Student-t cdf at "; std::cout.width(20); diff --git a/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest1.cxx b/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest1.cxx index e964cf1566b..9098ca5b765 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest1.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest1.cxx @@ -173,7 +173,7 @@ itkWeightedCentroidKdTreeGeneratorTest1(int argc, char * argv[]) } } - if (itk::Math::abs(min_dist - result_dist) > 10.0 * itk::NumericTraits::epsilon() * min_dist) + if (itk::Math::Absolute(min_dist - result_dist) > 10.0 * itk::NumericTraits::epsilon() * min_dist) { std::cerr << "Problem found " << std::endl; std::cerr << "Query point " << queryPoint << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest8.cxx b/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest8.cxx index b8dd86dccc9..70fecac8d7e 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest8.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest8.cxx @@ -175,7 +175,7 @@ itkWeightedCentroidKdTreeGeneratorTest8(int argc, char * argv[]) } } - if (itk::Math::abs(min_dist - result_dist) > itk::Math::eps) + if (itk::Math::Absolute(min_dist - result_dist) > itk::Math::eps) { std::cerr << "Problem found " << std::endl; std::cerr << "Query point " << queryPoint << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest9.cxx b/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest9.cxx index af4c9e79b66..943ea6d362e 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest9.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedCentroidKdTreeGeneratorTest9.cxx @@ -177,7 +177,7 @@ itkWeightedCentroidKdTreeGeneratorTest9(int argc, char * argv[]) } } - if (itk::Math::abs(min_dist - result_dist) > 10.0 * itk::NumericTraits::epsilon() * min_dist) + if (itk::Math::Absolute(min_dist - result_dist) > 10.0 * itk::NumericTraits::epsilon() * min_dist) { std::cerr << "Problem found " << std::endl; std::cerr << "Query point " << queryPoint << std::endl; diff --git a/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx b/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx index 688df462b9c..1f01f5745a4 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest.cxx @@ -164,7 +164,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected33[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected33[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -188,7 +188,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) - if (itk::Math::abs(matrixExpected33[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected33[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -228,7 +228,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -253,7 +253,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -281,7 +281,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -292,7 +292,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -355,7 +355,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -366,7 +366,7 @@ itkWeightedCovarianceSampleFilterTest(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest2.cxx b/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest2.cxx index 4077e7de28a..6f251b42068 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest2.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedCovarianceSampleFilterTest2.cxx @@ -168,7 +168,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize2; ++i) { - if (itk::Math::abs(meanExpected33[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected33[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -192,7 +192,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize2; ++i) { for (unsigned int j = 0; j < MeasurementVectorSize2; ++j) - if (itk::Math::abs(matrixExpected33[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected33[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -233,7 +233,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize2; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -258,7 +258,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize2; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -286,7 +286,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize2; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -297,7 +297,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize2; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; @@ -361,7 +361,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) for (unsigned int i = 0; i < MeasurementVectorSize2; ++i) { - if (itk::Math::abs(meanExpected3[i] - mean[i]) > epsilon) + if (itk::Math::Absolute(meanExpected3[i] - mean[i]) > epsilon) { std::cerr << "The computed mean value is incorrect" << std::endl; return EXIT_FAILURE; @@ -372,7 +372,7 @@ itkWeightedCovarianceSampleFilterTest2(int, char *[]) { for (unsigned int j = 0; j < MeasurementVectorSize2; ++j) { - if (itk::Math::abs(matrixExpected[i][j] - matrix[i][j]) > epsilon) + if (itk::Math::Absolute(matrixExpected[i][j] - matrix[i][j]) > epsilon) { std::cerr << "Computed covariance matrix value is incorrect" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Numerics/Statistics/test/itkWeightedMeanSampleFilterTest.cxx b/Modules/Numerics/Statistics/test/itkWeightedMeanSampleFilterTest.cxx index 0ff6ed65135..b555551c772 100644 --- a/Modules/Numerics/Statistics/test/itkWeightedMeanSampleFilterTest.cxx +++ b/Modules/Numerics/Statistics/test/itkWeightedMeanSampleFilterTest.cxx @@ -144,7 +144,8 @@ itkWeightedMeanSampleFilterTest(int, char *[]) constexpr FilterType::MeasurementVectorType::ValueType epsilon{ 1e-6 }; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { std::cerr << "Wrong result " << std::endl; std::cerr << meanOutput[0] << ' ' << mean[0] << ' ' << meanOutput[1] << ' ' << mean[1] << ' ' << std::endl; @@ -172,7 +173,8 @@ itkWeightedMeanSampleFilterTest(int, char *[]) mean[0] = 2.0; mean[1] = 2.0; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { std::cerr << "Wrong result " << std::endl; std::cerr << meanOutput[0] << ' ' << mean[0] << ' ' << meanOutput[1] << ' ' << mean[1] << ' ' << std::endl; @@ -199,7 +201,8 @@ itkWeightedMeanSampleFilterTest(int, char *[]) mean[0] = 1.7777778; mean[1] = 1.7777778; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { std::cerr << "Wrong result" << std::endl; std::cerr << meanOutput[0] << ' ' << mean[0] << ' ' << meanOutput[1] << ' ' << mean[1] << ' ' << std::endl; @@ -227,7 +230,8 @@ itkWeightedMeanSampleFilterTest(int, char *[]) mean[0] = 2.0; mean[1] = 2.0; - if ((itk::Math::abs(meanOutput[0] - mean[0]) > epsilon) || (itk::Math::abs(meanOutput[1] - mean[1]) > epsilon)) + if ((itk::Math::Absolute(meanOutput[0] - mean[0]) > epsilon) || + (itk::Math::Absolute(meanOutput[1] - mean[1]) > epsilon)) { std::cerr << "Wrong result" << std::endl; std::cerr << meanOutput[0] << ' ' << mean[0] << ' ' << meanOutput[1] << ' ' << mean[1] << ' ' << std::endl; diff --git a/Modules/Registration/Common/include/itkCorrelationCoefficientHistogramImageToImageMetric.hxx b/Modules/Registration/Common/include/itkCorrelationCoefficientHistogramImageToImageMetric.hxx index 00791561b5a..a3f491b3ba6 100644 --- a/Modules/Registration/Common/include/itkCorrelationCoefficientHistogramImageToImageMetric.hxx +++ b/Modules/Registration/Common/include/itkCorrelationCoefficientHistogramImageToImageMetric.hxx @@ -31,7 +31,7 @@ CorrelationCoefficientHistogramImageToImageMetric::Ev const MeasureType varianceY = this->VarianceY(histogram); const MeasureType covariance = this->Covariance(histogram); - return itk::Math::abs(covariance / (std::sqrt(varianceX) * std::sqrt(varianceY))); + return itk::Math::Absolute(covariance / (std::sqrt(varianceX) * std::sqrt(varianceY))); } template diff --git a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx index 23700fb473f..ae1bfa05d34 100644 --- a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx +++ b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx @@ -717,7 +717,7 @@ LandmarkBasedTransformInitializer::Intern } itkDebugMacro("Dot Product of landmarks: " << s_dot << " Cross Product: " << s_cross); - if (itk::Math::abs(s_dot) > 0.00005) + if (itk::Math::Absolute(s_dot) > 0.00005) { rotationAngle = std::atan2(s_cross, s_dot); } diff --git a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.hxx b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.hxx index fd457680b97..89c76b31f27 100644 --- a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.hxx +++ b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.hxx @@ -139,7 +139,7 @@ MeanSquareRegistrationFunction::C denominator = 1.0; } PixelType update; - if (itk::Math::abs(speedValue) < m_IntensityDifferenceThreshold || denominator < m_DenominatorThreshold) + if (itk::Math::Absolute(speedValue) < m_IntensityDifferenceThreshold || denominator < m_DenominatorThreshold) { update.Fill(0.0); return update; diff --git a/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration11.cxx b/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration11.cxx index 278fbf1f37d..8889778d1a5 100644 --- a/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration11.cxx +++ b/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration11.cxx @@ -81,7 +81,7 @@ class CommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; diff --git a/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration14.cxx b/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration14.cxx index efb83ff9091..bbeef0f67e7 100644 --- a/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration14.cxx +++ b/Modules/Registration/Common/test/RegistrationITKv3/ImageRegistration14.cxx @@ -73,7 +73,7 @@ class CommandIterationUpdate : public itk::Command } const double currentValue = optimizer->GetValue(); // Only print out when the Metric value changes - if (itk::Math::abs(m_LastMetricValue - currentValue) > 1e-7) + if (itk::Math::Absolute(m_LastMetricValue - currentValue) > 1e-7) { std::cout << optimizer->GetCurrentIteration() << " "; std::cout << currentValue << " "; diff --git a/Modules/Registration/Common/test/itkCenteredTransformInitializerTest.cxx b/Modules/Registration/Common/test/itkCenteredTransformInitializerTest.cxx index 1f9ea63171d..b8b9f25633d 100644 --- a/Modules/Registration/Common/test/itkCenteredTransformInitializerTest.cxx +++ b/Modules/Registration/Common/test/itkCenteredTransformInitializerTest.cxx @@ -98,7 +98,7 @@ RunTest(itk::SmartPointer fixedImage, itk::SmartPointer tolerance) + if (itk::Math::Absolute(center1[k] - fixedCenter[k]) > tolerance) { std::cerr << "Center differs from expected value" << std::endl; std::cerr << "It should be " << fixedCenter << std::endl; @@ -106,7 +106,7 @@ RunTest(itk::SmartPointer fixedImage, itk::SmartPointer tolerance) + if (itk::Math::Absolute(translation1[k] - relativeCenter[k]) > tolerance) { std::cerr << "Translation differs from expected value" << std::endl; std::cerr << "It should be " << relativeCenter << std::endl; @@ -114,7 +114,7 @@ RunTest(itk::SmartPointer fixedImage, itk::SmartPointer tolerance) + if (itk::Math::Absolute(offset1[k] - relativeCenter[k]) > tolerance) { std::cerr << "Offset differs from expected value" << std::endl; std::cerr << "It should be " << relativeCenter << std::endl; @@ -139,7 +139,7 @@ RunTest(itk::SmartPointer fixedImage, itk::SmartPointer tolerance) + if (itk::Math::Absolute(center2[k] - fixedCenter[k]) > tolerance) { std::cerr << "Center differs from expected value" << std::endl; std::cerr << "It should be " << fixedCenter << std::endl; @@ -147,7 +147,7 @@ RunTest(itk::SmartPointer fixedImage, itk::SmartPointer tolerance) + if (itk::Math::Absolute(translation2[k] - relativeCenter[k]) > tolerance) { std::cerr << "Translation differs from expected value" << std::endl; std::cerr << "It should be " << relativeCenter << std::endl; @@ -155,7 +155,7 @@ RunTest(itk::SmartPointer fixedImage, itk::SmartPointer tolerance) + if (itk::Math::Absolute(offset2[k] - relativeCenter[k]) > tolerance) { std::cerr << "Offset differs from expected value" << std::endl; std::cerr << "It should be " << relativeCenter << std::endl; diff --git a/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx b/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx index 156119ad884..8fed82d4b74 100644 --- a/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx +++ b/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx @@ -143,7 +143,7 @@ itkCenteredVersorTransformInitializerTest(int, char *[]) for (unsigned int k = 0; k < Dimension; ++k) { - if (itk::Math::abs(translation2[k] - relativeCenter[k]) > tolerance) + if (itk::Math::Absolute(translation2[k] - relativeCenter[k]) > tolerance) { std::cerr << "Translation differs from expected value" << std::endl; std::cerr << "It should be " << relativeCenter << std::endl; @@ -151,7 +151,7 @@ itkCenteredVersorTransformInitializerTest(int, char *[]) pass = false; break; } - if (itk::Math::abs(offset2[k] - relativeCenter[k]) > tolerance) + if (itk::Math::Absolute(offset2[k] - relativeCenter[k]) > tolerance) { std::cerr << "Offset differs from expected value" << std::endl; std::cerr << "It should be " << relativeCenter << std::endl; @@ -178,7 +178,7 @@ itkCenteredVersorTransformInitializerTest(int, char *[]) for (unsigned int j = 0; j < Dimension; ++j) { - if (itk::Math::abs(expectedPoint[j] - mappedOrigin[j]) > tolerance) + if (itk::Math::Absolute(expectedPoint[j] - mappedOrigin[j]) > tolerance) { std::cerr << "Mapped point differs from expected point" << std::endl; std::cerr << "It should be " << expectedPoint << std::endl; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_1.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_1.cxx index 3be11bdb26d..6032d160aeb 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_1.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_1.cxx @@ -175,7 +175,7 @@ itkImageRegistrationMethodTest_1(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_10.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_10.cxx index d81cf3caf71..73b18b8aba0 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_10.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_10.cxx @@ -183,7 +183,7 @@ itkImageRegistrationMethodTest_10(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_12.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_12.cxx index 1f7978a52a6..d7e319287ac 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_12.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_12.cxx @@ -182,7 +182,7 @@ itkImageRegistrationMethodTest_12(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_13.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_13.cxx index 9bdeeb8594a..33d7c18b97f 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_13.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_13.cxx @@ -291,7 +291,7 @@ itkImageRegistrationMethodTest_13(int, char *[]) for (unsigned int j = 0; j < 9; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { std::cout << "Failed " << j << std::endl; pass = false; @@ -299,7 +299,7 @@ itkImageRegistrationMethodTest_13(int, char *[]) } for (unsigned int j = 9; j < 12; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { std::cout << "Failed " << j << std::endl; pass = false; @@ -393,7 +393,7 @@ F(itk::Vector & v) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_14.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_14.cxx index 49bcae6eb44..a8c1b24ba17 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_14.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_14.cxx @@ -300,14 +300,14 @@ itkImageRegistrationMethodTest_14(int, char *[]) for (unsigned int j = 0; j < 4; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { pass = false; } } for (unsigned int j = 4; j < 7; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { pass = false; } @@ -402,7 +402,7 @@ F(itk::Vector & v) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_15.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_15.cxx index 4e057975728..fc84897e7f7 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_15.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_15.cxx @@ -291,14 +291,14 @@ itkImageRegistrationMethodTest_15(int, char *[]) for (unsigned int j = 0; j < 9; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { pass = false; } } for (unsigned int j = 9; j < 12; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { pass = false; } @@ -337,7 +337,7 @@ F(itk::Vector & v) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_16.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_16.cxx index 211f24b11c7..84a802ad206 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_16.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_16.cxx @@ -161,7 +161,7 @@ DoRegistration() // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx index 561b540a773..833a7e5ec8b 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx @@ -299,14 +299,14 @@ itkImageRegistrationMethodTest_17(int, char *[]) for (unsigned int j = 0; j < 9; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { pass = false; } } for (unsigned int j = 9; j < 12; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { pass = false; } @@ -345,7 +345,7 @@ F(itk::Vector & v) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_2.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_2.cxx index a8e45cd85bb..abe2cb624a2 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_2.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_2.cxx @@ -183,7 +183,7 @@ itkImageRegistrationMethodTest_2(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_3.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_3.cxx index 32c47b1c897..e491546b2c1 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_3.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_3.cxx @@ -171,7 +171,7 @@ itkImageRegistrationMethodTest_3(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_4.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_4.cxx index 5f5312b9713..699506b8af2 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_4.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_4.cxx @@ -182,7 +182,7 @@ itkImageRegistrationMethodTest_4(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_5.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_5.cxx index 727dccbdcd0..3a7ce8a57f8 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_5.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_5.cxx @@ -179,7 +179,7 @@ itkImageRegistrationMethodTest_5_Func(int argc, char * argv[], bool subtractMean // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_6.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_6.cxx index 8b315333e1a..fb7f78324ba 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_6.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_6.cxx @@ -182,7 +182,7 @@ itkImageRegistrationMethodTest_6(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i + offsetOrder] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i + offsetOrder] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_7.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_7.cxx index 7fefb979d6d..d02756b722b 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_7.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_7.cxx @@ -167,7 +167,7 @@ itkImageRegistrationMethodTest_7(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_8.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_8.cxx index f850a74e4ba..708fb251250 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_8.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_8.cxx @@ -181,7 +181,7 @@ itkImageRegistrationMethodTest_8(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_9.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_9.cxx index 1c3a6734e65..438b33f02c4 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_9.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_9.cxx @@ -186,7 +186,7 @@ itkImageRegistrationMethodTest_9(int argc, char * argv[]) // the parameters are negated in order to get the inverse transformation. // this only works for comparing translation parameters.... std::cout << finalParameters[i] << " == " << -actualParameters[i] << std::endl; - if (itk::Math::abs(finalParameters[i] - (-actualParameters[i])) > tolerance) + if (itk::Math::Absolute(finalParameters[i] - (-actualParameters[i])) > tolerance) { std::cout << "Tolerance exceeded at component " << i << std::endl; pass = false; diff --git a/Modules/Registration/Common/test/itkMattesMutualInformationImageToImageMetricTest.cxx b/Modules/Registration/Common/test/itkMattesMutualInformationImageToImageMetricTest.cxx index 9c8676d1f4d..ab83325d00b 100644 --- a/Modules/Registration/Common/test/itkMattesMutualInformationImageToImageMetricTest.cxx +++ b/Modules/Registration/Common/test/itkMattesMutualInformationImageToImageMetricTest.cxx @@ -384,7 +384,7 @@ TestMattesMetricWithAffineTransform(TInterpolator * interpolator, std::cout << ratio << '\t'; std::cout << std::endl; - if (itk::Math::abs(ratio - 1.0) > 0.012) + if (itk::Math::Absolute(ratio - 1.0) > 0.012) { std::cout << "computed derivative differ from central difference." << std::endl; testFailed = true; @@ -665,7 +665,7 @@ TestMattesMetricWithBSplineTransform(TInterpolator * interpolator, std::cout << ratio << '\t'; std::cout << std::endl; - if (itk::Math::abs(ratio - 1.0) > 0.05 && itk::Math::abs(derivative[i]) > 1e-4) + if (itk::Math::Absolute(ratio - 1.0) > 0.05 && itk::Math::Absolute(derivative[i]) > 1e-4) { std::cout << "computed derivative differ from central difference." << std::endl; testFailed = true; diff --git a/Modules/Registration/Common/test/itkMeanSquaresImageMetricTest.cxx b/Modules/Registration/Common/test/itkMeanSquaresImageMetricTest.cxx index 3647321a455..6f7bcd818cd 100644 --- a/Modules/Registration/Common/test/itkMeanSquaresImageMetricTest.cxx +++ b/Modules/Registration/Common/test/itkMeanSquaresImageMetricTest.cxx @@ -243,14 +243,14 @@ itkMeanSquaresImageMetricTest(int, char *[]) bool sameDerivative = true; for (unsigned int d = 0; d < parameters.Size(); ++d) { - if (itk::Math::abs(derivative[d] - referenceDerivative[d]) > 1e-5) + if (itk::Math::Absolute(derivative[d] - referenceDerivative[d]) > 1e-5) { sameDerivative = false; break; } } - if (itk::Math::abs(measure - referenceMeasure) > 1e-5 || !sameDerivative) + if (itk::Math::Absolute(measure - referenceMeasure) > 1e-5 || !sameDerivative) { std::cout << "Testing different number of threads... FAILED" << std::endl; std::cout << "Metric value computed with " << currNumThreadsToTest << " threads is incorrect. Computed value is " @@ -284,7 +284,7 @@ itkMeanSquaresImageMetricTest(int, char *[]) std::cout.precision(5); std::cout << derivative[1]; std::cout << std::endl; - if (itk::Math::abs(measure - referenceMeasure) > 1e-5) + if (itk::Math::Absolute(measure - referenceMeasure) > 1e-5) { std::cout << "Test reducing global max number of threads... FAILED." << std::endl; std::cout << "Metric value computed with " << numThreads << " threads is incorrect. Computed value is " << measure @@ -350,7 +350,7 @@ itkMeanSquaresImageMetricTest(int, char *[]) bool sameDerivative = true; for (unsigned int d = 0; d < bSplineParameters.Size(); ++d) { - if (itk::Math::abs(derivativeWithCaching[d] - derivativeNoCaching[d]) > 1e-5) + if (itk::Math::Absolute(derivativeWithCaching[d] - derivativeNoCaching[d]) > 1e-5) { sameDerivative = false; break; diff --git a/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_1.cxx b/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_1.cxx index 080a9963a50..308bc012f60 100644 --- a/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_1.cxx +++ b/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_1.cxx @@ -295,14 +295,14 @@ itkMultiResolutionImageRegistrationMethodTest_1(int, char *[]) for (unsigned int j = 0; j < 9; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { pass = false; } } for (unsigned int j = 9; j < 12; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { pass = false; } @@ -518,14 +518,14 @@ itkMultiResolutionImageRegistrationMethodTest_1(int, char *[]) for (unsigned int j = 0; j < 9; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { pass = false; } } for (unsigned int j = 9; j < 12; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { pass = false; } @@ -563,7 +563,7 @@ F(itk::Vector & v) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_2.cxx b/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_2.cxx index 6c91929d41e..d67e5c6828d 100644 --- a/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_2.cxx +++ b/Modules/Registration/Common/test/itkMultiResolutionImageRegistrationMethodTest_2.cxx @@ -283,14 +283,14 @@ itkMultiResolutionImageRegistrationMethodTest_2(int, char *[]) for (unsigned int j = 0; j < 4; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 0.025) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 0.025) { pass = false; } } for (unsigned int j = 4; j < 7; ++j) { - if (itk::Math::abs(solution[j] - trueParameters[j]) > 1.0) + if (itk::Math::Absolute(solution[j] - trueParameters[j]) > 1.0) { pass = false; } @@ -383,7 +383,7 @@ F(itk::Vector & v) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkMultiResolutionPyramidImageFilterTest.cxx b/Modules/Registration/Common/test/itkMultiResolutionPyramidImageFilterTest.cxx index ff49d51539f..acacb4f32b7 100644 --- a/Modules/Registration/Common/test/itkMultiResolutionPyramidImageFilterTest.cxx +++ b/Modules/Registration/Common/test/itkMultiResolutionPyramidImageFilterTest.cxx @@ -40,7 +40,7 @@ F(double x, double y, double z) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/Common/test/itkPointSetToPointSetRegistrationTest.cxx b/Modules/Registration/Common/test/itkPointSetToPointSetRegistrationTest.cxx index d3dbe9c5fa7..a43c4ad6ab2 100644 --- a/Modules/Registration/Common/test/itkPointSetToPointSetRegistrationTest.cxx +++ b/Modules/Registration/Common/test/itkPointSetToPointSetRegistrationTest.cxx @@ -173,7 +173,8 @@ itkPointSetToPointSetRegistrationTest(int, char *[]) std::cout << "Solution = " << transform->GetParameters() << std::endl; - if ((itk::Math::abs(transform->GetParameters()[0]) > 1.0) || (itk::Math::abs(transform->GetParameters()[1]) > 1.0)) + if ((itk::Math::Absolute(transform->GetParameters()[0]) > 1.0) || + (itk::Math::Absolute(transform->GetParameters()[1]) > 1.0)) { return EXIT_FAILURE; } @@ -235,7 +236,8 @@ itkPointSetToPointSetRegistrationTest(int, char *[]) std::cout << "Solution = " << transform->GetParameters() << std::endl; - if ((itk::Math::abs(transform->GetParameters()[0]) > 1.0) || (itk::Math::abs(transform->GetParameters()[1]) > 1.0)) + if ((itk::Math::Absolute(transform->GetParameters()[0]) > 1.0) || + (itk::Math::Absolute(transform->GetParameters()[1]) > 1.0)) { return EXIT_FAILURE; } diff --git a/Modules/Registration/Common/test/itkRecursiveMultiResolutionPyramidImageFilterTest.cxx b/Modules/Registration/Common/test/itkRecursiveMultiResolutionPyramidImageFilterTest.cxx index dab2f353aeb..27d0771e5f8 100644 --- a/Modules/Registration/Common/test/itkRecursiveMultiResolutionPyramidImageFilterTest.cxx +++ b/Modules/Registration/Common/test/itkRecursiveMultiResolutionPyramidImageFilterTest.cxx @@ -40,7 +40,7 @@ F(double x, double y, double z) const double r = std::sqrt(x * x + y * y + z * z); if (r > 35) { - value = 2 * (itk::Math::abs(x) + 0.8 * itk::Math::abs(y) + 0.5 * itk::Math::abs(z)); + value = 2 * (itk::Math::Absolute(x) + 0.8 * itk::Math::Absolute(y) + 0.5 * itk::Math::Absolute(z)); } if (r < 4) { diff --git a/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx b/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx index afb22318bca..7000286bedc 100644 --- a/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx +++ b/Modules/Registration/FEM/include/itkFEMFiniteDifferenceFunctionLoad.hxx @@ -176,7 +176,7 @@ FiniteDifferenceFunctionLoad::EvaluateMetricGivenSolution(Eleme try { this->Fe(gPos); - tempe = itk::Math::abs(0.0); + tempe = itk::Math::Absolute(0.0); } catch (...) { @@ -192,7 +192,7 @@ FiniteDifferenceFunctionLoad::EvaluateMetricGivenSolution(Eleme defe += element->GetElementDeformationEnergy(solmat); } - return itk::Math::abs(static_cast(energy) * static_cast(m_Gamma) - static_cast(defe)); + return itk::Math::Absolute(static_cast(energy) * static_cast(m_Gamma) - static_cast(defe)); } template @@ -232,7 +232,7 @@ FiniteDifferenceFunctionLoad::Fe(FEMVectorType Gpos) -> FEMVect bool inimage = true; for (unsigned int k = 0; k < ImageDimension; ++k) { - if (itk::Math::isnan(Gpos[k]) || itk::Math::isinf(Gpos[k]) || itk::Math::abs(Gpos[k]) > 1.e33) + if (itk::Math::isnan(Gpos[k]) || itk::Math::isinf(Gpos[k]) || itk::Math::Absolute(Gpos[k]) > 1.e33) { return femVec; } diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx index e942199cb9b..45d5d00568a 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx @@ -1069,9 +1069,9 @@ FEMRegistrationFilter::PrintVectorField(u } for (unsigned int i = 0; i < ImageDimension; ++i) { - if (itk::Math::abs(disp[i]) > max) + if (itk::Math::Absolute(disp[i]) > max) { - max = itk::Math::abs(disp[i]); + max = itk::Math::Absolute(disp[i]); } } ++fieldIter; @@ -1169,7 +1169,7 @@ FEMRegistrationFilter::EvaluateResidual(S { SimE = maxsim - SimE; } - return itk::Math::abs(static_cast(SimE)); // +defe; + return itk::Math::Absolute(static_cast(SimE)); // +defe; } template @@ -1186,8 +1186,8 @@ FEMRegistrationFilter::FindBracketingTrip const Float Tiny = 1.e-20; Float ax = 0.0; Float bx = 1.0; - Float fa = itk::Math::abs(this->EvaluateResidual(solver, ax)); - Float fb = itk::Math::abs(this->EvaluateResidual(solver, bx)); + Float fa = itk::Math::Absolute(this->EvaluateResidual(solver, ax)); + Float fb = itk::Math::Absolute(this->EvaluateResidual(solver, bx)); Float dum; @@ -1202,20 +1202,20 @@ FEMRegistrationFilter::FindBracketingTrip } Float cx = bx + Gold * (bx - ax); // first guess for c - the 3rd pt needed to bracket the min - Float fc = itk::Math::abs(this->EvaluateResidual(solver, cx)); + Float fc = itk::Math::Absolute(this->EvaluateResidual(solver, cx)); Float ulim, u, r, q, fu; while (fb > fc) - // && itk::Math::abs(ax) < 3. && itk::Math::abs(bx) < 3. && itk::Math::abs(cx) < 3.) + // && itk::Math::Absolute(ax) < 3. && itk::Math::Absolute(bx) < 3. && itk::Math::Absolute(cx) < 3.) { r = (bx - ax) * (fb - fc); q = (bx - cx) * (fb - fa); - Float denom = (2.0 * solver->GSSign(solver->GSMax(itk::Math::abs(q - r), Tiny), q - r)); + Float denom = (2.0 * solver->GSSign(solver->GSMax(itk::Math::Absolute(q - r), Tiny), q - r)); u = (bx) - ((bx - cx) * q - (bx - ax) * r) / denom; ulim = bx + Glimit * (cx - bx); if ((bx - u) * (u - cx) > 0.0) { - fu = itk::Math::abs(this->EvaluateResidual(solver, u)); + fu = itk::Math::Absolute(this->EvaluateResidual(solver, u)); if (fu < fc) { ax = bx; @@ -1235,11 +1235,11 @@ FEMRegistrationFilter::FindBracketingTrip } u = cx + Gold * (cx - bx); - fu = itk::Math::abs(this->EvaluateResidual(solver, u)); + fu = itk::Math::Absolute(this->EvaluateResidual(solver, u)); } else if ((cx - u) * (u - ulim) > 0.0) { - fu = itk::Math::abs(this->EvaluateResidual(solver, u)); + fu = itk::Math::Absolute(this->EvaluateResidual(solver, u)); if (fu < fc) { bx = cx; @@ -1247,18 +1247,18 @@ FEMRegistrationFilter::FindBracketingTrip u = cx + Gold * (cx - bx); fb = fc; fc = fu; - fu = itk::Math::abs(this->EvaluateResidual(solver, u)); + fu = itk::Math::Absolute(this->EvaluateResidual(solver, u)); } } else if ((u - ulim) * (ulim - cx) >= 0.0) { u = ulim; - fu = itk::Math::abs(this->EvaluateResidual(solver, u)); + fu = itk::Math::Absolute(this->EvaluateResidual(solver, u)); } else { u = cx + Gold * (cx - bx); - fu = itk::Math::abs(this->EvaluateResidual(solver, u)); + fu = itk::Math::Absolute(this->EvaluateResidual(solver, u)); } ax = bx; @@ -1269,7 +1269,7 @@ FEMRegistrationFilter::FindBracketingTrip fc = fu; } - if (itk::Math::abs(ax) > 1.e3 || itk::Math::abs(bx) > 1.e3 || itk::Math::abs(cx) > 1.e3) + if (itk::Math::Absolute(ax) > 1.e3 || itk::Math::Absolute(bx) > 1.e3 || itk::Math::Absolute(cx) > 1.e3) { ax = -2.0; bx = 1.0; @@ -1300,7 +1300,7 @@ FEMRegistrationFilter::GoldenSection(Solv Float x1; Float x2; Float x3 = cx; - if (itk::Math::abs(cx - bx) > itk::Math::abs(bx - ax)) + if (itk::Math::Absolute(cx - bx) > itk::Math::Absolute(bx - ax)) { x1 = bx; x2 = bx + C * (cx - bx); @@ -1311,10 +1311,10 @@ FEMRegistrationFilter::GoldenSection(Solv x1 = bx - C * (bx - ax); } - Float f1 = itk::Math::abs(this->EvaluateResidual(solver, x1)); - Float f2 = itk::Math::abs(this->EvaluateResidual(solver, x2)); + Float f1 = itk::Math::Absolute(this->EvaluateResidual(solver, x1)); + Float f2 = itk::Math::Absolute(this->EvaluateResidual(solver, x2)); unsigned int iters = 0; - while (itk::Math::abs(x3 - x0) > tol * (itk::Math::abs(x1) + itk::Math::abs(x2)) && iters < MaxIters) + while (itk::Math::Absolute(x3 - x0) > tol * (itk::Math::Absolute(x1) + itk::Math::Absolute(x2)) && iters < MaxIters) { ++iters; if (f2 < f1) @@ -1323,7 +1323,7 @@ FEMRegistrationFilter::GoldenSection(Solv x1 = x2; x2 = R * x1 + C * x3; f1 = f2; - f2 = itk::Math::abs(this->EvaluateResidual(solver, x2)); + f2 = itk::Math::Absolute(this->EvaluateResidual(solver, x2)); } else { @@ -1331,7 +1331,7 @@ FEMRegistrationFilter::GoldenSection(Solv x2 = x1; x1 = R * x2 + C * x0; f2 = f1; - f1 = itk::Math::abs(this->EvaluateResidual(solver, x1)); + f1 = itk::Math::Absolute(this->EvaluateResidual(solver, x1)); } } @@ -1348,7 +1348,7 @@ FEMRegistrationFilter::GoldenSection(Solv } solver->SetEnergyToMin(xmin); - return itk::Math::abs(static_cast(fmin)); + return itk::Math::Absolute(static_cast(fmin)); } template diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx index e1d3b706aae..358427f57fa 100644 --- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.hxx @@ -352,7 +352,7 @@ GPUDemonsRegistrationFunction::Co const double denominator = sqr_speedValue / m_Normalizer + gradientSquaredMagnitude; - if (itk::Math::abs(speedValue) < m_IntensityDifferenceThreshold || denominator < m_DenominatorThreshold) + if (itk::Math::Absolute(speedValue) < m_IntensityDifferenceThreshold || denominator < m_DenominatorThreshold) { return m_ZeroUpdateReturn; } diff --git a/Modules/Registration/Metricsv4/include/itkANTSNeighborhoodCorrelationImageToImageMetricv4GetValueAndDerivativeThreader.hxx b/Modules/Registration/Metricsv4/include/itkANTSNeighborhoodCorrelationImageToImageMetricv4GetValueAndDerivativeThreader.hxx index c3ad9df7496..bb0b285e95a 100644 --- a/Modules/Registration/Metricsv4/include/itkANTSNeighborhoodCorrelationImageToImageMetricv4GetValueAndDerivativeThreader.hxx +++ b/Modules/Registration/Metricsv4/include/itkANTSNeighborhoodCorrelationImageToImageMetricv4GetValueAndDerivativeThreader.hxx @@ -529,7 +529,7 @@ ANTSNeighborhoodCorrelationImageToImageMetricv4GetValueAndDerivativeThreader< const LocalRealType sFixedFixed_sMovingMoving = sFixedFixed * sMovingMoving; - if (itk::Math::abs(sFixedFixed_sMovingMoving) > NumericTraits::epsilon()) + if (itk::Math::Absolute(sFixedFixed_sMovingMoving) > NumericTraits::epsilon()) { localCC = sFixedMoving * sFixedMoving / (sFixedFixed_sMovingMoving); } diff --git a/Modules/Registration/Metricsv4/include/itkDemonsImageToImageMetricv4GetValueAndDerivativeThreader.hxx b/Modules/Registration/Metricsv4/include/itkDemonsImageToImageMetricv4GetValueAndDerivativeThreader.hxx index 905f762e16e..a843e6f7e39 100644 --- a/Modules/Registration/Metricsv4/include/itkDemonsImageToImageMetricv4GetValueAndDerivativeThreader.hxx +++ b/Modules/Registration/Metricsv4/include/itkDemonsImageToImageMetricv4GetValueAndDerivativeThreader.hxx @@ -90,7 +90,7 @@ DemonsImageToImageMetricv4GetValueAndDerivativeThreaderm_DemonsAssociate->m_Normalizer + gradientSquaredMagnitude; - if (itk::Math::abs(speedValue) < this->m_DemonsAssociate->GetIntensityDifferenceThreshold() || + if (itk::Math::Absolute(speedValue) < this->m_DemonsAssociate->GetIntensityDifferenceThreshold() || denominator < this->m_DemonsAssociate->GetDenominatorThreshold()) { localDerivativeReturn.Fill(DerivativeValueType{}); diff --git a/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx index cc54eeba936..a4eebf0647d 100644 --- a/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkExpectationBasedPointSetToPointSetMetricv4.hxx @@ -98,7 +98,7 @@ ExpectationBasedPointSetToPointSetMetricv4::epsilon()) + if (itk::Math::Absolute(measure) <= NumericTraits::epsilon()) { return; } diff --git a/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationImageToImageMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationImageToImageMetricv4.hxx index 83646a85aab..e0cf10dd153 100644 --- a/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationImageToImageMetricv4.hxx +++ b/Modules/Registration/Metricsv4/include/itkJointHistogramMutualInformationImageToImageMetricv4.hxx @@ -362,7 +362,7 @@ JointHistogramMutualInformationImageToImageMetricv4GetPixel(index); TInternalComputationValueType local_mi = 0; - if (itk::Math::abs(denom) > eps) + if (itk::Math::Absolute(denom) > eps) { if (pxy / denom > eps) { diff --git a/Modules/Registration/Metricsv4/test/itkCorrelationImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkCorrelationImageToImageMetricv4Test.cxx index 2d3de593709..08e0d84446a 100644 --- a/Modules/Registration/Metricsv4/test/itkCorrelationImageToImageMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkCorrelationImageToImageMetricv4Test.cxx @@ -225,7 +225,7 @@ itkCorrelationImageToImageMetricv4Test(int, char ** const) } constexpr double myeps{ 1e-8 }; - if (itk::Math::abs(value1 - value2) > 1e-8) + if (itk::Math::Absolute(value1 - value2) > 1e-8) { std::cerr << "value1: " << value1 << std::endl; std::cerr << "value2: " << value2 << std::endl; diff --git a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx index a859bd89a54..97f43e20bc4 100644 --- a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricRegistrationTest.cxx @@ -182,7 +182,7 @@ itkEuclideanDistancePointSetMetricRegistrationTestRun(unsigned int difference[1] = movingPoint[1] - transformedFixedPoint[1]; std::cout << fixedPoints->GetPoint(n) << '\t' << movingPoint << '\t' << transformedFixedPoint << '\t' << difference << std::endl; - if (itk::Math::abs(difference[0]) > tolerance || itk::Math::abs(difference[1]) > tolerance) + if (itk::Math::Absolute(difference[0]) > tolerance || itk::Math::Absolute(difference[1]) > tolerance) { passed = false; } diff --git a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest.cxx b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest.cxx index e85c5c09826..de0dff72d4f 100644 --- a/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkEuclideanDistancePointSetMetricTest.cxx @@ -91,7 +91,7 @@ itkEuclideanDistancePointSetMetricTestRun() std::cout << "derivative: " << derivative << std::endl; for (unsigned int d = 0; d < metric->GetNumberOfParameters(); ++d) { - if (itk::Math::abs(derivative[d] - offset[d]) / offset[d] > 0.01) + if (itk::Math::Absolute(derivative[d] - offset[d]) / offset[d] > 0.01) { std::cerr << "derivative does not match expected offset of " << offset << std::endl; return EXIT_FAILURE; diff --git a/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricRegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricRegistrationTest.cxx index 81b737dfc3e..10511b8a0aa 100644 --- a/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricRegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricRegistrationTest.cxx @@ -194,7 +194,7 @@ itkExpectationBasedPointSetMetricRegistrationTest(int argc, char * argv[]) difference[1] = transformedMovingPoint[1] - transformedFixedPoint[1]; std::cout << fixedPoints->GetPoint(n) << '\t' << movingPoints->GetPoint(n) << '\t' << transformedMovingPoint << '\t' << transformedFixedPoint << '\t' << difference << std::endl; - if (itk::Math::abs(difference[0]) > tolerance || itk::Math::abs(difference[1]) > tolerance) + if (itk::Math::Absolute(difference[0]) > tolerance || itk::Math::Absolute(difference[1]) > tolerance) { passed = false; } diff --git a/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx b/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx index 89959958417..bd04defea76 100644 --- a/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkExpectationBasedPointSetMetricTest.cxx @@ -103,7 +103,7 @@ itkExpectationBasedPointSetMetricTestRun() std::cout << "derivative: " << derivative << std::endl; for (unsigned int d = 0; d < metric->GetNumberOfParameters(); ++d) { - if (itk::Math::abs(derivative[d] - offset[d]) / offset[d] > 0.01) + if (itk::Math::Absolute(derivative[d] - offset[d]) / offset[d] > 0.01) { std::cerr << "derivative does not match expected offset of " << offset << std::endl; result = EXIT_FAILURE; diff --git a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4RegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4RegistrationTest.cxx index 09492e11e10..531df72aa58 100644 --- a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4RegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4RegistrationTest.cxx @@ -188,7 +188,7 @@ ImageToImageMetricv4RegistrationTestRun(typename TMetric::Pointer metric, constexpr double tolerance{ 0.11 }; for (itk::SizeValueType n = 0; n < Dimension; ++n) { - if (itk::Math::abs(1.0 - (static_cast(imageShift[n]) / translationTransform->GetParameters()[n])) > + if (itk::Math::Absolute(1.0 - (static_cast(imageShift[n]) / translationTransform->GetParameters()[n])) > tolerance) { std::cerr << "XXX Failed. Final transform parameters are not within tolerance of image shift. XXX" << std::endl; diff --git a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx index 581330a53e1..2274296bb4a 100644 --- a/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkImageToImageMetricv4Test.cxx @@ -174,7 +174,7 @@ ImageToImageMetricv4TestTestArray(const TVector & v1, const TVector & v2) for (unsigned int i = 0; i < v1.Size(); ++i) { constexpr double epsilon{ 1e-10 }; - if (itk::Math::abs(v1[i] - v2[i]) > epsilon) + if (itk::Math::Absolute(v1[i] - v2[i]) > epsilon) { pass = false; } @@ -357,7 +357,7 @@ ImageToImageMetricv4TestRunSingleTest(const ImageToImageMetricv4TestMetricPointe { // Verify results constexpr double epsilon{ 1e-10 }; - if (itk::Math::abs(truthValue - valueReturn2) > epsilon) + if (itk::Math::Absolute(truthValue - valueReturn2) > epsilon) { std::cerr << "-FAILED- truthValue does not equal value: " << std::endl << "truthValue: " << truthValue << std::endl diff --git a/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricRegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricRegistrationTest.cxx index 556ec10b219..65e90912b2c 100644 --- a/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricRegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricRegistrationTest.cxx @@ -202,7 +202,7 @@ itkJensenHavrdaCharvatTsallisPointSetMetricRegistrationTest(int argc, char * arg difference[1] = transformedMovingPoint[1] - transformedFixedPoint[1]; std::cout << fixedPoints->GetPoint(n) << '\t' << movingPoints->GetPoint(n) << '\t' << transformedMovingPoint << '\t' << transformedFixedPoint << '\t' << difference << std::endl; - if (itk::Math::abs(difference[0]) > tolerance || itk::Math::abs(difference[1]) > tolerance) + if (itk::Math::Absolute(difference[0]) > tolerance || itk::Math::Absolute(difference[1]) > tolerance) { passed = false; } diff --git a/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricTest.cxx b/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricTest.cxx index 37d14d2d76d..25ce266195a 100644 --- a/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkJensenHavrdaCharvatTsallisPointSetMetricTest.cxx @@ -143,7 +143,7 @@ itkJensenHavrdaCharvatTsallisPointSetMetricTestRun() for (unsigned int d = 0; d < metric->GetNumberOfParameters(); ++d) { - if (itk::Math::abs(derivative[d] - normalizedOffset[d]) / normalizedOffset[d] > 0.01) + if (itk::Math::Absolute(derivative[d] - normalizedOffset[d]) / normalizedOffset[d] > 0.01) { std::cerr << "derivative does not match expected normalized offset of " << offset << std::endl; return EXIT_FAILURE; @@ -155,7 +155,7 @@ itkJensenHavrdaCharvatTsallisPointSetMetricTestRun() static constexpr float metricValues2D[] = { 0.143842f, -0.0129571f, -0.00105768f, -0.000115118f, -1.40956e-05f, -1.84099e-06f }; - if (itk::Math::abs(value - metricValues2D[i]) > 0.01) + if (itk::Math::Absolute(value - metricValues2D[i]) > 0.01) { std::cerr << "calculated value is different than expected." << std::endl; } @@ -165,14 +165,14 @@ itkJensenHavrdaCharvatTsallisPointSetMetricTestRun() static constexpr float metricValues3D[] = { 0.175588f, -0.0086854f, -0.000475248f, -3.46729e-05f, -2.84585e-06f, -2.49151e-07f }; - if (itk::Math::abs(value - metricValues3D[i]) > 0.01) + if (itk::Math::Absolute(value - metricValues3D[i]) > 0.01) { std::cerr << "calculated value is different than expected." << std::endl; } } // Check for the same results from different methods - if (itk::Math::abs(value - value2) > 0.01) + if (itk::Math::Absolute(value - value2) > 0.01) { std::cerr << "value does not match between calls to different methods: " << "value: " << value << " value2: " << value2 << std::endl; diff --git a/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricRegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricRegistrationTest.cxx index 71225fbd926..7a371a7252b 100644 --- a/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricRegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricRegistrationTest.cxx @@ -169,7 +169,7 @@ itkLabeledPointSetMetricRegistrationTestPerMetric(unsigned int numberOfIteration difference[1] = transformedMovingPoint[1] - transformedFixedPoint[1]; std::cout << fixedPoints->GetPoint(n) << '\t' << movingPoints->GetPoint(n) << '\t' << transformedMovingPoint << '\t' << transformedFixedPoint << '\t' << difference << std::endl; - if (itk::Math::abs(difference[0]) > tolerance || itk::Math::abs(difference[1]) > tolerance) + if (itk::Math::Absolute(difference[0]) > tolerance || itk::Math::Absolute(difference[1]) > tolerance) { passed = false; } diff --git a/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricTest.cxx b/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricTest.cxx index ea4bf4dd02e..853a32d5bd9 100644 --- a/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkLabeledPointSetMetricTest.cxx @@ -113,7 +113,7 @@ itkLabeledPointSetMetricTestRun() std::cout << "derivative: " << derivative << std::endl; for (unsigned int d = 0; d < metric->GetNumberOfParameters(); ++d) { - if (itk::Math::abs(derivative[d] - offset[d]) / offset[d] > 0.01) + if (itk::Math::Absolute(derivative[d] - offset[d]) / offset[d] > 0.01) { std::cerr << "derivative does not match expected offset of " << offset << std::endl; return EXIT_FAILURE; diff --git a/Modules/Registration/Metricsv4/test/itkMattesMutualInformationImageToImageMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkMattesMutualInformationImageToImageMetricv4Test.cxx index 6be6742f38f..8efbed76bbf 100644 --- a/Modules/Registration/Metricsv4/test/itkMattesMutualInformationImageToImageMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkMattesMutualInformationImageToImageMetricv4Test.cxx @@ -392,7 +392,7 @@ TestMattesMetricWithAffineTransform(TInterpolator * const interpolator, const bo for (size_t v = 0; v < 4; ++v) { constexpr double max_percent_diff_in_metric{ 0.05 }; - if (itk::Math::abs(itk::Math::abs(new_values[v] / known_values[v]) - 1.0) > max_percent_diff_in_metric) + if (itk::Math::Absolute(itk::Math::Absolute(new_values[v] / known_values[v]) - 1.0) > max_percent_diff_in_metric) { std::cout << "\t[FAILED] known values for metric values not computed correctly." << std::setprecision(16) << new_values[v] << " != " << known_values[v] << std::endl; @@ -413,7 +413,7 @@ TestMattesMetricWithAffineTransform(TInterpolator * const interpolator, const bo << secondOrderApproxDerivative << "]\tfirstOrderApproxDerivative[" << firstOrderApproxDerivative << "]\tratio: " << ratio; - const double evalDiff = itk::Math::abs(ratio - 1.0); + const double evalDiff = itk::Math::Absolute(ratio - 1.0); if (evalDiff > tolerance) { std::cout << "\t[FAILED] computed derivative differ from central difference by (" << evalDiff << " > " diff --git a/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4OnVectorTest2.cxx b/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4OnVectorTest2.cxx index 4aedf57b6be..8569c428dc9 100644 --- a/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4OnVectorTest2.cxx +++ b/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4OnVectorTest2.cxx @@ -156,7 +156,7 @@ itkMeanSquaresImageToImageMetricv4OnVectorTest2(int, char ** const) /* Compare */ constexpr double tolerance{ 1e-8 }; - if (itk::Math::abs(scalarMeasure - (vectorMeasure / vectorLength)) > tolerance) + if (itk::Math::Absolute(scalarMeasure - (vectorMeasure / vectorLength)) > tolerance) { std::cerr << "Measures do not match within tolerance. scalarMeasure, vectorMeasure: " << scalarMeasure << ", " << vectorMeasure << std::endl; @@ -166,7 +166,7 @@ itkMeanSquaresImageToImageMetricv4OnVectorTest2(int, char ** const) for (itk::SizeValueType n = 0; n < scalarDerivative.Size(); ++n) { - if (itk::Math::abs(scalarDerivative[n] - (vectorDerivative[n] / vectorLength)) > tolerance) + if (itk::Math::Absolute(scalarDerivative[n] - (vectorDerivative[n] / vectorLength)) > tolerance) { std::cerr << "Derivatives do not match within tolerance. scalarDerivative, vectorDerivative: " << scalarDerivative << std::endl diff --git a/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx b/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx index 65473ba8960..540454997bf 100644 --- a/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkMetricImageGradientTest.cxx @@ -233,7 +233,7 @@ itkMetricImageGradientTestRunTest(unsigned int imageSize, { if (it.GetIndex()[j] < static_cast(imageBorder) || static_cast( - itk::Math::abs(static_cast(it.GetIndex()[j]) - static_cast(size[j]))) < imageBorder) + itk::Math::Absolute(static_cast(it.GetIndex()[j]) - static_cast(size[j]))) < imageBorder) { awayfromborder = false; } diff --git a/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4RegistrationTest.cxx b/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4RegistrationTest.cxx index 5f808375f76..8714dec8393 100644 --- a/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4RegistrationTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4RegistrationTest.cxx @@ -252,14 +252,14 @@ itkObjectToObjectMultiMetricv4RegistrationTest(int argc, char * argv[]) // Comparison between single-metric and multi-variate metric registrations auto tolerance = static_cast(1e-6); - if (itk::Math::abs(multiDerivativeResult[0] - singleDerivativeResult[0]) > tolerance || - itk::Math::abs(multiDerivativeResult[1] - singleDerivativeResult[1]) > tolerance) + if (itk::Math::Absolute(multiDerivativeResult[0] - singleDerivativeResult[0]) > tolerance || + itk::Math::Absolute(multiDerivativeResult[1] - singleDerivativeResult[1]) > tolerance) { std::cerr << "multi-variate registration derivative: " << multiDerivativeResult << " are different from single-variate derivative: " << singleDerivativeResult << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(multiValueResult - singleValueResult) > tolerance) + if (itk::Math::Absolute(multiValueResult - singleValueResult) > tolerance) { std::cerr << "multi-variate registration value: " << multiValueResult << " is different from single-variate value: " << singleValueResult << std::endl; @@ -268,8 +268,8 @@ itkObjectToObjectMultiMetricv4RegistrationTest(int argc, char * argv[]) // compare results with truth tolerance = static_cast(0.05); - if (itk::Math::abs(multiDerivativeResult[0] - imageShift[0]) / imageShift[0] > tolerance || - itk::Math::abs(multiDerivativeResult[1] - imageShift[1]) / imageShift[1] > tolerance) + if (itk::Math::Absolute(multiDerivativeResult[0] - imageShift[0]) / imageShift[0] > tolerance || + itk::Math::Absolute(multiDerivativeResult[1] - imageShift[1]) / imageShift[1] > tolerance) { std::cerr << "multi-variate registration results: " << multiDerivativeResult << " are not as expected: " << imageShift << std::endl; @@ -291,14 +291,14 @@ itkObjectToObjectMultiMetricv4RegistrationTest(int argc, char * argv[]) ObjectToObjectMultiMetricv4RegistrationTestRun( multiMetric, numberOfIterations, multiValueResult, multiDerivativeResult, 0.25, false); - if (itk::Math::abs(multiDerivativeResult[0] - singleDerivativeResult[0]) > tolerance || - itk::Math::abs(multiDerivativeResult[1] - singleDerivativeResult[1]) > tolerance) + if (itk::Math::Absolute(multiDerivativeResult[0] - singleDerivativeResult[0]) > tolerance || + itk::Math::Absolute(multiDerivativeResult[1] - singleDerivativeResult[1]) > tolerance) { std::cerr << "multi-variate registration derivative: " << multiDerivativeResult << " are different from single-variate derivative: " << singleDerivativeResult << std::endl; return EXIT_FAILURE; } - if (itk::Math::abs(multiValueResult - singleValueResult) > tolerance) + if (itk::Math::Absolute(multiValueResult - singleValueResult) > tolerance) { std::cerr << "multi-variate registration value: " << multiValueResult << " is different from single-variate value: " << singleValueResult << std::endl; @@ -307,8 +307,8 @@ itkObjectToObjectMultiMetricv4RegistrationTest(int argc, char * argv[]) // compare results with truth tolerance = static_cast(0.05); - if (itk::Math::abs(multiDerivativeResult[0] - imageShift[0]) / imageShift[0] > tolerance || - itk::Math::abs(multiDerivativeResult[1] - imageShift[1]) / imageShift[1] > tolerance) + if (itk::Math::Absolute(multiDerivativeResult[0] - imageShift[0]) / imageShift[0] > tolerance || + itk::Math::Absolute(multiDerivativeResult[1] - imageShift[1]) / imageShift[1] > tolerance) { std::cerr << "multi-variate registration results: " << multiDerivativeResult << " are not as expected: " << imageShift << std::endl; @@ -336,8 +336,8 @@ itkObjectToObjectMultiMetricv4RegistrationTest(int argc, char * argv[]) // compare results with truth tolerance = static_cast(0.05); - if (itk::Math::abs(multiDerivativeResult[0] - imageShift[0]) / imageShift[0] > tolerance || - itk::Math::abs(multiDerivativeResult[1] - imageShift[1]) / imageShift[1] > tolerance) + if (itk::Math::Absolute(multiDerivativeResult[0] - imageShift[0]) / imageShift[0] > tolerance || + itk::Math::Absolute(multiDerivativeResult[1] - imageShift[1]) / imageShift[1] > tolerance) { std::cerr << "multi-variate registration results: " << multiDerivativeResult << " are not as expected: " << imageShift << std::endl; diff --git a/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx index 25b21375651..004c4f1fedd 100644 --- a/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx @@ -162,7 +162,7 @@ itkObjectToObjectMultiMetricv4TestEvaluate(ObjectToObjectMultiMetricv4TestMultiM DerivResultOfGetValueAndDerivativeTruth[p] *= totalMagnitude; } - if (itk::Math::abs(weightedMetricValue - multiVariateMetric->GetWeightedValue()) > 1e-6) + if (itk::Math::Absolute(weightedMetricValue - multiVariateMetric->GetWeightedValue()) > 1e-6) { std::cerr << "Computed weighted metric value " << weightedMetricValue << " does match returned value " << multiVariateMetric->GetWeightedValue() << std::endl; @@ -172,7 +172,8 @@ itkObjectToObjectMultiMetricv4TestEvaluate(ObjectToObjectMultiMetricv4TestMultiM for (MultiMetricType::NumberOfParametersType p = 0; p < multiVariateMetric->GetNumberOfParameters(); ++p) { auto tolerance = static_cast(1e-6); - if (itk::Math::abs(DerivResultOfGetValueAndDerivativeTruth[p] - DerivResultOfGetValueAndDerivative[p]) > tolerance) + if (itk::Math::Absolute(DerivResultOfGetValueAndDerivativeTruth[p] - DerivResultOfGetValueAndDerivative[p]) > + tolerance) { std::cerr << "Error: DerivResultOfGetValueAndDerivative does not match expected result." << std::endl; if (useDisplacementTransform) @@ -509,16 +510,16 @@ itkObjectToObjectMultiMetricv4TestRun(bool useDisplacementTransform) // Check that results are the same for all three estimations bool passedEstimation = true; auto tolerance = static_cast(1e-6); - if (itk::Math::abs(singleStep - multiSingleStep) > tolerance || - itk::Math::abs(singleStep - multiDoubleStep) > tolerance) + if (itk::Math::Absolute(singleStep - multiSingleStep) > tolerance || + itk::Math::Absolute(singleStep - multiDoubleStep) > tolerance) { std::cerr << "Steps do not match as expected between estimation on same metric." << std::endl; passedEstimation = false; } - if (itk::Math::abs(singleScales[0] - multiSingleScales[0]) > tolerance || - itk::Math::abs(singleScales[1] - multiSingleScales[1]) > tolerance || - itk::Math::abs(singleScales[0] - multiDoubleScales[0]) > tolerance || - itk::Math::abs(singleScales[1] - multiDoubleScales[1]) > tolerance) + if (itk::Math::Absolute(singleScales[0] - multiSingleScales[0]) > tolerance || + itk::Math::Absolute(singleScales[1] - multiSingleScales[1]) > tolerance || + itk::Math::Absolute(singleScales[0] - multiDoubleScales[0]) > tolerance || + itk::Math::Absolute(singleScales[1] - multiDoubleScales[1]) > tolerance) { std::cerr << "Scales do not match as expected between estimation on same metric." << std::endl; passedEstimation = false; diff --git a/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.hxx b/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.hxx index dd83caad431..226d22307dd 100644 --- a/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.hxx +++ b/Modules/Registration/PDEDeformable/include/itkDemonsRegistrationFunction.hxx @@ -212,7 +212,7 @@ DemonsRegistrationFunction::Compu const double denominator = sqr_speedValue / m_Normalizer + gradientSquaredMagnitude; - if (itk::Math::abs(speedValue) < m_IntensityDifferenceThreshold || denominator < m_DenominatorThreshold) + if (itk::Math::Absolute(speedValue) < m_IntensityDifferenceThreshold || denominator < m_DenominatorThreshold) { return m_ZeroUpdateReturn; } diff --git a/Modules/Registration/PDEDeformable/include/itkDiffeomorphicDemonsRegistrationFilter.hxx b/Modules/Registration/PDEDeformable/include/itkDiffeomorphicDemonsRegistrationFilter.hxx index cce00849e66..6489a9bf822 100644 --- a/Modules/Registration/PDEDeformable/include/itkDiffeomorphicDemonsRegistrationFilter.hxx +++ b/Modules/Registration/PDEDeformable/include/itkDiffeomorphicDemonsRegistrationFilter.hxx @@ -192,7 +192,7 @@ DiffeomorphicDemonsRegistrationFilter 1.0e-4) + if (itk::Math::Absolute(dt - 1.0) > 1.0e-4) { itkDebugMacro("Using timestep: " << dt); m_Multiplier->SetInput2(dt); diff --git a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.hxx b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.hxx index a0bc322ca61..25323e223de 100644 --- a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.hxx +++ b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.hxx @@ -351,7 +351,7 @@ ESMDemonsRegistrationFunction::Co const double usedGradientTimes2SquaredMagnitude = usedGradientTimes2.GetSquaredNorm(); const double speedValue = fixedValue - movingValue; - if (itk::Math::abs(speedValue) >= m_IntensityDifferenceThreshold) + if (itk::Math::Absolute(speedValue) >= m_IntensityDifferenceThreshold) { // least square solution of the system double denom = usedGradientTimes2SquaredMagnitude; diff --git a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFilter.hxx b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFilter.hxx index 9a9ff35f671..f298caf61df 100644 --- a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFilter.hxx +++ b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFilter.hxx @@ -187,7 +187,7 @@ FastSymmetricForcesDemonsRegistrationFilter 1.0e-4) + if (itk::Math::Absolute(dt - 1.0) > 1.0e-4) { itkDebugMacro("Using timestep: " << dt); m_Multiplier->SetInput2(dt); diff --git a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx index f87ed9df311..788086875b4 100644 --- a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx +++ b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.hxx @@ -202,7 +202,7 @@ FastSymmetricForcesDemonsRegistrationFunction 0.0) { - const double bvalue = itk::Math::abs(backwardDifferences[j]); - double gvalue = itk::Math::abs(forwardDifferences[j]); + const double bvalue = itk::Math::Absolute(backwardDifferences[j]); + double gvalue = itk::Math::Absolute(forwardDifferences[j]); if (gvalue > bvalue) { gvalue = bvalue; @@ -320,7 +320,8 @@ LevelSetMotionRegistrationFunctionm_NumberOfPixelsProcessed += 1; } - if (itk::Math::abs(speedValue) < m_IntensityDifferenceThreshold || gradientMagnitude < m_GradientMagnitudeThreshold) + if (itk::Math::Absolute(speedValue) < m_IntensityDifferenceThreshold || + gradientMagnitude < m_GradientMagnitudeThreshold) { update.Fill(0.0); return update; @@ -338,7 +339,7 @@ LevelSetMotionRegistrationFunction 0.1 * itk::Math::abs(fgnd - bgnd)) + if (itk::Math::Absolute(fixedIter.Get() - warpedIter.Get()) > 0.1 * itk::Math::Absolute(fgnd - bgnd)) { numPixelsDifferent++; } diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx index d77a97de3ad..a373583f889 100644 --- a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx +++ b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.hxx @@ -245,7 +245,7 @@ ImageRegistrationMethodv4m_OptimizerWeights.Size(); ++i) { const OptimizerWeightsValueType difference = - itk::Math::abs(NumericTraits::OneValue() - this->m_OptimizerWeights[i]); + itk::Math::Absolute(NumericTraits::OneValue() - this->m_OptimizerWeights[i]); if (difference > tolerance) { this->m_OptimizerWeightsAreIdentity = false; diff --git a/Modules/Registration/RegistrationMethodsv4/test/itkSimplePointSetRegistrationTest.cxx b/Modules/Registration/RegistrationMethodsv4/test/itkSimplePointSetRegistrationTest.cxx index 3543cfa6eeb..6b8e4dc4201 100644 --- a/Modules/Registration/RegistrationMethodsv4/test/itkSimplePointSetRegistrationTest.cxx +++ b/Modules/Registration/RegistrationMethodsv4/test/itkSimplePointSetRegistrationTest.cxx @@ -247,7 +247,7 @@ itkSimplePointSetRegistrationTest(int itkNotUsed(argc), char * itkNotUsed(argv)[ difference[1] = transformedMovingPoint[1] - fixedPoint[1]; std::cout << fixedPoints->GetPoint(n) << '\t' << movingPoints->GetPoint(n) << '\t' << transformedMovingPoint << '\t' << transformedFixedPoint << '\t' << difference << std::endl; - if (itk::Math::abs(difference[0]) > tolerance || itk::Math::abs(difference[1]) > tolerance) + if (itk::Math::Absolute(difference[0]) > tolerance || itk::Math::Absolute(difference[1]) > tolerance) { passed = false; } diff --git a/Modules/Registration/RegistrationMethodsv4/test/itkSyNImageRegistrationTest.cxx b/Modules/Registration/RegistrationMethodsv4/test/itkSyNImageRegistrationTest.cxx index 43a9857d5a5..38498294e8d 100644 --- a/Modules/Registration/RegistrationMethodsv4/test/itkSyNImageRegistrationTest.cxx +++ b/Modules/Registration/RegistrationMethodsv4/test/itkSyNImageRegistrationTest.cxx @@ -341,7 +341,7 @@ PerformDisplacementFieldImageRegistration(int argc, char * argv[]) displacementFieldRegistration->GetLearningRate(); if (!itk::Math::FloatAlmostEqual(obtainedLearningRate, learningRate, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetLearningRate" << std::endl; std::cerr << "Expected value " << learningRate << std::endl; @@ -360,7 +360,7 @@ PerformDisplacementFieldImageRegistration(int argc, char * argv[]) displacementFieldRegistration->GetGaussianSmoothingVarianceForTheUpdateField(); if (!itk::Math::FloatAlmostEqual(obtainedVarianceForUpdateField, varianceForUpdateField, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetGaussianSmoothingVarianceForTheUpdateField" << std::endl; std::cerr << "Expected value " << obtainedVarianceForUpdateField << std::endl; @@ -374,7 +374,7 @@ PerformDisplacementFieldImageRegistration(int argc, char * argv[]) displacementFieldRegistration->GetGaussianSmoothingVarianceForTheTotalField(); if (!itk::Math::FloatAlmostEqual(obtainedVarianceForTotalField, varianceForTotalField, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetGaussianSmoothingVarianceForTheTotalField" << std::endl; std::cerr << "Expected value " << obtainedVarianceForTotalField << std::endl; @@ -389,7 +389,7 @@ PerformDisplacementFieldImageRegistration(int argc, char * argv[]) displacementFieldRegistration->GetConvergenceThreshold(); if (!itk::Math::FloatAlmostEqual(obtainedConvergenceThreshold, convergenceThreshold, 10, epsilon)) { - std::cerr.precision(static_cast(itk::Math::abs(std::log10(epsilon)))); + std::cerr.precision(static_cast(itk::Math::Absolute(std::log10(epsilon)))); std::cerr << "Test failed!" << std::endl; std::cerr << "Error in GetConvergenceThreshold" << std::endl; std::cerr << "Expected value " << obtainedConvergenceThreshold << std::endl; diff --git a/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx b/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx index da566e43aea..2c8b1410901 100644 --- a/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx +++ b/Modules/Segmentation/Classifiers/include/itkImageKmeansModelEstimator.hxx @@ -542,7 +542,7 @@ ImageKmeansModelEstimator::Perturb(double * ol newCodeword[i] = addoffset * rand_num; } - else if (itk::Math::abs(oldCodeword[i]) < 0.9 * addoffset) + else if (itk::Math::Absolute(oldCodeword[i]) < 0.9 * addoffset) { newCodeword[i] = oldCodeword[i]; diff --git a/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx b/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx index 1d3f7ce1d32..72c1624dc88 100644 --- a/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx +++ b/Modules/Segmentation/Classifiers/test/itkKmeansModelEstimatorTest.cxx @@ -255,7 +255,7 @@ itkKmeansModelEstimatorTest(int, char *[]) for (int i = 0; i < NUMBANDS; ++i) { - error += itk::Math::abs(errorForClass[i] / referenceCodebookForClass[i]); + error += itk::Math::Absolute(errorForClass[i] / referenceCodebookForClass[i]); meanCDBKvalue += referenceCodebookForClass[i]; } } @@ -319,7 +319,7 @@ itkKmeansModelEstimatorTest(int, char *[]) for (int i = 0; i < NUMBANDS; ++i) { - error += itk::Math::abs(errorForClass[i] / referenceCodebookForClass[i]); + error += itk::Math::Absolute(errorForClass[i] / referenceCodebookForClass[i]); meanCDBKvalue += referenceCodebookForClass[i]; } } diff --git a/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h index b7bb766f334..0faa1e80c24 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkScalarConnectedComponentImageFilter.h @@ -85,7 +85,7 @@ class SimilarPixelsFunctor { using InputRealType = typename NumericTraits::RealType; auto absDifference = - static_cast(itk::Math::abs(static_cast(a) - static_cast(b))); + static_cast(itk::Math::Absolute(static_cast(a) - static_cast(b))); if (absDifference <= m_Threshold) { return true; diff --git a/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h index 827716b7777..0aefd065f0b 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h @@ -83,7 +83,7 @@ class SimilarVectorsFunctor { dotProduct += a[i] * b[i]; } - return (static_cast(1.0 - itk::Math::abs(dotProduct)) <= m_Threshold); + return (static_cast(1.0 - itk::Math::Absolute(dotProduct)) <= m_Threshold); } protected: diff --git a/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.hxx b/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.hxx index 7f56fb42ea8..0d383ad9323 100644 --- a/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.hxx +++ b/Modules/Segmentation/DeformableMesh/include/itkDeformableSimplexMesh3DFilter.hxx @@ -244,7 +244,7 @@ DeformableSimplexMesh3DFilter::ComputeGeometry() const double phi = std::asin(sinphi); data->phi = phi; - data->meanCurvature = itk::Math::abs(sinphi / data->circleRadius); + data->meanCurvature = itk::Math::Absolute(sinphi / data->circleRadius); tmp = data->pos - data->neighbors[0]; // compute the foot of p projection of p onto the triangle spanned by its @@ -321,7 +321,7 @@ DeformableSimplexMesh3DFilter::ComputeInternalForce(Sim const double eps1Diff = epsRef[0] - eps[0]; const double eps2Diff = epsRef[1] - eps[1]; const double eps3Diff = epsRef[2] - eps[2]; - // diffAbsSum = itk::Math::abs(eps1Diff)+itk::Math::abs(eps2Diff)+itk::Math::abs(eps3Diff); + // diffAbsSum = itk::Math::Absolute(eps1Diff)+itk::Math::Absolute(eps2Diff)+itk::Math::Absolute(eps3Diff); VectorType tangentForce; tangentForce.SetVnlVector(eps1Diff * (data->neighbors[0]).GetVnlVector() + diff --git a/Modules/Segmentation/KLMRegionGrowing/test/itkRegionGrow2DTest.cxx b/Modules/Segmentation/KLMRegionGrowing/test/itkRegionGrow2DTest.cxx index dd4976d44b6..5793cc2b984 100644 --- a/Modules/Segmentation/KLMRegionGrowing/test/itkRegionGrow2DTest.cxx +++ b/Modules/Segmentation/KLMRegionGrowing/test/itkRegionGrow2DTest.cxx @@ -1226,7 +1226,7 @@ test_regiongrowKLM2D() std::cout << "Label entropy = " << labelEntropy << " bits " << std::endl; std::cout << "Ideal entropy = " << idealEntropy << " bits " << std::endl; - if (itk::Math::abs(idealEntropy - labelEntropy) > 0.2) + if (itk::Math::Absolute(idealEntropy - labelEntropy) > 0.2) { std::cout << "Test FAILED" << std::endl; return EXIT_FAILURE; @@ -1723,7 +1723,7 @@ test_regiongrowKLM3D() std::cout << "Label entropy = " << labelEntropy << " bits " << std::endl; std::cout << "Ideal entropy = " << idealEntropy << " bits " << std::endl; - if (itk::Math::abs(idealEntropy - labelEntropy) > 0.2) + if (itk::Math::Absolute(idealEntropy - labelEntropy) > 0.2) { std::cout << "Test FAILED" << std::endl; return EXIT_FAILURE; @@ -2107,7 +2107,7 @@ test_regiongrowKLM4D() std::cout << "Label entropy = " << labelEntropy << " bits " << std::endl; std::cout << "Ideal entropy = " << idealEntropy << " bits " << std::endl; - if (itk::Math::abs(idealEntropy - labelEntropy) > 0.15) + if (itk::Math::Absolute(idealEntropy - labelEntropy) > 0.15) { std::cout << "Test FAILED" << std::endl; return EXIT_FAILURE; diff --git a/Modules/Segmentation/LabelVoting/include/itkMultiLabelSTAPLEImageFilter.hxx b/Modules/Segmentation/LabelVoting/include/itkMultiLabelSTAPLEImageFilter.hxx index e1b33bd0cf0..ed1e6e14bf5 100644 --- a/Modules/Segmentation/LabelVoting/include/itkMultiLabelSTAPLEImageFilter.hxx +++ b/Modules/Segmentation/LabelVoting/include/itkMultiLabelSTAPLEImageFilter.hxx @@ -344,7 +344,7 @@ MultiLabelSTAPLEImageFilter::GenerateData() for (OutputPixelType ci = 0; ci < this->m_TotalLabelCount; ++ci) { const WeightsType thisParameterUpdate = - itk::Math::abs(this->m_UpdatedConfusionMatrixArray[k][j][ci] - this->m_ConfusionMatrixArray[k][j][ci]); + itk::Math::Absolute(this->m_UpdatedConfusionMatrixArray[k][j][ci] - this->m_ConfusionMatrixArray[k][j][ci]); maximumUpdate = std::max(maximumUpdate, thisParameterUpdate); diff --git a/Modules/Segmentation/LevelSets/include/itkBinaryMaskToNarrowBandPointSetFilter.hxx b/Modules/Segmentation/LevelSets/include/itkBinaryMaskToNarrowBandPointSetFilter.hxx index 0acd5157e47..c33f37c84d3 100644 --- a/Modules/Segmentation/LevelSets/include/itkBinaryMaskToNarrowBandPointSetFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkBinaryMaskToNarrowBandPointSetFilter.hxx @@ -105,7 +105,7 @@ BinaryMaskToNarrowBandPointSetFilter::GenerateData() { const NodeType & node = nodeItr.Value(); const float distance = node.GetValue(); - if (itk::Math::abs(distance) < m_BandWidth) + if (itk::Math::Absolute(distance) < m_BandWidth) { image->TransformIndexToPhysicalPoint(node.GetIndex(), point); points->push_back(point); diff --git a/Modules/Segmentation/LevelSets/include/itkLevelSetFunction.hxx b/Modules/Segmentation/LevelSets/include/itkLevelSetFunction.hxx index f3fbcd66b88..ed7d27f5490 100644 --- a/Modules/Segmentation/LevelSets/include/itkLevelSetFunction.hxx +++ b/Modules/Segmentation/LevelSets/include/itkLevelSetFunction.hxx @@ -98,12 +98,12 @@ LevelSetFunction::ComputeMinimalCurvature(const NeighborhoodType & i const vnl_symmetric_eigensystem eig{ Curve.as_matrix() }; constexpr ScalarValueType MIN_EIG{ NumericTraits::min() }; - ScalarValueType mincurve = itk::Math::abs(eig.get_eigenvalue(ImageDimension - 1)); + ScalarValueType mincurve = itk::Math::Absolute(eig.get_eigenvalue(ImageDimension - 1)); for (unsigned int i = 0; i < ImageDimension; ++i) { - if (itk::Math::abs(eig.get_eigenvalue(i)) < mincurve && itk::Math::abs(eig.get_eigenvalue(i)) > MIN_EIG) + if (itk::Math::Absolute(eig.get_eigenvalue(i)) < mincurve && itk::Math::Absolute(eig.get_eigenvalue(i)) > MIN_EIG) { - mincurve = itk::Math::abs(eig.get_eigenvalue(i)); + mincurve = itk::Math::Absolute(eig.get_eigenvalue(i)); } } @@ -212,7 +212,7 @@ LevelSetFunction::ComputeGlobalTimeStep(void * GlobalData) const -> d->m_MaxAdvectionChange += d->m_MaxPropagationChange; TimeStepType dt = NAN; - if (itk::Math::abs(d->m_MaxCurvatureChange) > 0.0) + if (itk::Math::Absolute(d->m_MaxCurvatureChange) > 0.0) { if (d->m_MaxAdvectionChange > 0.0) { @@ -316,7 +316,7 @@ LevelSetFunction::ComputeUpdate(const NeighborhoodType & it, { curvature_term = this->ComputeCurvatureTerm(it, offset, gd) * m_CurvatureWeight * this->CurvatureSpeed(it, offset); - gd->m_MaxCurvatureChange = std::max(gd->m_MaxCurvatureChange, itk::Math::abs(curvature_term)); + gd->m_MaxCurvatureChange = std::max(gd->m_MaxCurvatureChange, itk::Math::Absolute(curvature_term)); } else { @@ -347,7 +347,7 @@ LevelSetFunction::ComputeUpdate(const NeighborhoodType & it, advection_term += advection_field[i] * gd->m_dx_forward[i]; } - gd->m_MaxAdvectionChange = std::max(gd->m_MaxAdvectionChange, itk::Math::abs(x_energy)); + gd->m_MaxAdvectionChange = std::max(gd->m_MaxAdvectionChange, itk::Math::Absolute(x_energy)); } advection_term *= m_AdvectionWeight; } @@ -385,7 +385,7 @@ LevelSetFunction::ComputeUpdate(const NeighborhoodType & it, // Collect energy change from propagation term. This will be used in // calculating the maximum time step that can be taken for this iteration. - gd->m_MaxPropagationChange = std::max(gd->m_MaxPropagationChange, itk::Math::abs(propagation_term)); + gd->m_MaxPropagationChange = std::max(gd->m_MaxPropagationChange, itk::Math::Absolute(propagation_term)); propagation_term *= std::sqrt(propagation_gradient); } diff --git a/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx b/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx index bd6ca3f6cb5..422e36085b1 100644 --- a/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx +++ b/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx @@ -177,7 +177,7 @@ LevelSetNeighborhoodExtractor::GenerateDataNarrowBand() } node = pointsIter.Value(); - if (itk::Math::abs(node.GetValue()) <= maxValue) + if (itk::Math::Absolute(node.GetValue()) <= maxValue) { this->CalculateDistance(node.GetIndex()); } diff --git a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx index f31831e9ca0..e2c89d01c98 100644 --- a/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkParallelSparseFieldLevelSetImageFilter.hxx @@ -484,7 +484,7 @@ ParallelSparseFieldLevelSetImageFilter::InitializeAct const ValueType dx_backward = (shiftedIt.GetCenterPixel() - shiftedIt.GetPixel(center - stride)) * neighborhoodScales[i]; - if (itk::Math::abs(dx_forward) > itk::Math::abs(dx_backward)) + if (itk::Math::Absolute(dx_forward) > itk::Math::Absolute(dx_backward)) { length += dx_forward * dx_forward; } @@ -570,7 +570,7 @@ ParallelSparseFieldLevelSetImageFilter::PropagateLaye } else { - if (itk::Math::abs(value_temp + delta) < itk::Math::abs(value + delta)) + if (itk::Math::Absolute(value_temp + delta) < itk::Math::Absolute(value + delta)) { // take the value closest to zero value = value_temp; @@ -1272,7 +1272,7 @@ ParallelSparseFieldLevelSetImageFilter::ThreadedCalcu const auto dx_backward = centerValue - backwardValue; // take the one-sided derivative with the larger magnitude - if (itk::Math::abs(dx_forward) > itk::Math::abs(dx_backward)) + if (itk::Math::Absolute(dx_forward) > itk::Math::Absolute(dx_backward)) { offset[i] = dx_forward; } @@ -1726,7 +1726,7 @@ ParallelSparseFieldLevelSetImageFilter::ThreadedProce } else { - if (itk::Math::abs(value_temp + delta) < itk::Math::abs(value + delta)) + if (itk::Math::Absolute(value_temp + delta) < itk::Math::Absolute(value + delta)) { // take the value closest to zero value = value_temp; @@ -1991,7 +1991,7 @@ ParallelSparseFieldLevelSetImageFilter::ThreadedPropa } else { - if (itk::Math::abs(value_temp + delta) < itk::Math::abs(value + delta)) + if (itk::Math::Absolute(value_temp + delta) < itk::Math::Absolute(value + delta)) { // take the value closest to zero value = value_temp; diff --git a/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetFunction.hxx b/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetFunction.hxx index 8a6cc295749..5195a239500 100644 --- a/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetFunction.hxx +++ b/Modules/Segmentation/LevelSets/include/itkShapePriorSegmentationLevelSetFunction.hxx @@ -71,7 +71,7 @@ ShapePriorSegmentationLevelSetFunction::ComputeUp // collect max change to be used for calculating the time step auto * globalData = (ShapePriorGlobalDataStruct *)gd; - globalData->m_MaxShapePriorChange = std::max(globalData->m_MaxShapePriorChange, itk::Math::abs(shape_term)); + globalData->m_MaxShapePriorChange = std::max(globalData->m_MaxShapePriorChange, itk::Math::Absolute(shape_term)); } return value; @@ -88,7 +88,7 @@ ShapePriorSegmentationLevelSetFunction::ComputeGl d->m_MaxAdvectionChange += d->m_MaxPropagationChange + d->m_MaxShapePriorChange; - if (itk::Math::abs(d->m_MaxCurvatureChange) > 0.0) + if (itk::Math::Absolute(d->m_MaxCurvatureChange) > 0.0) { if (d->m_MaxAdvectionChange > 0.0) { diff --git a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx index 2636c824b08..3ec678eb512 100644 --- a/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx +++ b/Modules/Segmentation/LevelSets/include/itkSparseFieldLevelSetImageFilter.hxx @@ -354,7 +354,7 @@ SparseFieldLevelSetImageFilter::UpdateActiveLayerValu // Keep the smallest possible value for the new active node. This // places the new active layer node closest to the zero level-set. if (outputIt.GetPixel(idx) < LOWER_ACTIVE_THRESHOLD || - itk::Math::abs(temp_value) < itk::Math::abs(outputIt.GetPixel(idx))) + itk::Math::Absolute(temp_value) < itk::Math::Absolute(outputIt.GetPixel(idx))) { outputIt.SetPixel(idx, temp_value); } @@ -405,7 +405,7 @@ SparseFieldLevelSetImageFilter::UpdateActiveLayerValu // Keep the smallest magnitude value for this active set node. This // places the node closest to the active layer. if (outputIt.GetPixel(idx) >= UPPER_ACTIVE_THRESHOLD || - itk::Math::abs(temp_value) < itk::Math::abs(outputIt.GetPixel(idx))) + itk::Math::Absolute(temp_value) < itk::Math::Absolute(outputIt.GetPixel(idx))) { outputIt.SetPixel(idx, temp_value); } @@ -775,7 +775,7 @@ SparseFieldLevelSetImageFilter::InitializeActiveLayer const auto dx_backward = (shiftedIt.GetCenterPixel() - shiftedIt.GetPixel(center - m_NeighborList.GetStride(i))) * neighborhoodScales[i]; - if (itk::Math::abs(dx_forward) > itk::Math::abs(dx_backward)) + if (itk::Math::Absolute(dx_forward) > itk::Math::Absolute(dx_backward)) { length += dx_forward * dx_forward; } @@ -868,7 +868,7 @@ SparseFieldLevelSetImageFilter::CalculateChange() -> const auto dx_backward = centerValue - backwardValue; // Pick the larger magnitude derivative. - if (itk::Math::abs(dx_forward) > itk::Math::abs(dx_backward)) + if (itk::Math::Absolute(dx_forward) > itk::Math::Absolute(dx_backward)) { offset[i] = dx_forward; } diff --git a/Modules/Segmentation/LevelSets/test/itkExtensionVelocitiesImageFilterTest.cxx b/Modules/Segmentation/LevelSets/test/itkExtensionVelocitiesImageFilterTest.cxx index bf20686221b..1761a3bc541 100644 --- a/Modules/Segmentation/LevelSets/test/itkExtensionVelocitiesImageFilterTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkExtensionVelocitiesImageFilterTest.cxx @@ -271,7 +271,7 @@ itkExtensionVelocitiesImageFilterTest(int, char *[]) { const ImageType::IndexType nodeIndex = nodeIter.Value().GetIndex(); const double absDiff = - itk::Math::abs(aux2->GetPixel(nodeIndex) - reinitializer->GetOutputVelocityImage(1)->GetPixel(nodeIndex)); + itk::Math::Absolute(aux2->GetPixel(nodeIndex) - reinitializer->GetOutputVelocityImage(1)->GetPixel(nodeIndex)); if (absDiff > 0.6) { std::cout << "Abs diff: " << absDiff; diff --git a/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx b/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx index e71a277b68d..2cc14f03b06 100644 --- a/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkLevelSetFunctionTest.cxx @@ -55,8 +55,8 @@ circle(unsigned int x, unsigned int y) float square(unsigned int x, unsigned int y) { - const float X = itk::Math::abs(x - float{ WIDTH } / 2.0); - const float Y = itk::Math::abs(y - float{ HEIGHT } / 2.0); + const float X = itk::Math::Absolute(x - float{ WIDTH } / 2.0); + const float Y = itk::Math::Absolute(y - float{ HEIGHT } / 2.0); float dis = -std::sqrt((X - RADIUS) * (X - RADIUS) + (Y - RADIUS) * (Y - RADIUS)); if (!((X > RADIUS) && (Y > RADIUS))) diff --git a/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx b/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx index 1ad5d838675..df3690d991e 100644 --- a/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkParallelSparseFieldLevelSetImageFilterTest.cxx @@ -59,9 +59,9 @@ sphere(unsigned int x, unsigned int y, unsigned int z) float cube(unsigned int x, unsigned int y, unsigned int z) { - const float X = itk::Math::abs(x - float{ WIDTH } / 2.0); - const float Y = itk::Math::abs(y - float{ HEIGHT } / 2.0); - const float Z = itk::Math::abs(z - float{ DEPTH } / 2.0); + const float X = itk::Math::Absolute(x - float{ WIDTH } / 2.0); + const float Y = itk::Math::Absolute(y - float{ HEIGHT } / 2.0); + const float Z = itk::Math::Absolute(z - float{ DEPTH } / 2.0); float dis = -sqrt((X - RADIUS) * (X - RADIUS) + (Y - RADIUS) * (Y - RADIUS) + (Z - RADIUS) * (Z - RADIUS)); if (!((X > RADIUS) && (Y > RADIUS) && (Z > RADIUS))) { diff --git a/Modules/Segmentation/LevelSets/test/itkShapePriorMAPCostFunctionTest.cxx b/Modules/Segmentation/LevelSets/test/itkShapePriorMAPCostFunctionTest.cxx index 6eeac506d6f..c4bcce09690 100644 --- a/Modules/Segmentation/LevelSets/test/itkShapePriorMAPCostFunctionTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkShapePriorMAPCostFunctionTest.cxx @@ -109,7 +109,7 @@ itkShapePriorMAPCostFunctionTest(int, char *[]) const float value = shape->Evaluate(point); iter.Set(value); - if (itk::Math::abs(value) < activeRegionThreshold) + if (itk::Math::Absolute(value) < activeRegionThreshold) { NodeType node; node.SetIndex(index); @@ -211,7 +211,7 @@ itkShapePriorMAPCostFunctionTest(int, char *[]) for (unsigned int j = 0; j < costFunction->GetNumberOfParameters(); ++j) { - if (itk::Math::abs(parameters[j] - optimizer->GetCurrentPosition()[j]) > 0.5) + if (itk::Math::Absolute(parameters[j] - optimizer->GetCurrentPosition()[j]) > 0.5) { std::cout << "Final parameters not within tolerance. " << std::endl; return EXIT_FAILURE; diff --git a/Modules/Segmentation/LevelSets/test/itkSparseFieldFourthOrderLevelSetImageFilterTest.cxx b/Modules/Segmentation/LevelSets/test/itkSparseFieldFourthOrderLevelSetImageFilterTest.cxx index 87a8b2f2644..4e9b129c8c8 100644 --- a/Modules/Segmentation/LevelSets/test/itkSparseFieldFourthOrderLevelSetImageFilterTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkSparseFieldFourthOrderLevelSetImageFilterTest.cxx @@ -50,8 +50,8 @@ constexpr unsigned int WIDTH = (128); float square(unsigned int x, unsigned int y) { - const float X = itk::Math::abs(x - float{ WIDTH } / 2.0); - const float Y = itk::Math::abs(y - float{ HEIGHT } / 2.0); + const float X = itk::Math::Absolute(x - float{ WIDTH } / 2.0); + const float Y = itk::Math::Absolute(y - float{ HEIGHT } / 2.0); float dis = -std::sqrt((X - RADIUS) * (X - RADIUS) + (Y - RADIUS) * (Y - RADIUS)); if (!((X > RADIUS) && (Y > RADIUS))) { diff --git a/Modules/Segmentation/LevelSets/test/itkUnsharpMaskLevelSetImageFilterTest.cxx b/Modules/Segmentation/LevelSets/test/itkUnsharpMaskLevelSetImageFilterTest.cxx index e974a2199a9..aafadecca54 100644 --- a/Modules/Segmentation/LevelSets/test/itkUnsharpMaskLevelSetImageFilterTest.cxx +++ b/Modules/Segmentation/LevelSets/test/itkUnsharpMaskLevelSetImageFilterTest.cxx @@ -28,8 +28,8 @@ constexpr unsigned int WIDTH = (128); float square(unsigned int x, unsigned int y) { - const float X = itk::Math::abs(x - float{ WIDTH } / 2.0); - const float Y = itk::Math::abs(y - float{ HEIGHT } / 2.0); + const float X = itk::Math::Absolute(x - float{ WIDTH } / 2.0); + const float Y = itk::Math::Absolute(y - float{ HEIGHT } / 2.0); float dis = -std::sqrt((X - RADIUS) * (X - RADIUS) + (Y - RADIUS) * (Y - RADIUS)); if (!((X > RADIUS) && (Y > RADIUS))) { diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermBase.hxx b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermBase.hxx index bd9bb76633b..0b44cc69e44 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermBase.hxx +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermBase.hxx @@ -64,7 +64,7 @@ auto LevelSetEquationTermBase::Evaluate(const LevelSetInputIndexType & iP) -> LevelSetOutputRealType { - if (itk::Math::abs(this->m_Coefficient) > NumericTraits::epsilon()) + if (itk::Math::Absolute(this->m_Coefficient) > NumericTraits::epsilon()) { return this->m_Coefficient * this->Value(iP); } @@ -80,7 +80,7 @@ LevelSetEquationTermBase::Evaluate(const LevelS const LevelSetDataType & iData) -> LevelSetOutputRealType { - if (itk::Math::abs(this->m_Coefficient) > NumericTraits::epsilon()) + if (itk::Math::Absolute(this->m_Coefficient) > NumericTraits::epsilon()) { return this->m_Coefficient * this->Value(iP, iData); } diff --git a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermContainer.hxx b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermContainer.hxx index 610372bb8ff..695f2cb1f5a 100644 --- a/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermContainer.hxx +++ b/Modules/Segmentation/LevelSetsv4/include/itkLevelSetEquationTermContainer.hxx @@ -270,7 +270,7 @@ LevelSetEquationTermContainer::Evaluate(const L { const LevelSetOutputRealType temp_val = (term_it->second)->Evaluate(iP); - const LevelSetOutputRealType abs_temp_value = itk::Math::abs(temp_val); + const LevelSetOutputRealType abs_temp_value = itk::Math::Absolute(temp_val); // This is a thread-safe equivalent of: // cfl_it->second = std::max(abs_temp_value, cfl_it->second); @@ -305,7 +305,7 @@ LevelSetEquationTermContainer::Evaluate(const L { const LevelSetOutputRealType temp_val = (term_it->second)->Evaluate(iP, iData); - const LevelSetOutputRealType abs_temp_value = itk::Math::abs(temp_val); + const LevelSetOutputRealType abs_temp_value = itk::Math::Absolute(temp_val); // This is a thread-safe equivalent of: // cfl_it->second = std::max(abs_temp_value, cfl_it->second); diff --git a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetDenseImageTest.cxx b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetDenseImageTest.cxx index bf7868fa6f6..c07864b4436 100644 --- a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetDenseImageTest.cxx +++ b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetDenseImageTest.cxx @@ -39,7 +39,7 @@ class ToleranceChecker IsOutsideTolerance(const RealType & value, const RealType & theoreticalValue) const { // ignore if they are both effectively zero - if (std::max(itk::Math::abs(value), itk::Math::abs(theoreticalValue)) < 50 * itk::Math::eps) + if (std::max(itk::Math::Absolute(value), itk::Math::Absolute(theoreticalValue)) < 50 * itk::Math::eps) { return false; } @@ -54,7 +54,7 @@ class ToleranceChecker GetFractionalError(const RealType & value, const RealType & theoreticalValue) const { RealType fractionalError = - itk::Math::abs(theoreticalValue - value) / (itk::Math::abs(theoreticalValue) + 20 * itk::Math::eps); + itk::Math::Absolute(theoreticalValue - value) / (itk::Math::Absolute(theoreticalValue) + 20 * itk::Math::eps); return fractionalError; } @@ -198,10 +198,10 @@ itkLevelSetDenseImageTest(int, char *[]) LevelSetType::HessianType hessian = levelSet->EvaluateHessian(idx); std::cout << "hessian = " << std::endl << hessian << std::endl; - if (itk::Math::abs(itk::Math::abs(hessian[0][0]) - 499.998) / 499.998 > 5e-2) + if (itk::Math::Absolute(itk::Math::Absolute(hessian[0][0]) - 499.998) / 499.998 > 5e-2) { - std::cout << idx << " *HessianTestFail* " << itk::Math::abs(hessian[0][0]) - << " != " << itk::Math::abs(hessian[1][1]) << std::endl; + std::cout << idx << " *HessianTestFail* " << itk::Math::Absolute(hessian[0][0]) + << " != " << itk::Math::Absolute(hessian[1][1]) << std::endl; return EXIT_FAILURE; } @@ -211,7 +211,7 @@ itkLevelSetDenseImageTest(int, char *[]) const LevelSetType::OutputRealType gradientnorm = levelSet->EvaluateGradientNorm(idx); std::cout << "gradient norm = " << gradientnorm << std::endl; - if (itk::Math::abs(1 - gradientnorm) > 5e-2) + if (itk::Math::Absolute(1 - gradientnorm) > 5e-2) { std::cout << idx << " *GradientNormFail* " << gradientnorm << " != " << 1 << std::endl; return EXIT_FAILURE; diff --git a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationCurvatureTermTest.cxx b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationCurvatureTermTest.cxx index b8b2345a138..e9a6d8e2c90 100644 --- a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationCurvatureTermTest.cxx +++ b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationCurvatureTermTest.cxx @@ -159,9 +159,9 @@ itkLevelSetEquationCurvatureTermTest(int argc, char * argv[]) index[1] = 20; const CurvatureTermType::LevelSetOutputRealType value = term->Evaluate(index); - if (itk::Math::abs(value) > 5e-2) + if (itk::Math::Absolute(value) > 5e-2) { - std::cerr << "( itk::Math::abs( " << value << " ) > 5e-2 )" << std::endl; + std::cerr << "( itk::Math::Absolute( " << value << " ) > 5e-2 )" << std::endl; return EXIT_FAILURE; } diff --git a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationLaplacianTermTest.cxx b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationLaplacianTermTest.cxx index 12c62bb6a30..d3308686508 100644 --- a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationLaplacianTermTest.cxx +++ b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationLaplacianTermTest.cxx @@ -170,7 +170,7 @@ itkLevelSetEquationLaplacianTermTest(int argc, char * argv[]) index[0] = 10; index[1] = 20; - if (itk::Math::abs(term->Evaluate(index)) > 5e-2) + if (itk::Math::Absolute(term->Evaluate(index)) > 5e-2) { return EXIT_FAILURE; } diff --git a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationPropagationTermTest.cxx b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationPropagationTermTest.cxx index 41b8ab3c5ee..98eecca428d 100644 --- a/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationPropagationTermTest.cxx +++ b/Modules/Segmentation/LevelSetsv4/test/itkLevelSetEquationPropagationTermTest.cxx @@ -157,7 +157,7 @@ itkLevelSetEquationPropagationTermTest(int argc, char * argv[]) index[0] = 10; index[1] = 20; - if (itk::Math::abs(term->Evaluate(index) - 1) > 5e-2) + if (itk::Math::Absolute(term->Evaluate(index) - 1) > 5e-2) { return EXIT_FAILURE; } @@ -170,7 +170,7 @@ itkLevelSetEquationPropagationTermTest(int argc, char * argv[]) while (!iIt.IsAtEnd()) { - if (itk::Math::abs(static_cast(iIt.Get()) - static_cast(pIt.Get())) > 1e-2) + if (itk::Math::Absolute(static_cast(iIt.Get()) - static_cast(pIt.Get())) > 1e-2) { std::cout << iIt.GetIndex() << " * " << pIt.GetIndex() << std::endl; std::cout << iIt.Get() << " * " << pIt.Get() << std::endl; diff --git a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.hxx b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.hxx index 52f8b2cfb4b..567ba0eaca7 100644 --- a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.hxx +++ b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkRGBGibbsPriorFilter.hxx @@ -127,7 +127,7 @@ RGBGibbsPriorFilter::GreyScalarBoundary(LabelledI { if (signs[i] == 0) { - const auto difference = static_cast(itk::Math::abs(m_LowPoint[rgb] - neighbors[i])); + const auto difference = static_cast(itk::Math::Absolute(m_LowPoint[rgb] - neighbors[i])); if (difference < m_BoundaryGradient) { ++numx; @@ -144,7 +144,7 @@ RGBGibbsPriorFilter::GreyScalarBoundary(LabelledI { if (signs[i] == 1) { - const auto difference = static_cast(itk::Math::abs(m_LowPoint[rgb] - neighbors[i])); + const auto difference = static_cast(itk::Math::Absolute(m_LowPoint[rgb] - neighbors[i])); if (difference > m_BoundaryGradient) { --numx; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.hxx b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.hxx index 668103c7e51..5aff2fd7b0e 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.hxx +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationImageFilter.hxx @@ -66,7 +66,7 @@ VoronoiSegmentationImageFilter::Te } // // jvm - Mahalanobis distance - // if (savevar > 0 && itk::Math::abs(savemean - m_Mean) / m_Var < 2.5) + // if (savevar > 0 && itk::Math::Absolute(savemean - m_Mean) / m_Var < 2.5) // return true; // else // return false; @@ -182,7 +182,7 @@ VoronoiSegmentationImageFilter::Ta if (this->GetUseBackgroundInAPrior()) { - m_MeanTolerance = itk::Math::abs(m_Mean - b_Mean) * this->GetMeanDeviation(); + m_MeanTolerance = itk::Math::Absolute(m_Mean - b_Mean) * this->GetMeanDeviation(); } else { diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.hxx b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.hxx index 870a0dd1f4d..9259730efc7 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.hxx +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiSegmentationRGBImageFilter.hxx @@ -53,7 +53,7 @@ VoronoiSegmentationRGBImageFilter::SetMeanPercentErro for (unsigned int i = 0; i < 6; ++i) { m_MeanPercentError[i] = x[i]; - m_MeanTolerance[i] = itk::Math::abs(x[i] * m_Mean[i]); + m_MeanTolerance[i] = itk::Math::Absolute(x[i] * m_Mean[i]); } } @@ -341,7 +341,7 @@ VoronoiSegmentationRGBImageFilter::TakeAPrior(const B } else { - m_MeanTolerance[i] = itk::Math::abs(m_Mean[i] * m_MeanPercentError[i]); + m_MeanTolerance[i] = itk::Math::Absolute(m_Mean[i] * m_MeanPercentError[i]); } } diff --git a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx index 1f785f51ebd..0f06f035df2 100644 --- a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx +++ b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx @@ -70,7 +70,7 @@ RGBImageTotalAbsDifference(const itk::Image, VDimensi for (unsigned int i = 0; i < 3; ++i) { - localDiff += itk::Math::abs(validPx[i] - testPx[i]); + localDiff += itk::Math::Absolute(validPx[i] - testPx[i]); } if (localDiff != TPixelValue{}) diff --git a/Modules/Video/Core/include/itkRingBuffer.hxx b/Modules/Video/Core/include/itkRingBuffer.hxx index b12673f9b4d..fc3af2da060 100644 --- a/Modules/Video/Core/include/itkRingBuffer.hxx +++ b/Modules/Video/Core/include/itkRingBuffer.hxx @@ -154,7 +154,7 @@ template auto RingBuffer::GetOffsetBufferIndex(OffsetValueType offset) -> OffsetValueType { - const OffsetValueType moddedOffset = itk::Math::abs(offset) % this->GetNumberOfBuffers(); + const OffsetValueType moddedOffset = itk::Math::Absolute(offset) % this->GetNumberOfBuffers(); auto signedHeadIndex = static_cast(m_HeadIndex); if (offset >= 0) { diff --git a/Modules/Video/Core/include/itkVideoStream.hxx b/Modules/Video/Core/include/itkVideoStream.hxx index 3c814d5a143..b9cec2be0c8 100644 --- a/Modules/Video/Core/include/itkVideoStream.hxx +++ b/Modules/Video/Core/include/itkVideoStream.hxx @@ -174,7 +174,7 @@ void VideoStream::SetFrameDirection(SizeValueType frameNumber, typename TFrameType::DirectionType direction) { // Determinant is non-zero - if (itk::Math::abs(vnl_determinant(direction.GetVnlMatrix())) <= itk::Math::eps) + if (itk::Math::Absolute(vnl_determinant(direction.GetVnlMatrix())) <= itk::Math::eps) { itkExceptionMacro("Bad direction, determinant is 0. Direction is " << direction); } diff --git a/Utilities/Maintenance/VNL_ModernizeNaming.py b/Utilities/Maintenance/VNL_ModernizeNaming.py index 19dd46e64b0..d8940f96b18 100755 --- a/Utilities/Maintenance/VNL_ModernizeNaming.py +++ b/Utilities/Maintenance/VNL_ModernizeNaming.py @@ -31,7 +31,7 @@ XXXX,vnl_math_rnd,itk::Math::rnd XXXX,vnl_math_floor,itk::Math::floor XXXX,vnl_math_ceil,itk::Math::ceil -XXXX,vnl_math_abs,itk::Math::abs +XXXX,vnl_math_abs,itk::Math::Absolute XXXX,vnl_math_sqr,itk::Math::sqr XXXX,vnl_math_cube,itk::Math::cube XXXX,vnl_math_sgn,itk::Math::sgn