GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

extend unit test for SparseMatrix::prune

Browse Source
This commit is contained in:
Gael Guennebaud 2015-10-13 10:53:38 +02:00
parent ac22b66f1c
commit a44d91a0b2
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -509,7 +509,6 @@ class SparseMatrix
void prune(const KeepFunc& keep = KeepFunc()) void prune(const KeepFunc& keep = KeepFunc())
{ {
// TODO optimize the uncompressed mode to avoid moving and allocating the data twice // TODO optimize the uncompressed mode to avoid moving and allocating the data twice
// TODO also implement a unit test
makeCompressed(); makeCompressed();
StorageIndex k = 0; StorageIndex k = 0;

17
test/sparse_basic.cpp
View File

@ -219,10 +219,10 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
refM2.setZero(); refM2.setZero();
int countFalseNonZero = 0; int countFalseNonZero = 0;
int countTrueNonZero = 0; int countTrueNonZero = 0;
for (Index j=0; j<m2.outerSize(); ++j) m2.reserve(VectorXi::Constant(m2.outerSize(), int(m2.innerSize())));
for (Index j=0; j<m2.cols(); ++j)
{ {
m2.startVec(j); for (Index i=0; i<m2.rows(); ++i)
for (Index i=0; i<m2.innerSize(); ++i)
{ {
float x = internal::random<float>(0,1); float x = internal::random<float>(0,1);
if (x<0.1) if (x<0.1)
@ -232,21 +232,20 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
else if (x<0.5) else if (x<0.5)
{ {
countFalseNonZero++; countFalseNonZero++;
m2.insertBackByOuterInner(j,i) = Scalar(0); m2.insert(i,j) = Scalar(0);
} }
else else
{ {
countTrueNonZero++; countTrueNonZero++;
m2.insertBackByOuterInner(j,i) = Scalar(1); m2.insert(i,j) = Scalar(1);
if(SparseMatrixType::IsRowMajor)
refM2(j,i) = Scalar(1);
else
refM2(i,j) = Scalar(1); refM2(i,j) = Scalar(1);
} }
} }
} }
m2.finalize(); if(internal::random<bool>())
m2.makeCompressed();
VERIFY(countFalseNonZero+countTrueNonZero == m2.nonZeros()); VERIFY(countFalseNonZero+countTrueNonZero == m2.nonZeros());
if(countTrueNonZero>0)
VERIFY_IS_APPROX(m2, refM2); VERIFY_IS_APPROX(m2, refM2);
m2.prune(Scalar(1)); m2.prune(Scalar(1));
VERIFY(countTrueNonZero==m2.nonZeros()); VERIFY(countTrueNonZero==m2.nonZeros());