GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-31 17:22:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove ambiguity with recent numext methods isNaN and isInf

Browse Source
This commit is contained in:
Deanna Hood 2015-03-17 22:39:51 +10:00
parent 596be3cd86
commit 8878e1c1de
3 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/main.h
View File

@ -442,12 +442,7 @@ template<typename T> bool isNotNaN(const T& x)
return x==x; return x==x;
} }
template<typename T> bool isNaN(const T& x) template<typename T> bool isPlusInf(const T& x)
{
return x!=x;
}
template<typename T> bool isInf(const T& x)
{ {
return x > NumTraits<T>::highest(); return x > NumTraits<T>::highest();
} }

10
test/packetmath.cpp
View File

@ -317,7 +317,7 @@ template<typename Scalar> void packetmath_real()
data1[0] = std::numeric_limits<Scalar>::quiet_NaN(); data1[0] = std::numeric_limits<Scalar>::quiet_NaN();
packet_helper<internal::packet_traits<Scalar>::HasExp,Packet> h; packet_helper<internal::packet_traits<Scalar>::HasExp,Packet> h;
h.store(data2, internal::pexp(h.load(data1))); h.store(data2, internal::pexp(h.load(data1)));
VERIFY(isNaN(data2[0])); VERIFY(numext::isNaN(data2[0]));
} }
for (int i=0; i<size; ++i) for (int i=0; i<size; ++i)
@ -333,14 +333,14 @@ template<typename Scalar> void packetmath_real()
data1[0] = std::numeric_limits<Scalar>::quiet_NaN(); data1[0] = std::numeric_limits<Scalar>::quiet_NaN();
packet_helper<internal::packet_traits<Scalar>::HasLog,Packet> h; packet_helper<internal::packet_traits<Scalar>::HasLog,Packet> h;
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
VERIFY(isNaN(data2[0])); VERIFY(numext::isNaN(data2[0]));
data1[0] = -1.0f; data1[0] = -1.0f;
h.store(data2, internal::plog(h.load(data1))); h.store(data2, internal::plog(h.load(data1)));
VERIFY(isNaN(data2[0])); VERIFY(numext::isNaN(data2[0]));
#if !EIGEN_FAST_MATH #if !EIGEN_FAST_MATH
h.store(data2, internal::psqrt(h.load(data1))); h.store(data2, internal::psqrt(h.load(data1)));
VERIFY(isNaN(data2[0])); VERIFY(numext::isNaN(data2[0]));
VERIFY(isNaN(data2[1])); VERIFY(numext::isNaN(data2[1]));
#endif #endif
} }
} }

40
test/stable_norm.cpp
View File

@ -111,33 +111,33 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
{ {
v = vrand; v = vrand;
v(i,j) = std::numeric_limits<RealScalar>::quiet_NaN(); v(i,j) = std::numeric_limits<RealScalar>::quiet_NaN();
VERIFY(!isFinite(v.squaredNorm())); VERIFY(isNaN(v.squaredNorm())); VERIFY(!isFinite(v.squaredNorm())); VERIFY(numext::isNaN(v.squaredNorm()));
VERIFY(!isFinite(v.norm())); VERIFY(isNaN(v.norm())); VERIFY(!isFinite(v.norm())); VERIFY(numext::isNaN(v.norm()));
VERIFY(!isFinite(v.stableNorm())); VERIFY(isNaN(v.stableNorm())); VERIFY(!isFinite(v.stableNorm())); VERIFY(numext::isNaN(v.stableNorm()));
VERIFY(!isFinite(v.blueNorm())); VERIFY(isNaN(v.blueNorm())); VERIFY(!isFinite(v.blueNorm())); VERIFY(numext::isNaN(v.blueNorm()));
VERIFY(!isFinite(v.hypotNorm())); VERIFY(isNaN(v.hypotNorm())); VERIFY(!isFinite(v.hypotNorm())); VERIFY(numext::isNaN(v.hypotNorm()));
} }
// +inf // +inf
{ {
v = vrand; v = vrand;
v(i,j) = std::numeric_limits<RealScalar>::infinity(); v(i,j) = std::numeric_limits<RealScalar>::infinity();
VERIFY(!isFinite(v.squaredNorm())); VERIFY(isInf(v.squaredNorm())); VERIFY(!isFinite(v.squaredNorm())); VERIFY(isPlusInf(v.squaredNorm()));
VERIFY(!isFinite(v.norm())); VERIFY(isInf(v.norm())); VERIFY(!isFinite(v.norm())); VERIFY(isPlusInf(v.norm()));
VERIFY(!isFinite(v.stableNorm())); VERIFY(isInf(v.stableNorm())); VERIFY(!isFinite(v.stableNorm())); VERIFY(isPlusInf(v.stableNorm()));
VERIFY(!isFinite(v.blueNorm())); VERIFY(isInf(v.blueNorm())); VERIFY(!isFinite(v.blueNorm())); VERIFY(isPlusInf(v.blueNorm()));
VERIFY(!isFinite(v.hypotNorm())); VERIFY(isInf(v.hypotNorm())); VERIFY(!isFinite(v.hypotNorm())); VERIFY(isPlusInf(v.hypotNorm()));
} }
// -inf // -inf
{ {
v = vrand; v = vrand;
v(i,j) = -std::numeric_limits<RealScalar>::infinity(); v(i,j) = -std::numeric_limits<RealScalar>::infinity();
VERIFY(!isFinite(v.squaredNorm())); VERIFY(isInf(v.squaredNorm())); VERIFY(!isFinite(v.squaredNorm())); VERIFY(isPlusInf(v.squaredNorm()));
VERIFY(!isFinite(v.norm())); VERIFY(isInf(v.norm())); VERIFY(!isFinite(v.norm())); VERIFY(isPlusInf(v.norm()));
VERIFY(!isFinite(v.stableNorm())); VERIFY(isInf(v.stableNorm())); VERIFY(!isFinite(v.stableNorm())); VERIFY(isPlusInf(v.stableNorm()));
VERIFY(!isFinite(v.blueNorm())); VERIFY(isInf(v.blueNorm())); VERIFY(!isFinite(v.blueNorm())); VERIFY(isPlusInf(v.blueNorm()));
VERIFY(!isFinite(v.hypotNorm())); VERIFY(isInf(v.hypotNorm())); VERIFY(!isFinite(v.hypotNorm())); VERIFY(isPlusInf(v.hypotNorm()));
} }
// mix // mix
@ -147,11 +147,11 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
v = vrand; v = vrand;
v(i,j) = -std::numeric_limits<RealScalar>::infinity(); v(i,j) = -std::numeric_limits<RealScalar>::infinity();
v(i2,j2) = std::numeric_limits<RealScalar>::quiet_NaN(); v(i2,j2) = std::numeric_limits<RealScalar>::quiet_NaN();
VERIFY(!isFinite(v.squaredNorm())); VERIFY(isNaN(v.squaredNorm())); VERIFY(!isFinite(v.squaredNorm())); VERIFY(numext::isNaN(v.squaredNorm()));
VERIFY(!isFinite(v.norm())); VERIFY(isNaN(v.norm())); VERIFY(!isFinite(v.norm())); VERIFY(numext::isNaN(v.norm()));
VERIFY(!isFinite(v.stableNorm())); VERIFY(isNaN(v.stableNorm())); VERIFY(!isFinite(v.stableNorm())); VERIFY(numext::isNaN(v.stableNorm()));
VERIFY(!isFinite(v.blueNorm())); VERIFY(isNaN(v.blueNorm())); VERIFY(!isFinite(v.blueNorm())); VERIFY(numext::isNaN(v.blueNorm()));
VERIFY(!isFinite(v.hypotNorm())); VERIFY(isNaN(v.hypotNorm())); VERIFY(!isFinite(v.hypotNorm())); VERIFY(numext::isNaN(v.hypotNorm()));
} }
} }