GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-23 01:59:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rework the unit-tests to use lower precision, so as to eliminate

Browse Source 
false positives. Also some cleanup in the fuzzy compares.
This commit is contained in:
Benoit Jacob 2007-12-03 10:23:08 +00:00
parent 5abaaf9688
commit 346c00f4c8
6 changed files with 143 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Fuzzy.h
View File

@ -50,18 +50,18 @@ bool MatrixBase<Scalar, Derived>::isApprox(
template<typename Scalar, typename Derived> template<typename Scalar, typename Derived>
bool MatrixBase<Scalar, Derived>::isMuchSmallerThan( bool MatrixBase<Scalar, Derived>::isMuchSmallerThan(
const Scalar& other, const typename NumTraits<Scalar>::Real& other,
const typename NumTraits<Scalar>::Real& prec const typename NumTraits<Scalar>::Real& prec
) const ) const
{ {
if(IsVector) if(IsVector)
{ {
return(norm2() <= abs2(other) * prec * prec); return(norm2() <= abs2(other * prec));
} }
else else
{ {
for(int i = 0; i < cols(); i++) for(int i = 0; i < cols(); i++)
if(col(i).norm2() > abs2(other) * prec * prec) if(col(i).norm2() > abs2(other * prec))
return false; return false;
return true; return true;
} }

17
src/Core/MatrixBase.h
View File

@ -34,21 +34,6 @@ template<typename Scalar, typename Derived> class MatrixBase
template<typename OtherDerived> template<typename OtherDerived>
void _copy_helper(const MatrixBase<Scalar, OtherDerived>& other); void _copy_helper(const MatrixBase<Scalar, OtherDerived>& other);
template<typename OtherDerived>
bool _isApprox_helper(
const OtherDerived& other,
const typename NumTraits<Scalar>::Real& prec = precision<Scalar>()
) const;
bool _isMuchSmallerThan_helper(
const Scalar& other,
const typename NumTraits<Scalar>::Real& prec = precision<Scalar>()
) const;
template<typename OtherDerived>
bool _isMuchSmallerThan_helper(
const MatrixBase<Scalar, OtherDerived>& other,
const typename NumTraits<Scalar>::Real& prec = precision<Scalar>()
) const;
public: public:
static const int SizeAtCompileTime static const int SizeAtCompileTime
= RowsAtCompileTime == Dynamic || ColsAtCompileTime == Dynamic = RowsAtCompileTime == Dynamic || ColsAtCompileTime == Dynamic
@ -124,7 +109,7 @@ template<typename Scalar, typename Derived> class MatrixBase
const typename NumTraits<Scalar>::Real& prec = precision<Scalar>() const typename NumTraits<Scalar>::Real& prec = precision<Scalar>()
) const; ) const;
bool isMuchSmallerThan( bool isMuchSmallerThan(
const Scalar& other, const typename NumTraits<Scalar>::Real& other,
const typename NumTraits<Scalar>::Real& prec = precision<Scalar>() const typename NumTraits<Scalar>::Real& prec = precision<Scalar>()
) const; ) const;
template<typename OtherDerived> template<typename OtherDerived>

41
test/adjoint.cpp
View File

@ -55,37 +55,38 @@ template<typename MatrixType> void adjoint(const MatrixType& m)
s2 = random<Scalar>(); s2 = random<Scalar>();
// check involutivity of adjoint, transpose, conjugate // check involutivity of adjoint, transpose, conjugate
QVERIFY(m1.transpose().transpose().isApprox(m1)); VERIFY_IS_APPROX(m1.transpose().transpose(), m1);
QVERIFY(m1.conjugate().conjugate().isApprox(m1)); VERIFY_IS_APPROX(m1.conjugate().conjugate(), m1);
QVERIFY(m1.adjoint().adjoint().isApprox(m1)); VERIFY_IS_APPROX(m1.adjoint().adjoint(), m1);
// check basic compatibility of adjoint, transpose, conjugate // check basic compatibility of adjoint, transpose, conjugate
QVERIFY(m1.transpose().conjugate().adjoint().isApprox(m1)); VERIFY_IS_APPROX(m1.transpose().conjugate().adjoint(), m1);
QVERIFY(m1.adjoint().conjugate().transpose().isApprox(m1)); VERIFY_IS_APPROX(m1.adjoint().conjugate().transpose(), m1);
if(!NumTraits<Scalar>::IsComplex) QVERIFY(m1.adjoint().transpose().isApprox(m1)); if(!NumTraits<Scalar>::IsComplex)
VERIFY_IS_APPROX(m1.adjoint().transpose(), m1);
// check multiplicative behavior // check multiplicative behavior
QVERIFY((m1.transpose() * m2).transpose().isApprox(m2.transpose() * m1)); VERIFY_IS_APPROX((m1.transpose() * m2).transpose(), m2.transpose() * m1);
QVERIFY((m1.adjoint() * m2).adjoint().isApprox(m2.adjoint() * m1)); VERIFY_IS_APPROX((m1.adjoint() * m2).adjoint(), m2.adjoint() * m1);
QVERIFY((m1.transpose() * m2).conjugate().isApprox(m1.adjoint() * m2.conjugate())); VERIFY_IS_APPROX((m1.transpose() * m2).conjugate(), m1.adjoint() * m2.conjugate());
QVERIFY((s1 * m1).transpose().isApprox(s1 * m1.transpose())); VERIFY_IS_APPROX((s1 * m1).transpose(), s1 * m1.transpose());
QVERIFY((s1 * m1).conjugate().isApprox(conj(s1) * m1.conjugate())); VERIFY_IS_APPROX((s1 * m1).conjugate(), conj(s1) * m1.conjugate());
QVERIFY((s1 * m1).adjoint().isApprox(conj(s1) * m1.adjoint())); VERIFY_IS_APPROX((s1 * m1).adjoint(), conj(s1) * m1.adjoint());
// check basic properties of dot, norm, norm2 // check basic properties of dot, norm, norm2
typedef typename NumTraits<Scalar>::Real RealScalar; typedef typename NumTraits<Scalar>::Real RealScalar;
QVERIFY(isApprox((s1 * v1 + s2 * v2).dot(v3), s1 * v1.dot(v3) + s2 * v2.dot(v3))); VERIFY_IS_APPROX((s1 * v1 + s2 * v2).dot(v3), s1 * v1.dot(v3) + s2 * v2.dot(v3));
QVERIFY(isApprox(v3.dot(s1 * v1 + s2 * v2), conj(s1) * v3.dot(v1) + conj(s2) * v3.dot(v2))); VERIFY_IS_APPROX(v3.dot(s1 * v1 + s2 * v2), conj(s1)*v3.dot(v1)+conj(s2)*v3.dot(v2));
QVERIFY(isApprox(conj(v1.dot(v2)), v2.dot(v1))); VERIFY_IS_APPROX(conj(v1.dot(v2)), v2.dot(v1));
QVERIFY(isApprox(abs(v1.dot(v1)), v1.norm2())); VERIFY_IS_APPROX(abs(v1.dot(v1)), v1.norm2());
if(NumTraits<Scalar>::HasFloatingPoint) if(NumTraits<Scalar>::HasFloatingPoint)
QVERIFY(isApprox(v1.norm2(), v1.norm() * v1.norm())); VERIFY_IS_APPROX(v1.norm2(), v1.norm() * v1.norm());
QVERIFY(isMuchSmallerThan(abs(vzero.dot(v1)), static_cast<RealScalar>(1))); VERIFY_IS_MUCH_SMALLER_THAN(abs(vzero.dot(v1)), static_cast<RealScalar>(1));
if(NumTraits<Scalar>::HasFloatingPoint) if(NumTraits<Scalar>::HasFloatingPoint)
QVERIFY(isMuchSmallerThan(vzero.norm(), static_cast<RealScalar>(1))); VERIFY_IS_MUCH_SMALLER_THAN(vzero.norm(), static_cast<RealScalar>(1));
// check compatibility of dot and adjoint // check compatibility of dot and adjoint
QVERIFY(isApprox(v1.dot(square * v2), (square.adjoint() * v1).dot(v2))); VERIFY_IS_APPROX(v1.dot(square * v2), (square.adjoint() * v1).dot(v2));
} }
void EigenTest::testAdjoint() void EigenTest::testAdjoint()

90
test/basicstuff.cpp
View File

@ -62,64 +62,66 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
s2 = random<Scalar>(); s2 = random<Scalar>();
// test Fuzzy.h and Zero.h. // test Fuzzy.h and Zero.h.
QVERIFY(v1.isApprox(v1)); VERIFY_IS_APPROX( v1, v1);
QVERIFY(!v1.isApprox(2*v1)); VERIFY_IS_NOT_APPROX( v1, 2*v1);
QVERIFY(vzero.isMuchSmallerThan(v1)); VERIFY_IS_MUCH_SMALLER_THAN( vzero, v1);
if(NumTraits<Scalar>::HasFloatingPoint) if(NumTraits<Scalar>::HasFloatingPoint)
QVERIFY(vzero.isMuchSmallerThan(v1.norm())); VERIFY_IS_MUCH_SMALLER_THAN( vzero, v1.norm());
QVERIFY(!v1.isMuchSmallerThan(v1)); VERIFY_IS_NOT_MUCH_SMALLER_THAN(v1, v1);
QVERIFY(vzero.isApprox(v1-v1)); VERIFY_IS_APPROX( vzero, v1-v1);
QVERIFY(m1.isApprox(m1)); VERIFY_IS_APPROX( m1, m1);
QVERIFY(!m1.isApprox(2*m1)); VERIFY_IS_NOT_APPROX( m1, 2*m1);
QVERIFY(mzero.isMuchSmallerThan(m1)); VERIFY_IS_MUCH_SMALLER_THAN( mzero, m1);
QVERIFY(!m1.isMuchSmallerThan(m1)); VERIFY_IS_NOT_MUCH_SMALLER_THAN(m1, m1);
QVERIFY(mzero.isApprox(m1-m1)); VERIFY_IS_APPROX( mzero, m1-m1);
// test the linear structure, i.e. the following files: // test the linear structure, i.e. the following files:
// Sum.h Difference.h Opposite.h ScalarMultiple.h // Sum.h Difference.h Opposite.h ScalarMultiple.h
QVERIFY((m1+m1).isApprox(2 * m1)); VERIFY_IS_APPROX(-(-m1), m1);
QVERIFY((m1+m2-m1).isApprox(m2)); VERIFY_IS_APPROX(m1+m1, 2*m1);
QVERIFY((-m2+m1+m2).isApprox(m1)); VERIFY_IS_APPROX(m1+m2-m1, m2);
QVERIFY((m1 * s1).isApprox(s1 * m1)); VERIFY_IS_APPROX(-m2+m1+m2, m1);
QVERIFY(((m1 + m2) * s1).isApprox(s1 * m1 + s1 * m2)); VERIFY_IS_APPROX(m1*s1, s1*m1);
QVERIFY(((s1 + s2) * m1).isApprox(m1 * s1 + m1 * s2)); VERIFY_IS_APPROX((m1+m2)*s1, s1*m1+s1*m2);
QVERIFY(((m1 - m2) * s1).isApprox(s1 * m1 - s1 * m2)); VERIFY_IS_APPROX((s1+s2)*m1, m1*s1+m1*s2);
QVERIFY(((s1 - s2) * m1).isApprox(m1 * s1 - m1 * s2)); VERIFY_IS_APPROX((m1-m2)*s1, s1*m1-s1*m2);
QVERIFY(((-m1 + m2) * s1).isApprox(-s1 * m1 + s1 * m2)); VERIFY_IS_APPROX((s1-s2)*m1, m1*s1-m1*s2);
QVERIFY(((-s1 + s2) * m1).isApprox(-m1 * s1 + m1 * s2)); VERIFY_IS_APPROX((-m1+m2)*s1, -s1*m1+s1*m2);
m3 = m2; VERIFY_IS_APPROX((-s1+s2)*m1, -m1*s1+m1*s2);
QVERIFY((m3 += m1).isApprox(m1 + m2)); m3 = m2; m3 += m1;
m3 = m2; VERIFY_IS_APPROX(m3, m1+m2);
QVERIFY((m3 -= m1).isApprox(-m1 + m2)); m3 = m2; m3 -= m1;
m3 = m2; VERIFY_IS_APPROX(m3, m2-m1);
QVERIFY((m3 *= s1).isApprox(s1 * m2)); m3 = m2; m3 *= s1;
m3 = m2; VERIFY_IS_APPROX(m3, s1*m2);
if(NumTraits<Scalar>::HasFloatingPoint if(NumTraits<Scalar>::HasFloatingPoint)
&& s1 != static_cast<Scalar>(0)) {
QVERIFY((m3 /= s1).isApprox(m2 / s1)); m3 = m2; m3 /= s1;
VERIFY_IS_APPROX(m3, m2/s1);
}
// begin testing Product.h: only associativity for now // begin testing Product.h: only associativity for now
// (we use Transpose.h but this doesn't count as a test for it) // (we use Transpose.h but this doesn't count as a test for it)
QVERIFY(((m1 * m1.transpose()) * m2).isApprox(m1 * (m1.transpose() * m2))); VERIFY_IS_APPROX((m1*m1.transpose())*m2, m1*(m1.transpose()*m2));
m3 = m1; m3 = m1;
m3 *= (m1.transpose() * m2); m3 *= (m1.transpose() * m2);
QVERIFY(m3.isApprox(m1 * (m1.transpose() * m2))); VERIFY_IS_APPROX(m3, m1*(m1.transpose()*m2));
QVERIFY(m3.isApprox(m1.lazyProduct(m1.transpose() * m2))); VERIFY_IS_APPROX(m3, m1.lazyProduct(m1.transpose()*m2));
// continue testing Product.h: distributivity // continue testing Product.h: distributivity
QVERIFY((square * (m1 + m2)).isApprox(square * m1 + square * m2)); VERIFY_IS_APPROX(square*(m1 + m2), square*m1+square*m2);
QVERIFY((square * (m1 - m2)).isApprox(square * m1 - square * m2)); VERIFY_IS_APPROX(square*(m1 - m2), square*m1-square*m2);
// continue testing Product.h: compatibility with ScalarMultiple.h // continue testing Product.h: compatibility with ScalarMultiple.h
QVERIFY((s1 * (square * m1)).isApprox((s1 * square) * m1)); VERIFY_IS_APPROX(s1*(square*m1), (s1*square)*m1);
QVERIFY((s1 * (square * m1)).isApprox(square * (m1 * s1))); VERIFY_IS_APPROX(s1*(square*m1), square*(m1*s1));
// continue testing Product.h: lazyProduct // continue testing Product.h: lazyProduct
QVERIFY(square.lazyProduct(m1).isApprox(square * m1)); VERIFY_IS_APPROX(square.lazyProduct(m1), square*m1);
// test Product.h together with Identity.h. This does test Identity.h. // test Product.h together with Identity.h. This does test Identity.h.
QVERIFY(m1.isApprox(identity * m1)); VERIFY_IS_APPROX(m1, identity*m1);
QVERIFY(v1.isApprox(identity * v1)); VERIFY_IS_APPROX(v1, identity*v1);
// test FromArray.h // test FromArray.h
Scalar* array1 = new Scalar[rows]; Scalar* array1 = new Scalar[rows];
@ -127,9 +129,9 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows) = Matrix<Scalar, Dynamic, 1>::random(rows); Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows) = Matrix<Scalar, Dynamic, 1>::random(rows);
Matrix<Scalar, Dynamic, 1>::fromArray(array2, rows) Matrix<Scalar, Dynamic, 1>::fromArray(array2, rows)
= Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows); = Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows);
bool b = Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows) Matrix<Scalar, Dynamic, 1> ma1 = Matrix<Scalar, Dynamic, 1>::fromArray(array1, rows);
.isApprox(Matrix<Scalar, Dynamic, 1>::fromArray(array2, rows)); Matrix<Scalar, Dynamic, 1> ma2 = Matrix<Scalar, Dynamic, 1>::fromArray(array2, rows);
QVERIFY(b); VERIFY_IS_APPROX(ma1, ma2);
delete[] array1; delete[] array1;
delete[] array2; delete[] array2;
} }

13
test/main.cpp
View File

@ -31,7 +31,7 @@ int main(int argc, char *argv[])
bool has_set_repeat = false; bool has_set_repeat = false;
bool has_set_seed = false; bool has_set_seed = false;
bool want_help = false; bool need_help = false;
unsigned int seed; unsigned int seed;
int repeat; int repeat;
@ -70,23 +70,18 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
} }
else if(arg == "h" || arg == "-h" || arg.contains("help", Qt::CaseInsensitive))
{
want_help = true;
}
else else
{ {
qDebug() << "Invalid command-line argument" << arg; need_help = true;
return 1;
} }
} }
if(want_help) if(need_help)
{ {
qDebug() << "This test application takes the following optional arguments:"; qDebug() << "This test application takes the following optional arguments:";
qDebug() << " rN Repeat each test N times (default:" << DEFAULT_REPEAT << ")"; qDebug() << " rN Repeat each test N times (default:" << DEFAULT_REPEAT << ")";
qDebug() << " sN Use N as seed for random numbers (default: based on current time)"; qDebug() << " sN Use N as seed for random numbers (default: based on current time)";
return 0; return 1;
} }
if(!has_set_seed) seed = (unsigned int) time(NULL); if(!has_set_seed) seed = (unsigned int) time(NULL);

68
test/main.h
View File

@ -37,6 +37,74 @@
namespace Eigen { namespace Eigen {
template<typename T> inline typename NumTraits<T>::Real test_precision();
template<> inline int test_precision<int>() { return 0; }
template<> inline float test_precision<float>() { return 1e-2; }
template<> inline double test_precision<double>() { return 1e-5; }
template<> inline float test_precision<std::complex<float> >() { return test_precision<float>(); }
template<> inline double test_precision<std::complex<double> >() { return test_precision<double>(); }
inline bool test_isApprox(const int& a, const int& b)
{ return isApprox(a, b, test_precision<int>()); }
inline bool test_isMuchSmallerThan(const int& a, const int& b)
{ return isMuchSmallerThan(a, b, test_precision<int>()); }
inline bool test_isApproxOrLessThan(const int& a, const int& b)
{ return isApproxOrLessThan(a, b, test_precision<int>()); }
inline bool test_isApprox(const float& a, const float& b)
{ return isApprox(a, b, test_precision<float>()); }
inline bool test_isMuchSmallerThan(const float& a, const float& b)
{ return isMuchSmallerThan(a, b, test_precision<float>()); }
inline bool test_isApproxOrLessThan(const float& a, const float& b)
{ return isApproxOrLessThan(a, b, test_precision<float>()); }
inline bool test_isApprox(const double& a, const double& b)
{ return isApprox(a, b, test_precision<double>()); }
inline bool test_isMuchSmallerThan(const double& a, const double& b)
{ return isMuchSmallerThan(a, b, test_precision<double>()); }
inline bool test_isApproxOrLessThan(const double& a, const double& b)
{ return isApproxOrLessThan(a, b, test_precision<double>()); }
inline bool test_isApprox(const std::complex<float>& a, const std::complex<float>& b)
{ return isApprox(a, b, test_precision<std::complex<float> >()); }
inline bool test_isMuchSmallerThan(const std::complex<float>& a, const std::complex<float>& b)
{ return isMuchSmallerThan(a, b, test_precision<std::complex<float> >()); }
inline bool test_isApprox(const std::complex<double>& a, const std::complex<double>& b)
{ return isApprox(a, b, test_precision<std::complex<double> >()); }
inline bool test_isMuchSmallerThan(const std::complex<double>& a, const std::complex<double>& b)
{ return isMuchSmallerThan(a, b, test_precision<std::complex<double> >()); }
template<typename Scalar, typename Derived1, typename Derived2>
inline bool test_isApprox(const MatrixBase<Scalar, Derived1>& m1,
const MatrixBase<Scalar, Derived2>& m2)
{
return m1.isApprox(m2, test_precision<Scalar>());
}
template<typename Scalar, typename Derived1, typename Derived2>
inline bool test_isMuchSmallerThan(const MatrixBase<Scalar, Derived1>& m1,
const MatrixBase<Scalar, Derived2>& m2)
{
return m1.isMuchSmallerThan(m2, test_precision<Scalar>());
}
template<typename Scalar, typename Derived>
inline bool test_isMuchSmallerThan(const MatrixBase<Scalar, Derived>& m,
const typename NumTraits<Scalar>::Real& s)
{
return m.isMuchSmallerThan(s, test_precision<Scalar>());
}
#define VERIFY(a) QVERIFY(a)
#define VERIFY_IS_APPROX(a, b) QVERIFY(test_isApprox(a, b))
#define VERIFY_IS_NOT_APPROX(a, b) QVERIFY(!test_isApprox(a, b))
#define VERIFY_IS_MUCH_SMALLER_THAN(a, b) QVERIFY(test_isMuchSmallerThan(a, b))
#define VERIFY_IS_NOT_MUCH_SMALLER_THAN(a, b) QVERIFY(!test_isMuchSmallerThan(a, b))
#define VERIFY_IS_APPROX_OR_LESS_THAN(a, b) QVERIFY(test_isApproxOrLessThan(a, b))
#define VERIFY_IS_NOT_APPROX_OR_LESS_THAN(a, b) QVERIFY(!test_isApproxOrLessThan(a, b))
class EigenTest : public QObject class EigenTest : public QObject
{ {
Q_OBJECT Q_OBJECT