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

fix a nesting type issue in Sparse/TriangularView

Browse Source
This commit is contained in:
Gael Guennebaud 2012-01-25 18:16:48 +01:00
parent 606e204f6d
commit 5e4dfa4a09
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Eigen/src/SparseCore/SparseTriangularView.h
View File

@ -53,9 +53,7 @@ template<typename MatrixType, int Mode> class SparseTriangularView
inline Index rows() const { return m_matrix.rows(); } inline Index rows() const { return m_matrix.rows(); }
inline Index cols() const { return m_matrix.cols(); } inline Index cols() const { return m_matrix.cols(); }
//typedef typename internal::conditional<internal::must_nest_by_value<MatrixType>::ret, typedef typename MatrixType::Nested MatrixTypeNested;
// MatrixType, const MatrixType&>::type MatrixTypeNested;
typedef typename internal::nested<MatrixType>::type MatrixTypeNested;
typedef typename internal::remove_reference<MatrixTypeNested>::type MatrixTypeNestedNonRef; typedef typename internal::remove_reference<MatrixTypeNested>::type MatrixTypeNestedNonRef;
typedef typename internal::remove_all<MatrixTypeNested>::type MatrixTypeNestedCleaned; typedef typename internal::remove_all<MatrixTypeNested>::type MatrixTypeNestedCleaned;
@ -72,13 +70,13 @@ template<typename MatrixType, int Mode> class SparseTriangularView
template<typename OtherDerived> void solveInPlace(SparseMatrixBase<OtherDerived>& other) const; template<typename OtherDerived> void solveInPlace(SparseMatrixBase<OtherDerived>& other) const;
protected: protected:
MatrixTypeNested m_matrix; const MatrixTypeNested m_matrix;
}; };
template<typename MatrixType, int Mode> template<typename MatrixType, int Mode>
class SparseTriangularView<MatrixType,Mode>::InnerIterator : public MatrixType::InnerIterator class SparseTriangularView<MatrixType,Mode>::InnerIterator : public MatrixTypeNested::InnerIterator
{ {
typedef typename MatrixType::InnerIterator Base; typedef typename MatrixTypeNested::InnerIterator Base;
public: public:
EIGEN_STRONG_INLINE InnerIterator(const SparseTriangularView& view, Index outer) EIGEN_STRONG_INLINE InnerIterator(const SparseTriangularView& view, Index outer)
@ -140,9 +138,9 @@ class SparseTriangularView<MatrixType,Mode>::InnerIterator : public MatrixType::
}; };
template<typename MatrixType, int Mode> template<typename MatrixType, int Mode>
class SparseTriangularView<MatrixType,Mode>::ReverseInnerIterator : public MatrixType::ReverseInnerIterator class SparseTriangularView<MatrixType,Mode>::ReverseInnerIterator : public MatrixTypeNested::ReverseInnerIterator
{ {
typedef typename MatrixType::ReverseInnerIterator Base; typedef typename MatrixTypeNested::ReverseInnerIterator Base;
public: public:
EIGEN_STRONG_INLINE ReverseInnerIterator(const SparseTriangularView& view, Index outer) EIGEN_STRONG_INLINE ReverseInnerIterator(const SparseTriangularView& view, Index outer)