diff options
author | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-12 22:42:33 -0700 |
---|---|---|
committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-10-12 22:42:33 -0700 |
commit | 7e4a6754b24eb185921593885f44f3c09fdc4808 (patch) | |
tree | 08a01f8f034b6ca35102400002505707618521b5 /Eigen/src/SPQRSupport | |
parent | 5c68051cd7941a83de4c9dcc18a437e4a800ed12 (diff) | |
parent | e74612b9a02f5fd7aa202b2b7f58bbf2af2a2f7f (diff) |
Merged eigen/eigen into default
Diffstat (limited to 'Eigen/src/SPQRSupport')
-rw-r--r-- | Eigen/src/SPQRSupport/SuiteSparseQRSupport.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h b/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h index d9c3113e7..953d57c9d 100644 --- a/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h +++ b/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h @@ -119,16 +119,16 @@ class SPQR : public SparseSolverBase<SPQR<_MatrixType> > max2Norm = RealScalar(1); pivotThreshold = 20 * (mat.rows() + mat.cols()) * max2Norm * NumTraits<RealScalar>::epsilon(); } - cholmod_sparse A; A = viewAsCholmod(mat); + m_rows = matrix.rows(); Index col = matrix.cols(); m_rank = SuiteSparseQR<Scalar>(m_ordering, pivotThreshold, col, &A, &m_cR, &m_E, &m_H, &m_HPinv, &m_HTau, &m_cc); if (!m_cR) { - m_info = NumericalIssue; + m_info = NumericalIssue; m_isInitialized = false; return; } @@ -139,7 +139,7 @@ class SPQR : public SparseSolverBase<SPQR<_MatrixType> > /** * Get the number of rows of the input matrix and the Q matrix */ - inline Index rows() const {return m_cR->nrow; } + inline Index rows() const {return m_rows; } /** * Get the number of columns of the input matrix. @@ -245,6 +245,7 @@ class SPQR : public SparseSolverBase<SPQR<_MatrixType> > mutable Index m_rank; // The rank of the matrix mutable cholmod_common m_cc; // Workspace and parameters bool m_useDefaultThreshold; // Use default threshold + Index m_rows; template<typename ,typename > friend struct SPQR_QProduct; }; |