mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-03-07 18:27:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix sparse tri-solve for full matrices

Browse Source
This commit is contained in:
Gael Guennebaud 2011-10-11 20:35:52 +02:00
parent 15cb4f5b09
commit a5761d6dd7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Eigen/src/Sparse/TriangularSolver.h
View File

@ -82,8 +82,17 @@ struct sparse_solve_triangular_selector<Lhs,Rhs,Mode,Upper,RowMajor>
for(int i=lhs.rows()-1 ; i>=0 ; --i) for(int i=lhs.rows()-1 ; i>=0 ; --i)
{ {
Scalar tmp = other.coeff(i,col); Scalar tmp = other.coeff(i,col);
Scalar l_ii = 0;
typename Lhs::InnerIterator it(lhs, i); typename Lhs::InnerIterator it(lhs, i);
if (it && it.index() == i) while(it && it.index()<i)
++it;
if(!(Mode & UnitDiag))
{
eigen_assert(it && it.index()==i);
l_ii = it.value();
++it;
}
else if (it && it.index() == i)
++it; ++it;
for(; it; ++it) for(; it; ++it)
{ {
@ -93,11 +102,7 @@ struct sparse_solve_triangular_selector<Lhs,Rhs,Mode,Upper,RowMajor>
if (Mode & UnitDiag) if (Mode & UnitDiag)
other.coeffRef(i,col) = tmp; other.coeffRef(i,col) = tmp;
else else
{ other.coeffRef(i,col) = tmp/l_ii;
typename Lhs::InnerIterator it(lhs, i);
eigen_assert(it && it.index() == i);
other.coeffRef(i,col) = tmp/it.value();
}
} }
} }
} }
@ -118,9 +123,11 @@ struct sparse_solve_triangular_selector<Lhs,Rhs,Mode,Lower,ColMajor>
if (tmp!=Scalar(0)) // optimization when other is actually sparse if (tmp!=Scalar(0)) // optimization when other is actually sparse
{ {
typename Lhs::InnerIterator it(lhs, i); typename Lhs::InnerIterator it(lhs, i);
while(it && it.index()<i)
++it;
if(!(Mode & UnitDiag)) if(!(Mode & UnitDiag))
{ {
eigen_assert(it.index()==i); eigen_assert(it && it.index()==i);
tmp /= it.value(); tmp /= it.value();
} }
if (it && it.index()==i) if (it && it.index()==i)