devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

*patch by Daniel Gomez:

Browse Source 
- bugfix in SparseMatrix
 - add a sparse unit test
* renamed Transform::affine => linear
This commit is contained in:
Gael Guennebaud
2008-08-21 17:02:47 +00:00
parent 082e309d2a
commit 60804c306d
6 changed files with 101 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Eigen/src/Sparse/SparseMatrix.h
View File

@@ -85,11 +85,15 @@ class SparseMatrix : public SparseMatrixBase<SparseMatrix<_Scalar, _Flags> >
const int inner = RowMajor ? col : row;
int id = m_outerIndex[outer];
int end = m_outerIndex[outer+1]-1;
if (m_data.index(end)==inner)
return m_data.value(end);
int end = m_outerIndex[outer+1];
// optimization: let's first check if it is the last coefficient
// (very common in high level algorithms)
if (end>0 && inner==m_data.index(end-1))
return m_data.value(end-1);
else if (id==end)
return Scalar(0);
const int* r = std::lower_bound(&m_data.index(id),&m_data.index(end),inner);
return (*r==inner) ? m_data.value(*r) : Scalar(0);
return (*r==inner) ? m_data.value(r-&m_data.index(0)) : Scalar(0);
}
inline Scalar& coeffRef(int row, int col)
@@ -99,9 +103,11 @@ class SparseMatrix : public SparseMatrixBase<SparseMatrix<_Scalar, _Flags> >
int id = m_outerIndex[outer];
int end = m_outerIndex[outer+1];
ei_assert(end>=id && "you probably called coeffRef on a non finalized matrix");
ei_assert(end>id && "coeffRef cannot be called on a zero coefficient");
int* r = std::lower_bound(&m_data.index(id),&m_data.index(end),inner);
ei_assert(*r==inner);
return m_data.value(*r);
ei_assert(*r==inner && "coeffRef cannot be called on a zero coefficient");
return m_data.value(r-&m_data.index(0));
}
public: