GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 11:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

cholmod: assume selfadjoint matrix by default since selfadjoint flag has been removed

Browse Source
This commit is contained in:
Gael Guennebaud 2010-04-09 13:37:05 +02:00
parent 1ad6c79467
commit 0b0366a53d
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Eigen/src/Sparse/CholmodSupport.h
View File

@ -65,12 +65,12 @@ cholmod_sparse SparseMatrixBase<Derived>::asCholmodMatrix()
res.p = derived()._outerIndexPtr(); res.p = derived()._outerIndexPtr();
res.i = derived()._innerIndexPtr(); res.i = derived()._innerIndexPtr();
res.x = derived()._valuePtr(); res.x = derived()._valuePtr();
res.xtype = CHOLMOD_REAL; res.xtype = CHOLMOD_REAL;
res.itype = CHOLMOD_INT; res.itype = CHOLMOD_INT;
res.sorted = 1; res.sorted = 1;
res.packed = 1; res.packed = 1;
res.dtype = 0; res.dtype = 0;
res.stype = -1; res.stype = -1;
ei_cholmod_configure_matrix<Scalar>(res); ei_cholmod_configure_matrix<Scalar>(res);
@ -84,7 +84,7 @@ cholmod_sparse SparseMatrixBase<Derived>::asCholmodMatrix()
res.stype = 0; res.stype = 0;
} }
else else
res.stype = 0; res.stype = -1; // by default we consider the lower part
return res; return res;
} }
@ -177,21 +177,21 @@ void SparseLLT<MatrixType,Cholmod>::compute(const MatrixType& a)
} }
cholmod_sparse A = const_cast<MatrixType&>(a).asCholmodMatrix(); cholmod_sparse A = const_cast<MatrixType&>(a).asCholmodMatrix();
m_cholmod.supernodal = CHOLMOD_AUTO; // m_cholmod.supernodal = CHOLMOD_AUTO;
// TODO // TODO
if (m_flags&IncompleteFactorization) // if (m_flags&IncompleteFactorization)
{ // {
m_cholmod.nmethods = 1; // m_cholmod.nmethods = 1;
m_cholmod.method[0].ordering = CHOLMOD_NATURAL; // m_cholmod.method[0].ordering = CHOLMOD_NATURAL;
m_cholmod.postorder = 0; // m_cholmod.postorder = 0;
} // }
else // else
{ // {
m_cholmod.nmethods = 1; // m_cholmod.nmethods = 1;
m_cholmod.method[0].ordering = CHOLMOD_NATURAL; // m_cholmod.method[0].ordering = CHOLMOD_NATURAL;
m_cholmod.postorder = 0; // m_cholmod.postorder = 0;
} // }
m_cholmod.final_ll = 1; // m_cholmod.final_ll = 1;
m_cholmodFactor = cholmod_analyze(&A, &m_cholmod); m_cholmodFactor = cholmod_analyze(&A, &m_cholmod);
cholmod_factorize(&A, m_cholmodFactor, &m_cholmod); cholmod_factorize(&A, m_cholmodFactor, &m_cholmod);