diff options
author | 2014-03-12 16:24:25 +0100 | |
---|---|---|
committer | 2014-03-12 16:24:25 +0100 | |
commit | 74b1d79d779fbd9fb5bc5df60ad318c012451da7 (patch) | |
tree | 71023286c86b9542dec0189cab0a7a2ca6935a91 /Eigen/src/QR/FullPivHouseholderQR.h | |
parent | 0b362e0c9ab1670e73fc8ae951d765f686342882 (diff) | |
parent | 2379ccffcb8f1af10f8ed91353d5cb8b3a9a7847 (diff) |
merge default and evaluator branches
Diffstat (limited to 'Eigen/src/QR/FullPivHouseholderQR.h')
-rw-r--r-- | Eigen/src/QR/FullPivHouseholderQR.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/QR/FullPivHouseholderQR.h b/Eigen/src/QR/FullPivHouseholderQR.h index 8cdf14e4b..ea15da041 100644 --- a/Eigen/src/QR/FullPivHouseholderQR.h +++ b/Eigen/src/QR/FullPivHouseholderQR.h @@ -372,7 +372,7 @@ template<typename _MatrixType> class FullPivHouseholderQR return m_usePrescribedThreshold ? m_prescribedThreshold // this formula comes from experimenting (see "LU precision tuning" thread on the list) // and turns out to be identical to Higham's formula used already in LDLt. - : NumTraits<Scalar>::epsilon() * m_qr.diagonalSize(); + : NumTraits<Scalar>::epsilon() * RealScalar(m_qr.diagonalSize()); } /** \returns the number of nonzero pivots in the QR decomposition. @@ -449,7 +449,7 @@ FullPivHouseholderQR<MatrixType>& FullPivHouseholderQR<MatrixType>::compute(cons m_temp.resize(cols); - m_precision = NumTraits<Scalar>::epsilon() * size; + m_precision = NumTraits<Scalar>::epsilon() * RealScalar(size); m_rows_transpositions.resize(size); m_cols_transpositions.resize(size); |