diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-12-27 19:51:54 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-12-27 19:51:54 +0000 |
| commit | a2782964c1fdbf3d7abb950b731b1fc16a0f3024 (patch) | |
| tree | 02614422510bef80a5b3f5c940417e08ce66c496 /Eigen/src/Sparse | |
| parent | ce3984844dbbe3d4cb9046e9ce7f30a00c29412f (diff) | |
Sparse module, add an assertion and make the use of CHOLMOD's solve method the default.
Diffstat (limited to 'Eigen/src/Sparse')
| -rw-r--r-- | Eigen/src/Sparse/CholmodSupport.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Eigen/src/Sparse/CholmodSupport.h b/Eigen/src/Sparse/CholmodSupport.h index f77edba42..1be55a2d5 100644 --- a/Eigen/src/Sparse/CholmodSupport.h +++ b/Eigen/src/Sparse/CholmodSupport.h @@ -91,6 +91,7 @@ cholmod_sparse SparseMatrix<Scalar,Flags>::asCholmodMatrix() template<typename Derived> cholmod_dense ei_cholmod_map_eigen_to_dense(MatrixBase<Derived>& mat) { + EIGEN_STATIC_ASSERT((ei_traits<Derived>::Flags&RowMajorBit)==0,THIS_METHOD_IS_ONLY_FOR_COLUMN_MAJOR_MATRICES); typedef typename Derived::Scalar Scalar; cholmod_dense res; @@ -225,15 +226,15 @@ void SparseLLT<MatrixType,Cholmod>::solveInPlace(MatrixBase<Derived> &b) const ei_assert(size==b.rows()); // this uses Eigen's triangular sparse solver - if (m_status & MatrixLIsDirty) - matrixL(); - Base::solveInPlace(b); +// if (m_status & MatrixLIsDirty) +// matrixL(); +// Base::solveInPlace(b); // as long as our own triangular sparse solver is not fully optimal, // let's use CHOLMOD's one: -// cholmod_dense cdb = ei_cholmod_map_eigen_to_dense(b); -// cholmod_dense* x = cholmod_solve(CHOLMOD_LDLt, m_cholmodFactor, &cdb, &m_cholmod); -// b = Matrix<typename Base::Scalar,Dynamic,1>::Map(reinterpret_cast<typename Base::Scalar*>(x->x),b.rows()); -// cholmod_free_dense(&x, &m_cholmod); + cholmod_dense cdb = ei_cholmod_map_eigen_to_dense(b); + cholmod_dense* x = cholmod_solve(CHOLMOD_LDLt, m_cholmodFactor, &cdb, &m_cholmod); + b = Matrix<typename Base::Scalar,Dynamic,1>::Map(reinterpret_cast<typename Base::Scalar*>(x->x),b.rows()); + cholmod_free_dense(&x, &m_cholmod); } #endif // EIGEN_CHOLMODSUPPORT_H |