mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-15 07:10:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

extend sparse unit test and more bugfix, major todo: finilize the SparseSetter

Browse Source
This commit is contained in:
Gael Guennebaud 2008-08-21 18:40:56 +00:00
parent 60804c306d
commit 58061f5ffc
3 changed files with 98 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
Eigen/src/Sparse/SparseMatrixBase.h
View File

@ -125,7 +125,7 @@ class SparseMatrixBase : public MatrixBase<Derived>
{
for ( ; col<it.index(); ++col)
s << "0 ";
std::cout << it.value() << " ";
s << it.value() << " ";
++col;
}
for ( ; col<m.cols(); ++col)

115
test/sparse.cpp
View File

@ -25,41 +25,86 @@
#include "main.h"
#include <Eigen/Sparse>
template<typename Scalar> void sparse()
{
int rows = 8, cols = 8;
double density = std::max(8./(rows*cols), 0.01);
typedef Matrix<Scalar,Dynamic,Dynamic> DenseMatrix;
Scalar eps = 1e-6;
SparseMatrix<Scalar> m(rows, cols);
DenseMatrix refMat = DenseMatrix::Zero(rows, cols);
std::vector<Vector2i> zeroCoords;
std::vector<Vector2i> nonzeroCoords;
m.startFill(rows*cols*density);
for(int j=0; j<cols; j++)
{
for(int i=0; i<rows; i++)
{
Scalar v = (ei_random<Scalar>(0,1) < density) ? ei_random<Scalar>() : 0;
if (v!=0)
{
m.fill(i,j) = v;
nonzeroCoords.push_back(Vector2i(i,j));
}
else
{
zeroCoords.push_back(Vector2i(i,j));
}
refMat(i,j) = v;
}
}
m.endFill();
VERIFY(zeroCoords.size()>0 && "re-run the test");
VERIFY(nonzeroCoords.size()>0 && "re-run the test");
// test coeff and coeffRef
for (int i=0; i<zeroCoords.size(); ++i)
{
VERIFY_IS_MUCH_SMALLER_THAN( m.coeff(zeroCoords[i].x(),zeroCoords[i].y()), eps );
VERIFY_RAISES_ASSERT( m.coeffRef(zeroCoords[0].x(),zeroCoords[0].y()) = 5 );
}
VERIFY_IS_APPROX(m, refMat);
m.coeffRef(nonzeroCoords[0].x(), nonzeroCoords[0].y()) = Scalar(5);
refMat.coeffRef(nonzeroCoords[0].x(), nonzeroCoords[0].y()) = Scalar(5);
VERIFY_IS_APPROX(m, refMat);
// test SparseSetters
// coherent setter
// TODO extend the MatrixSetter
// {
// m.setZero();
// VERIFY_IS_NOT_APPROX(m, refMat);
// SparseSetter<SparseMatrix<Scalar>, FullyCoherentAccessPattern> w(m);
// for (int i=0; i<nonzeroCoords.size(); ++i)
// {
// w->coeffRef(nonzeroCoords[i].x(),nonzeroCoords[i].y()) = refMat.coeff(nonzeroCoords[i].x(),nonzeroCoords[i].y());
// }
// }
// VERIFY_IS_APPROX(m, refMat);
// random setter
{
m.setZero();
VERIFY_IS_NOT_APPROX(m, refMat);
SparseSetter<SparseMatrix<Scalar>, RandomAccessPattern> w(m);
std::vector<Vector2i> remaining = nonzeroCoords;
while(!remaining.empty())
{
int i = ei_random<int>(0,remaining.size()-1);
w->coeffRef(remaining[i].x(),remaining[i].y()) = refMat.coeff(remaining[i].x(),remaining[i].y());
remaining[i] = remaining.back();
remaining.pop_back();
}
}
VERIFY_IS_APPROX(m, refMat);
}
void test_sparse()
{
int rows = 4, cols = 4;
SparseMatrix<double> m(rows, cols);
m.startFill(rows);
m.fill(0, 2) = 2;
m.fill(1, 2) = 1;
m.fill(0, 3) = 5;
m.endFill();
m.coeffRef(0, 2) = 3;
VERIFY_RAISES_ASSERT( m.coeffRef(0, 0) = 5 );
VERIFY_IS_MUCH_SMALLER_THAN( m.coeff(0, 0), 0.000001 );
VERIFY_IS_MUCH_SMALLER_THAN( m.coeff(0, 1), 0.000001 );
VERIFY_IS_MUCH_SMALLER_THAN( m.coeff(2, 1), 0.000001 );
VERIFY_IS_APPROX( m.coeff(0, 2), 3.0 );
VERIFY_IS_APPROX( m.coeff(1, 2), 1.0 );
VERIFY_IS_APPROX( m.coeff(0, 3), 5.0 );
Matrix4d dm;
double r;
m.startFill(rows*cols);
for(int i=0; i<cols; i++) {
for(int j=0; j<rows; j++) {
r = rand();
m.fill(j, i) = r;
dm(j, i) = r;
}
}
m.endFill();
for(int i=0; i<cols; i++) {
for(int j=0; j<rows; j++) {
VERIFY_IS_APPROX( m.coeff(j, i), dm(j, i) );
}
}
sparse<double>();
}