From fb68b149cb499baf1007b0f0b8cf1784eed185fe Mon Sep 17 00:00:00 2001 From: Deanna Hood Date: Tue, 17 Mar 2015 02:04:42 +1000 Subject: [PATCH] Rename isnan to isNaN --- Eigen/src/Core/Assign_MKL.h | 2 +- Eigen/src/Core/GenericPacketMath.h | 6 +++--- Eigen/src/Core/GlobalFunctions.h | 2 +- Eigen/src/Core/MathFunctions.h | 4 ++-- Eigen/src/Core/functors/UnaryFunctors.h | 16 ++++++++-------- Eigen/src/plugins/ArrayCwiseUnaryOps.h | 16 ++++++++-------- test/array.cpp | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Eigen/src/Core/Assign_MKL.h b/Eigen/src/Core/Assign_MKL.h index fd1f391e3..25cfec25a 100644 --- a/Eigen/src/Core/Assign_MKL.h +++ b/Eigen/src/Core/Assign_MKL.h @@ -214,7 +214,7 @@ EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(sqrt, Sqrt) EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(round, Round) EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(floor, Floor) EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(ceil, Ceil) -EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(isnan, Isnan) +EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(isNaN, IsNaN) EIGEN_MKL_VML_DECLARE_UNARY_CALLS_LA(isinf, Isinf) EIGEN_MKL_VML_DECLARE_UNARY_CALLS_REAL(square, Sqr) diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h index 35701cce4..5c217f4f0 100644 --- a/Eigen/src/Core/GenericPacketMath.h +++ b/Eigen/src/Core/GenericPacketMath.h @@ -77,7 +77,7 @@ struct default_packet_traits HasRound = 0, HasFloor = 0, HasCeil = 0, - HasIsnan = 0, + HasIsNaN = 0, HasIsinf = 0 }; }; @@ -395,9 +395,9 @@ Packet pfloor(const Packet& a) { using numext::floor; return floor(a); } template EIGEN_DECLARE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS Packet pceil(const Packet& a) { using numext::ceil; return ceil(a); } -/** \internal \returns the isnan of \a a (coeff-wise) */ +/** \internal \returns whether \a a is NaN (coeff-wise) */ template EIGEN_DECLARE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS -Packet pisnan(const Packet& a) { using numext::isnan; return isnan(a); } +Packet pisNaN(const Packet& a) { using numext::isNaN; return isNaN(a); } /** \internal \returns the isinf of \a a (coeff-wise) */ template EIGEN_DECLARE_FUNCTION_ALLOWING_MULTIPLE_DEFINITIONS diff --git a/Eigen/src/Core/GlobalFunctions.h b/Eigen/src/Core/GlobalFunctions.h index 44f9c7790..f7a8b06f4 100644 --- a/Eigen/src/Core/GlobalFunctions.h +++ b/Eigen/src/Core/GlobalFunctions.h @@ -59,7 +59,7 @@ namespace Eigen EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(round,scalar_round_op) EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(floor,scalar_floor_op) EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(ceil,scalar_ceil_op) - EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isnan,scalar_isnan_op) + EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isNaN,scalar_isNaN_op) EIGEN_ARRAY_DECLARE_GLOBAL_UNARY(isinf,scalar_isinf_op) template diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index e98160ce3..a2c9d16f9 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -741,7 +741,7 @@ bool (isfinite)(const std::complex& x) template EIGEN_DEVICE_FUNC -bool (isnan)(const T& x) +bool (isNaN)(const T& x) { using std::isnan; return isnan(x); @@ -749,7 +749,7 @@ bool (isnan)(const T& x) template EIGEN_DEVICE_FUNC -bool (isnan)(const std::complex& x) +bool (isNaN)(const std::complex& x) { using std::real; using std::imag; diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h index bf1bc47a8..e0ceb1b2b 100644 --- a/Eigen/src/Core/functors/UnaryFunctors.h +++ b/Eigen/src/Core/functors/UnaryFunctors.h @@ -566,23 +566,23 @@ struct functor_traits > }; /** \internal - * \brief Template functor to compute the isnan of a scalar - * \sa class CwiseUnaryOp, ArrayBase::isnan() + * \brief Template functor to compute whether a scalar is NaN + * \sa class CwiseUnaryOp, ArrayBase::isNaN() */ -template struct scalar_isnan_op { - EIGEN_EMPTY_STRUCT_CTOR(scalar_isnan_op) +template struct scalar_isNaN_op { + EIGEN_EMPTY_STRUCT_CTOR(scalar_isNaN_op) typedef bool result_type; - EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isnan(a); } + EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE result_type operator() (const Scalar& a) const { return numext::isNaN(a); } template EIGEN_STRONG_INLINE const Packet packetOp(const Packet& a) const - { return internal::pisnan(a); } + { return internal::pisNaN(a); } }; template -struct functor_traits > +struct functor_traits > { enum { Cost = NumTraits::MulCost, - PacketAccess = packet_traits::HasIsnan + PacketAccess = packet_traits::HasIsNaN }; }; diff --git a/Eigen/src/plugins/ArrayCwiseUnaryOps.h b/Eigen/src/plugins/ArrayCwiseUnaryOps.h index 032f5c31c..5e5c8a857 100644 --- a/Eigen/src/plugins/ArrayCwiseUnaryOps.h +++ b/Eigen/src/plugins/ArrayCwiseUnaryOps.h @@ -24,7 +24,7 @@ typedef CwiseUnaryOp, const Derived> CubeReturn typedef CwiseUnaryOp, const Derived> RoundReturnType; typedef CwiseUnaryOp, const Derived> FloorReturnType; typedef CwiseUnaryOp, const Derived> CeilReturnType; -typedef CwiseUnaryOp, const Derived> IsnanReturnType; +typedef CwiseUnaryOp, const Derived> IsNaNReturnType; typedef CwiseUnaryOp, const Derived> IsinfReturnType; /** \returns an expression of the coefficient-wise absolute value of \c *this @@ -364,17 +364,17 @@ ceil() const return CeilReturnType(derived()); } -/** \returns an expression of the coefficient-wise isnan of *this. +/** \returns an expression of the coefficient-wise isNaN of *this. * - * Example: \include Cwise_isnan.cpp - * Output: \verbinclude Cwise_isnan.out + * Example: \include Cwise_isNaN.cpp + * Output: \verbinclude Cwise_isNaN.out * * \sa isinf() */ -inline const IsnanReturnType -isnan() const +inline const IsNaNReturnType +isNaN() const { - return IsnanReturnType(derived()); + return IsNaNReturnType(derived()); } /** \returns an expression of the coefficient-wise isinf of *this. @@ -382,7 +382,7 @@ isnan() const * Example: \include Cwise_isinf.cpp * Output: \verbinclude Cwise_isinf.out * - * \sa isnan() + * \sa isNaN() */ inline const IsinfReturnType isinf() const diff --git a/test/array.cpp b/test/array.cpp index a8b6a3afc..9686a7445 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -213,7 +213,7 @@ template void array_real(const ArrayType& m) VERIFY_IS_APPROX(m1.round(), round(m1)); VERIFY_IS_APPROX(m1.floor(), floor(m1)); VERIFY_IS_APPROX(m1.ceil(), ceil(m1)); - VERIFY_IS_APPROX(m1.isnan(), isnan(m1)); + VERIFY_IS_APPROX(m1.isNaN(), isNaN(m1)); VERIFY_IS_APPROX(m1.isinf(), isinf(m1)); VERIFY_IS_APPROX(m1.square(), square(m1)); @@ -281,7 +281,7 @@ template void array_complex(const ArrayType& m) VERIFY_IS_APPROX(m1.round(), round(m1)); VERIFY_IS_APPROX(m1.floor(), floor(m1)); VERIFY_IS_APPROX(m1.ceil(), ceil(m1)); - VERIFY_IS_APPROX(m1.isnan(), isnan(m1)); + VERIFY_IS_APPROX(m1.isNaN(), isNaN(m1)); VERIFY_IS_APPROX(m1.isinf(), isinf(m1)); VERIFY_IS_APPROX(m1.square(), square(m1)); VERIFY_IS_APPROX(m1.sin(), sin(m1));