diff options
author | Gael Guennebaud <g.gael@free.fr> | 2010-04-09 13:37:05 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2010-04-09 13:37:05 +0200 |
commit | 0b0366a53df0dbdc906532a821720e73d286651f (patch) | |
tree | a24b12e9aedb02c43ebc93a1a7d02c44fae1de5c /Eigen | |
parent | 1ad6c79467379bc59ce52e64560e364f29a58f0a (diff) |
cholmod: assume selfadjoint matrix by default since selfadjoint flag has been removed
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Sparse/CholmodSupport.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/Eigen/src/Sparse/CholmodSupport.h b/Eigen/src/Sparse/CholmodSupport.h index fbd035ce4..a9ef2d3a4 100644 --- a/Eigen/src/Sparse/CholmodSupport.h +++ b/Eigen/src/Sparse/CholmodSupport.h @@ -65,12 +65,12 @@ cholmod_sparse SparseMatrixBase<Derived>::asCholmodMatrix() res.p = derived()._outerIndexPtr(); res.i = derived()._innerIndexPtr(); res.x = derived()._valuePtr(); - res.xtype = CHOLMOD_REAL; - res.itype = CHOLMOD_INT; - res.sorted = 1; - res.packed = 1; - res.dtype = 0; - res.stype = -1; + res.xtype = CHOLMOD_REAL; + res.itype = CHOLMOD_INT; + res.sorted = 1; + res.packed = 1; + res.dtype = 0; + res.stype = -1; ei_cholmod_configure_matrix<Scalar>(res); @@ -84,7 +84,7 @@ cholmod_sparse SparseMatrixBase<Derived>::asCholmodMatrix() res.stype = 0; } else - res.stype = 0; + res.stype = -1; // by default we consider the lower part return res; } @@ -177,21 +177,21 @@ void SparseLLT<MatrixType,Cholmod>::compute(const MatrixType& a) } cholmod_sparse A = const_cast<MatrixType&>(a).asCholmodMatrix(); - m_cholmod.supernodal = CHOLMOD_AUTO; +// m_cholmod.supernodal = CHOLMOD_AUTO; // TODO - if (m_flags&IncompleteFactorization) - { - m_cholmod.nmethods = 1; - m_cholmod.method[0].ordering = CHOLMOD_NATURAL; - m_cholmod.postorder = 0; - } - else - { - m_cholmod.nmethods = 1; - m_cholmod.method[0].ordering = CHOLMOD_NATURAL; - m_cholmod.postorder = 0; - } - m_cholmod.final_ll = 1; +// if (m_flags&IncompleteFactorization) +// { +// m_cholmod.nmethods = 1; +// m_cholmod.method[0].ordering = CHOLMOD_NATURAL; +// m_cholmod.postorder = 0; +// } +// else +// { +// m_cholmod.nmethods = 1; +// m_cholmod.method[0].ordering = CHOLMOD_NATURAL; +// m_cholmod.postorder = 0; +// } +// m_cholmod.final_ll = 1; m_cholmodFactor = cholmod_analyze(&A, &m_cholmod); cholmod_factorize(&A, m_cholmodFactor, &m_cholmod); |