From 4b1aca2288ebf549791def6287b2886759dec2f4 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 26 Nov 2009 22:05:02 -0500 Subject: precision ---> dummy_precision --- Eigen/src/Core/MathFunctions.h | 58 +++++++++++++++++----------------- Eigen/src/Core/MatrixBase.h | 30 +++++++++--------- Eigen/src/Geometry/AlignedBox.h | 2 +- Eigen/src/Geometry/AngleAxis.h | 4 +-- Eigen/src/Geometry/EulerAngles.h | 2 +- Eigen/src/Geometry/Hyperplane.h | 2 +- Eigen/src/Geometry/ParametrizedLine.h | 2 +- Eigen/src/Geometry/Quaternion.h | 6 ++-- Eigen/src/Geometry/Rotation2D.h | 2 +- Eigen/src/Geometry/Scaling.h | 2 +- Eigen/src/Geometry/Transform.h | 2 +- Eigen/src/Geometry/Translation.h | 2 +- Eigen/src/SVD/SVD.h | 2 +- Eigen/src/Sparse/AmbiVector.h | 2 +- Eigen/src/Sparse/CompressedStorage.h | 2 +- Eigen/src/Sparse/DynamicSparseMatrix.h | 2 +- Eigen/src/Sparse/SparseLDLT.h | 4 +-- Eigen/src/Sparse/SparseLLT.h | 4 +-- Eigen/src/Sparse/SparseLU.h | 4 +-- Eigen/src/Sparse/SparseMatrix.h | 2 +- Eigen/src/Sparse/SparseMatrixBase.h | 26 +++++++-------- Eigen/src/Sparse/SparseVector.h | 2 +- 22 files changed, 82 insertions(+), 82 deletions(-) (limited to 'Eigen') diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index 05469b340..7ffddcbf8 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -30,7 +30,7 @@ template inline typename NumTraits::Real epsilon() return std::numeric_limits::Real>::epsilon(); } -template inline typename NumTraits::Real precision(); +template inline typename NumTraits::Real dummy_precision(); template inline T ei_random(T a, T b); template inline T ei_random(); @@ -55,7 +55,7 @@ template inline typename NumTraits::Real ei_hypot(T x, T y) *** int *** **************/ -template<> inline int precision() { return 0; } +template<> inline int dummy_precision() { return 0; } inline int ei_real(int x) { return x; } inline int& ei_real_ref(int& x) { return x; } inline int ei_imag(int) { return 0; } @@ -92,15 +92,15 @@ template<> inline int ei_random() { return ei_random(-ei_random_amplitude(), ei_random_amplitude()); } -inline bool ei_isMuchSmallerThan(int a, int, int = precision()) +inline bool ei_isMuchSmallerThan(int a, int, int = dummy_precision()) { return a == 0; } -inline bool ei_isApprox(int a, int b, int = precision()) +inline bool ei_isApprox(int a, int b, int = dummy_precision()) { return a == b; } -inline bool ei_isApproxOrLessThan(int a, int b, int = precision()) +inline bool ei_isApproxOrLessThan(int a, int b, int = dummy_precision()) { return a <= b; } @@ -109,7 +109,7 @@ inline bool ei_isApproxOrLessThan(int a, int b, int = precision()) *** float *** **************/ -template<> inline float precision() { return 1e-5f; } +template<> inline float dummy_precision() { return 1e-5f; } inline float ei_real(float x) { return x; } inline float& ei_real_ref(float& x) { return x; } inline float ei_imag(float) { return 0.f; } @@ -140,15 +140,15 @@ template<> inline float ei_random() { return ei_random(-ei_random_amplitude(), ei_random_amplitude()); } -inline bool ei_isMuchSmallerThan(float a, float b, float prec = precision()) +inline bool ei_isMuchSmallerThan(float a, float b, float prec = dummy_precision()) { return ei_abs(a) <= ei_abs(b) * prec; } -inline bool ei_isApprox(float a, float b, float prec = precision()) +inline bool ei_isApprox(float a, float b, float prec = dummy_precision()) { return ei_abs(a - b) <= std::min(ei_abs(a), ei_abs(b)) * prec; } -inline bool ei_isApproxOrLessThan(float a, float b, float prec = precision()) +inline bool ei_isApproxOrLessThan(float a, float b, float prec = dummy_precision()) { return a <= b || ei_isApprox(a, b, prec); } @@ -157,7 +157,7 @@ inline bool ei_isApproxOrLessThan(float a, float b, float prec = precision inline double precision() { return 1e-12; } +template<> inline double dummy_precision() { return 1e-12; } inline double ei_real(double x) { return x; } inline double& ei_real_ref(double& x) { return x; } @@ -189,15 +189,15 @@ template<> inline double ei_random() { return ei_random(-ei_random_amplitude(), ei_random_amplitude()); } -inline bool ei_isMuchSmallerThan(double a, double b, double prec = precision()) +inline bool ei_isMuchSmallerThan(double a, double b, double prec = dummy_precision()) { return ei_abs(a) <= ei_abs(b) * prec; } -inline bool ei_isApprox(double a, double b, double prec = precision()) +inline bool ei_isApprox(double a, double b, double prec = dummy_precision()) { return ei_abs(a - b) <= std::min(ei_abs(a), ei_abs(b)) * prec; } -inline bool ei_isApproxOrLessThan(double a, double b, double prec = precision()) +inline bool ei_isApproxOrLessThan(double a, double b, double prec = dummy_precision()) { return a <= b || ei_isApprox(a, b, prec); } @@ -206,7 +206,7 @@ inline bool ei_isApproxOrLessThan(double a, double b, double prec = precision *** *********************/ -template<> inline float precision >() { return precision(); } +template<> inline float dummy_precision >() { return dummy_precision(); } inline float ei_real(const std::complex& x) { return std::real(x); } inline float ei_imag(const std::complex& x) { return std::imag(x); } inline float& ei_real_ref(std::complex& x) { return reinterpret_cast(&x)[0]; } @@ -224,15 +224,15 @@ template<> inline std::complex ei_random() { return std::complex(ei_random(), ei_random()); } -inline bool ei_isMuchSmallerThan(const std::complex& a, const std::complex& b, float prec = precision()) +inline bool ei_isMuchSmallerThan(const std::complex& a, const std::complex& b, float prec = dummy_precision()) { return ei_abs2(a) <= ei_abs2(b) * prec * prec; } -inline bool ei_isMuchSmallerThan(const std::complex& a, float b, float prec = precision()) +inline bool ei_isMuchSmallerThan(const std::complex& a, float b, float prec = dummy_precision()) { return ei_abs2(a) <= ei_abs2(b) * prec * prec; } -inline bool ei_isApprox(const std::complex& a, const std::complex& b, float prec = precision()) +inline bool ei_isApprox(const std::complex& a, const std::complex& b, float prec = dummy_precision()) { return ei_isApprox(ei_real(a), ei_real(b), prec) && ei_isApprox(ei_imag(a), ei_imag(b), prec); @@ -243,7 +243,7 @@ inline bool ei_isApprox(const std::complex& a, const std::complex& *** complex *** **********************/ -template<> inline double precision >() { return precision(); } +template<> inline double dummy_precision >() { return dummy_precision(); } inline double ei_real(const std::complex& x) { return std::real(x); } inline double ei_imag(const std::complex& x) { return std::imag(x); } inline double& ei_real_ref(std::complex& x) { return reinterpret_cast(&x)[0]; } @@ -261,15 +261,15 @@ template<> inline std::complex ei_random() { return std::complex(ei_random(), ei_random()); } -inline bool ei_isMuchSmallerThan(const std::complex& a, const std::complex& b, double prec = precision()) +inline bool ei_isMuchSmallerThan(const std::complex& a, const std::complex& b, double prec = dummy_precision()) { return ei_abs2(a) <= ei_abs2(b) * prec * prec; } -inline bool ei_isMuchSmallerThan(const std::complex& a, double b, double prec = precision()) +inline bool ei_isMuchSmallerThan(const std::complex& a, double b, double prec = dummy_precision()) { return ei_abs2(a) <= ei_abs2(b) * prec * prec; } -inline bool ei_isApprox(const std::complex& a, const std::complex& b, double prec = precision()) +inline bool ei_isApprox(const std::complex& a, const std::complex& b, double prec = dummy_precision()) { return ei_isApprox(ei_real(a), ei_real(b), prec) && ei_isApprox(ei_imag(a), ei_imag(b), prec); @@ -281,7 +281,7 @@ inline bool ei_isApprox(const std::complex& a, const std::complex inline long double precision() { return precision(); } +template<> inline long double dummy_precision() { return dummy_precision(); } inline long double ei_real(long double x) { return x; } inline long double& ei_real_ref(long double& x) { return x; } inline long double ei_imag(long double) { return 0.; } @@ -304,15 +304,15 @@ template<> inline long double ei_random() { return ei_random(-ei_random_amplitude(), ei_random_amplitude()); } -inline bool ei_isMuchSmallerThan(long double a, long double b, long double prec = precision()) +inline bool ei_isMuchSmallerThan(long double a, long double b, long double prec = dummy_precision()) { return ei_abs(a) <= ei_abs(b) * prec; } -inline bool ei_isApprox(long double a, long double b, long double prec = precision()) +inline bool ei_isApprox(long double a, long double b, long double prec = dummy_precision()) { return ei_abs(a - b) <= std::min(ei_abs(a), ei_abs(b)) * prec; } -inline bool ei_isApproxOrLessThan(long double a, long double b, long double prec = precision()) +inline bool ei_isApproxOrLessThan(long double a, long double b, long double prec = dummy_precision()) { return a <= b || ei_isApprox(a, b, prec); } @@ -321,7 +321,7 @@ inline bool ei_isApproxOrLessThan(long double a, long double b, long double prec *** bool *** **************/ -template<> inline bool precision() { return 0; } +template<> inline bool dummy_precision() { return 0; } inline bool ei_real(bool x) { return x; } inline bool& ei_real_ref(bool& x) { return x; } inline bool ei_imag(bool) { return 0; } @@ -334,15 +334,15 @@ template<> inline bool ei_random() { return (ei_random(0,1) == 1); } -inline bool ei_isMuchSmallerThan(bool a, bool, bool = precision()) +inline bool ei_isMuchSmallerThan(bool a, bool, bool = dummy_precision()) { return !a; } -inline bool ei_isApprox(bool a, bool b, bool = precision()) +inline bool ei_isApprox(bool a, bool b, bool = dummy_precision()) { return a == b; } -inline bool ei_isApproxOrLessThan(bool a, bool b, bool = precision()) +inline bool ei_isApproxOrLessThan(bool a, bool b, bool = dummy_precision()) { return int(a) <= int(b); } diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 8078b75b0..9f62ceb8f 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -558,27 +558,27 @@ template class MatrixBase template bool isApprox(const MatrixBase& other, - RealScalar prec = precision()) const; + RealScalar prec = dummy_precision()) const; bool isMuchSmallerThan(const RealScalar& other, - RealScalar prec = precision()) const; + RealScalar prec = dummy_precision()) const; template bool isMuchSmallerThan(const MatrixBase& other, - RealScalar prec = precision()) const; + RealScalar prec = dummy_precision()) const; - bool isApproxToConstant(const Scalar& value, RealScalar prec = precision()) const; - bool isConstant(const Scalar& value, RealScalar prec = precision()) const; - bool isZero(RealScalar prec = precision()) const; - bool isOnes(RealScalar prec = precision()) const; - bool isIdentity(RealScalar prec = precision()) const; - bool isDiagonal(RealScalar prec = precision()) const; + bool isApproxToConstant(const Scalar& value, RealScalar prec = dummy_precision()) const; + bool isConstant(const Scalar& value, RealScalar prec = dummy_precision()) const; + bool isZero(RealScalar prec = dummy_precision()) const; + bool isOnes(RealScalar prec = dummy_precision()) const; + bool isIdentity(RealScalar prec = dummy_precision()) const; + bool isDiagonal(RealScalar prec = dummy_precision()) const; - bool isUpperTriangular(RealScalar prec = precision()) const; - bool isLowerTriangular(RealScalar prec = precision()) const; + bool isUpperTriangular(RealScalar prec = dummy_precision()) const; + bool isLowerTriangular(RealScalar prec = dummy_precision()) const; template bool isOrthogonal(const MatrixBase& other, - RealScalar prec = precision()) const; - bool isUnitary(RealScalar prec = precision()) const; + RealScalar prec = dummy_precision()) const; + bool isUnitary(RealScalar prec = dummy_precision()) const; template inline bool operator==(const MatrixBase& other) const @@ -722,13 +722,13 @@ template class MatrixBase ResultType& inverse, typename ResultType::Scalar& determinant, bool& invertible, - const RealScalar& absDeterminantThreshold = precision() + const RealScalar& absDeterminantThreshold = dummy_precision() ) const; template void computeInverseWithCheck( ResultType& inverse, bool& invertible, - const RealScalar& absDeterminantThreshold = precision() + const RealScalar& absDeterminantThreshold = dummy_precision() ) const; Scalar determinant() const; diff --git a/Eigen/src/Geometry/AlignedBox.h b/Eigen/src/Geometry/AlignedBox.h index 94edc5561..0a716cf31 100644 --- a/Eigen/src/Geometry/AlignedBox.h +++ b/Eigen/src/Geometry/AlignedBox.h @@ -171,7 +171,7 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTORIZABLE_FIXED_SIZE(_Scalar,_AmbientDim) * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const AlignedBox& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const AlignedBox& other, typename NumTraits::Real prec = dummy_precision()) const { return m_min.isApprox(other.m_min, prec) && m_max.isApprox(other.m_max, prec); } protected: diff --git a/Eigen/src/Geometry/AngleAxis.h b/Eigen/src/Geometry/AngleAxis.h index ef86eb20d..2486df0e6 100644 --- a/Eigen/src/Geometry/AngleAxis.h +++ b/Eigen/src/Geometry/AngleAxis.h @@ -146,7 +146,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const AngleAxis& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const AngleAxis& other, typename NumTraits::Real prec = dummy_precision()) const { return m_axis.isApprox(other.m_axis, prec) && ei_isApprox(m_angle,other.m_angle, prec); } }; @@ -165,7 +165,7 @@ template AngleAxis& AngleAxis::operator=(const QuaternionBase& q) { Scalar n2 = q.vec().squaredNorm(); - if (n2 < precision()*precision()) + if (n2 < dummy_precision()*dummy_precision()) { m_angle = 0; m_axis << 1, 0, 0; diff --git a/Eigen/src/Geometry/EulerAngles.h b/Eigen/src/Geometry/EulerAngles.h index dbcc7ae89..b6dbf8ae9 100644 --- a/Eigen/src/Geometry/EulerAngles.h +++ b/Eigen/src/Geometry/EulerAngles.h @@ -50,7 +50,7 @@ MatrixBase::eulerAngles(int a0, int a1, int a2) const Matrix res; typedef Matrix Vector2; - const Scalar epsilon = precision(); + const Scalar epsilon = dummy_precision(); const int odd = ((a0+1)%3 == a1) ? 0 : 1; const int i = a0; diff --git a/Eigen/src/Geometry/Hyperplane.h b/Eigen/src/Geometry/Hyperplane.h index ab65ca2ae..49a9ac7bb 100644 --- a/Eigen/src/Geometry/Hyperplane.h +++ b/Eigen/src/Geometry/Hyperplane.h @@ -257,7 +257,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const Hyperplane& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const Hyperplane& other, typename NumTraits::Real prec = dummy_precision()) const { return m_coeffs.isApprox(other.m_coeffs, prec); } protected: diff --git a/Eigen/src/Geometry/ParametrizedLine.h b/Eigen/src/Geometry/ParametrizedLine.h index 6a4fcb1c5..21a5595b9 100644 --- a/Eigen/src/Geometry/ParametrizedLine.h +++ b/Eigen/src/Geometry/ParametrizedLine.h @@ -123,7 +123,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const ParametrizedLine& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const ParametrizedLine& other, typename NumTraits::Real prec = dummy_precision()) const { return m_origin.isApprox(other.m_origin, prec) && m_direction.isApprox(other.m_direction, prec); } protected: diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index 660e10d1e..a6bdb2408 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -163,7 +163,7 @@ public: * * \sa MatrixBase::isApprox() */ template - bool isApprox(const QuaternionBase& other, RealScalar prec = precision()) const + bool isApprox(const QuaternionBase& other, RealScalar prec = dummy_precision()) const { return coeffs().isApprox(other.coeffs(), prec); } /** return the result vector of \a v through the rotation*/ @@ -514,7 +514,7 @@ inline Derived& QuaternionBase::setFromTwoVectors(const MatrixBase()) + if (c < Scalar(-1)+dummy_precision()) { c = std::max(c,-1); Matrix m; m << v0.transpose(), v1.transpose(); @@ -590,7 +590,7 @@ template Quaternion::Scalar> QuaternionBase::slerp(Scalar t, const QuaternionBase& other) const { - static const Scalar one = Scalar(1) - precision(); + static const Scalar one = Scalar(1) - dummy_precision(); Scalar d = this->dot(other); Scalar absD = ei_abs(d); if (absD>=one) diff --git a/Eigen/src/Geometry/Rotation2D.h b/Eigen/src/Geometry/Rotation2D.h index b80fcace0..7f24a3eae 100644 --- a/Eigen/src/Geometry/Rotation2D.h +++ b/Eigen/src/Geometry/Rotation2D.h @@ -121,7 +121,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const Rotation2D& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const Rotation2D& other, typename NumTraits::Real prec = dummy_precision()) const { return ei_isApprox(m_angle,other.m_angle, prec); } }; diff --git a/Eigen/src/Geometry/Scaling.h b/Eigen/src/Geometry/Scaling.h index ce191b5da..4695914fd 100644 --- a/Eigen/src/Geometry/Scaling.h +++ b/Eigen/src/Geometry/Scaling.h @@ -107,7 +107,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const UniformScaling& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const UniformScaling& other, typename NumTraits::Real prec = dummy_precision()) const { return ei_isApprox(m_factor, other.factor(), prec); } }; diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index 4ee036140..d478675bd 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -424,7 +424,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const Transform& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const Transform& other, typename NumTraits::Real prec = dummy_precision()) const { return m_matrix.isApprox(other.m_matrix, prec); } /** Sets the last row to [0 ... 0 1] diff --git a/Eigen/src/Geometry/Translation.h b/Eigen/src/Geometry/Translation.h index 1fff03810..b7477df9f 100644 --- a/Eigen/src/Geometry/Translation.h +++ b/Eigen/src/Geometry/Translation.h @@ -154,7 +154,7 @@ public: * determined by \a prec. * * \sa MatrixBase::isApprox() */ - bool isApprox(const Translation& other, typename NumTraits::Real prec = precision()) const + bool isApprox(const Translation& other, typename NumTraits::Real prec = dummy_precision()) const { return m_coeffs.isApprox(other.m_coeffs, prec); } }; diff --git a/Eigen/src/SVD/SVD.h b/Eigen/src/SVD/SVD.h index 254885873..3c7aaf322 100644 --- a/Eigen/src/SVD/SVD.h +++ b/Eigen/src/SVD/SVD.h @@ -193,7 +193,7 @@ SVD& SVD::compute(const MatrixType& matrix) int i,its,j,k,l,nm; Scalar anorm, c, f, g, h, s, scale, x, y, z; bool convergence = true; - Scalar eps = precision(); + Scalar eps = dummy_precision(); Matrix rv1(n); g = scale = anorm = 0; diff --git a/Eigen/src/Sparse/AmbiVector.h b/Eigen/src/Sparse/AmbiVector.h index 474626848..5e75bd6e7 100644 --- a/Eigen/src/Sparse/AmbiVector.h +++ b/Eigen/src/Sparse/AmbiVector.h @@ -300,7 +300,7 @@ class AmbiVector<_Scalar>::Iterator * In practice, all coefficients having a magnitude smaller than \a epsilon * are skipped. */ - Iterator(const AmbiVector& vec, RealScalar epsilon = RealScalar(0.1)*precision()) + Iterator(const AmbiVector& vec, RealScalar epsilon = RealScalar(0.1)*dummy_precision()) : m_vector(vec) { m_epsilon = epsilon; diff --git a/Eigen/src/Sparse/CompressedStorage.h b/Eigen/src/Sparse/CompressedStorage.h index abf42914f..fcf5c7bfe 100644 --- a/Eigen/src/Sparse/CompressedStorage.h +++ b/Eigen/src/Sparse/CompressedStorage.h @@ -185,7 +185,7 @@ class CompressedStorage return m_values[id]; } - void prune(Scalar reference, RealScalar epsilon = precision()) + void prune(Scalar reference, RealScalar epsilon = dummy_precision()) { size_t k = 0; size_t n = size(); diff --git a/Eigen/src/Sparse/DynamicSparseMatrix.h b/Eigen/src/Sparse/DynamicSparseMatrix.h index 6a5cd070e..15135f9db 100644 --- a/Eigen/src/Sparse/DynamicSparseMatrix.h +++ b/Eigen/src/Sparse/DynamicSparseMatrix.h @@ -208,7 +208,7 @@ class DynamicSparseMatrix inline void finalize() {} - void prune(Scalar reference, RealScalar epsilon = precision()) + void prune(Scalar reference, RealScalar epsilon = dummy_precision()) { for (int j=0; j(); + m_precision = RealScalar(0.1) * Eigen::dummy_precision(); } /** Creates a LDLT object and compute the respective factorization of \a matrix using @@ -103,7 +103,7 @@ class SparseLDLT : m_matrix(matrix.rows(), matrix.cols()), m_flags(flags), m_status(0) { ei_assert((MatrixType::Flags&RowMajorBit)==0); - m_precision = RealScalar(0.1) * Eigen::precision(); + m_precision = RealScalar(0.1) * Eigen::dummy_precision(); compute(matrix); } diff --git a/Eigen/src/Sparse/SparseLLT.h b/Eigen/src/Sparse/SparseLLT.h index b2f65b944..4b73dd205 100644 --- a/Eigen/src/Sparse/SparseLLT.h +++ b/Eigen/src/Sparse/SparseLLT.h @@ -54,7 +54,7 @@ class SparseLLT SparseLLT(int flags = 0) : m_flags(flags), m_status(0) { - m_precision = RealScalar(0.1) * Eigen::precision(); + m_precision = RealScalar(0.1) * Eigen::dummy_precision(); } /** Creates a LLT object and compute the respective factorization of \a matrix using @@ -62,7 +62,7 @@ class SparseLLT SparseLLT(const MatrixType& matrix, int flags = 0) : m_matrix(matrix.rows(), matrix.cols()), m_flags(flags), m_status(0) { - m_precision = RealScalar(0.1) * Eigen::precision(); + m_precision = RealScalar(0.1) * Eigen::dummy_precision(); compute(matrix); } diff --git a/Eigen/src/Sparse/SparseLU.h b/Eigen/src/Sparse/SparseLU.h index 3f8d0f8db..2ec6d0e74 100644 --- a/Eigen/src/Sparse/SparseLU.h +++ b/Eigen/src/Sparse/SparseLU.h @@ -59,7 +59,7 @@ class SparseLU SparseLU(int flags = 0) : m_flags(flags), m_status(0) { - m_precision = RealScalar(0.1) * Eigen::precision(); + m_precision = RealScalar(0.1) * Eigen::dummy_precision(); } /** Creates a LU object and compute the respective factorization of \a matrix using @@ -67,7 +67,7 @@ class SparseLU SparseLU(const MatrixType& matrix, int flags = 0) : /*m_matrix(matrix.rows(), matrix.cols()),*/ m_flags(flags), m_status(0) { - m_precision = RealScalar(0.1) * Eigen::precision(); + m_precision = RealScalar(0.1) * Eigen::dummy_precision(); compute(matrix); } diff --git a/Eigen/src/Sparse/SparseMatrix.h b/Eigen/src/Sparse/SparseMatrix.h index af3b5e5eb..7010602b7 100644 --- a/Eigen/src/Sparse/SparseMatrix.h +++ b/Eigen/src/Sparse/SparseMatrix.h @@ -341,7 +341,7 @@ class SparseMatrix } } - void prune(Scalar reference, RealScalar epsilon = precision()) + void prune(Scalar reference, RealScalar epsilon = dummy_precision()) { int k = 0; for (int j=0; j class SparseMatrixBase : public AnyMatrixBase bool isApprox(const SparseMatrixBase& other, - RealScalar prec = precision()) const + RealScalar prec = dummy_precision()) const { return toDense().isApprox(other.toDense(),prec); } template bool isApprox(const MatrixBase& other, - RealScalar prec = precision()) const + RealScalar prec = dummy_precision()) const { return toDense().isApprox(other,prec); } // bool isMuchSmallerThan(const RealScalar& other, -// RealScalar prec = precision()) const; +// RealScalar prec = dummy_precision()) const; // template // bool isMuchSmallerThan(const MatrixBase& other, -// RealScalar prec = precision()) const; +// RealScalar prec = dummy_precision()) const; -// bool isApproxToConstant(const Scalar& value, RealScalar prec = precision()) const; -// bool isZero(RealScalar prec = precision()) const; -// bool isOnes(RealScalar prec = precision()) const; -// bool isIdentity(RealScalar prec = precision()) const; -// bool isDiagonal(RealScalar prec = precision()) const; +// bool isApproxToConstant(const Scalar& value, RealScalar prec = dummy_precision()) const; +// bool isZero(RealScalar prec = dummy_precision()) const; +// bool isOnes(RealScalar prec = dummy_precision()) const; +// bool isIdentity(RealScalar prec = dummy_precision()) const; +// bool isDiagonal(RealScalar prec = dummy_precision()) const; -// bool isUpperTriangular(RealScalar prec = precision()) const; -// bool isLowerTriangular(RealScalar prec = precision()) const; +// bool isUpperTriangular(RealScalar prec = dummy_precision()) const; +// bool isLowerTriangular(RealScalar prec = dummy_precision()) const; // template // bool isOrthogonal(const MatrixBase& other, -// RealScalar prec = precision()) const; -// bool isUnitary(RealScalar prec = precision()) const; +// RealScalar prec = dummy_precision()) const; +// bool isUnitary(RealScalar prec = dummy_precision()) const; // template // inline bool operator==(const MatrixBase& other) const diff --git a/Eigen/src/Sparse/SparseVector.h b/Eigen/src/Sparse/SparseVector.h index 122b1888e..8c8728b87 100644 --- a/Eigen/src/Sparse/SparseVector.h +++ b/Eigen/src/Sparse/SparseVector.h @@ -201,7 +201,7 @@ class SparseVector EIGEN_DEPRECATED void endFill() {} inline void finalize() {} - void prune(Scalar reference, RealScalar epsilon = precision()) + void prune(Scalar reference, RealScalar epsilon = dummy_precision()) { m_data.prune(reference,epsilon); } -- cgit v1.2.3