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

fix SparseView: clean the nested matrix type

Browse Source
This commit is contained in:
Gael Guennebaud 2010-07-22 15:57:01 +02:00
parent 734469e43f
commit fa6d36e0f7
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Eigen/src/Sparse/SparseView.h
View File

@ -31,18 +31,23 @@ struct ei_traits<SparseView<MatrixType> > : ei_traits<MatrixType>
{ {
typedef int Index; typedef int Index;
typedef Sparse StorageKind; typedef Sparse StorageKind;
enum {
Flags = int(ei_traits<MatrixType>::Flags) & (RowMajorBit)
};
}; };
template<typename MatrixType> template<typename MatrixType>
class SparseView : public SparseMatrixBase<SparseView<MatrixType> > class SparseView : public SparseMatrixBase<SparseView<MatrixType> >
{ {
typedef typename MatrixType::Nested MatrixTypeNested; typedef typename MatrixType::Nested MatrixTypeNested;
typedef typename ei_cleantype<MatrixTypeNested>::type _MatrixTypeNested;
public: public:
EIGEN_SPARSE_PUBLIC_INTERFACE(SparseView) EIGEN_SPARSE_PUBLIC_INTERFACE(SparseView)
SparseView(const MatrixType& mat, const Scalar& m_reference = Scalar(0), SparseView(const MatrixType& mat, const Scalar& m_reference = Scalar(0),
typename NumTraits<Scalar>::Real m_epsilon = NumTraits<Scalar>::dummy_precision()) : typename NumTraits<Scalar>::Real m_epsilon = NumTraits<Scalar>::dummy_precision()) :
m_matrix(mat), m_reference(m_reference), m_epsilon(m_epsilon) {} m_matrix(mat), m_reference(m_reference), m_epsilon(m_epsilon) {}
class InnerIterator; class InnerIterator;
inline Index rows() const { return m_matrix.rows(); } inline Index rows() const { return m_matrix.rows(); }
@ -58,10 +63,10 @@ protected:
}; };
template<typename MatrixType> template<typename MatrixType>
class SparseView<MatrixType>::InnerIterator : public MatrixTypeNested::InnerIterator class SparseView<MatrixType>::InnerIterator : public _MatrixTypeNested::InnerIterator
{ {
public: public:
typedef typename MatrixTypeNested::InnerIterator IterBase; typedef typename _MatrixTypeNested::InnerIterator IterBase;
InnerIterator(const SparseView& view, Index outer) : InnerIterator(const SparseView& view, Index outer) :
IterBase(view.m_matrix, outer), m_view(view) IterBase(view.m_matrix, outer), m_view(view)
{ {

7
test/sparse_basic.cpp
View File

@ -250,6 +250,13 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
VERIFY(countTrueNonZero==m2.nonZeros()); VERIFY(countTrueNonZero==m2.nonZeros());
VERIFY_IS_APPROX(m2, refM2); VERIFY_IS_APPROX(m2, refM2);
} }
// test sparseView
{
DenseMatrix refMat2 = DenseMatrix::Zero(rows, rows);
SparseMatrixType m2(rows, rows);
VERIFY_IS_APPROX(m2.eval(), refMat2.sparseView().eval());
}
} }
void test_sparse_basic() void test_sparse_basic()