diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-02-25 21:07:30 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-02-25 21:07:30 -0500 |
| commit | b1c6c215a43850b2bc5bdc393ab5a1179e858024 (patch) | |
| tree | 9ae1234383bef2204802606501a47bb5c05ec1d2 /Eigen/src/Sparse | |
| parent | 769641bc58745fecc1fa4e537466a1fff48f4a8a (diff) | |
| parent | 90e4a605ef920759a23cdbd24e6e7b69ce549162 (diff) | |
merge
Diffstat (limited to 'Eigen/src/Sparse')
| -rw-r--r-- | Eigen/src/Sparse/SparseMatrixBase.h | 6 | ||||
| -rw-r--r-- | Eigen/src/Sparse/SparseSelfAdjointView.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Sparse/SparseMatrixBase.h b/Eigen/src/Sparse/SparseMatrixBase.h index 205325939..cf1a5d7bf 100644 --- a/Eigen/src/Sparse/SparseMatrixBase.h +++ b/Eigen/src/Sparse/SparseMatrixBase.h @@ -36,7 +36,7 @@ * * */ -template<typename Derived> class SparseMatrixBase : public AnyMatrixBase<Derived> +template<typename Derived> class SparseMatrixBase : public EigenBase<Derived> { public: @@ -109,7 +109,7 @@ template<typename Derived> class SparseMatrixBase : public AnyMatrixBase<Derived Transpose<Derived> >::ret AdjointReturnType; - typedef SparseMatrix<Scalar, Flags&RowMajorBit ? RowMajor : ColMajor> PlainMatrixType; + typedef SparseMatrix<Scalar, Flags&RowMajorBit ? RowMajor : ColMajor> PlainObject; #define EIGEN_CURRENT_STORAGE_BASE_CLASS Eigen::SparseMatrixBase #include "../plugins/CommonCwiseUnaryOps.h" @@ -396,7 +396,7 @@ template<typename Derived> class SparseMatrixBase : public AnyMatrixBase<Derived template<typename OtherDerived> Scalar dot(const SparseMatrixBase<OtherDerived>& other) const; RealScalar squaredNorm() const; RealScalar norm() const; -// const PlainMatrixType normalized() const; +// const PlainObject normalized() const; // void normalize(); Transpose<Derived> transpose() { return derived(); } diff --git a/Eigen/src/Sparse/SparseSelfAdjointView.h b/Eigen/src/Sparse/SparseSelfAdjointView.h index 039e5c725..f3d4fbcbd 100644 --- a/Eigen/src/Sparse/SparseSelfAdjointView.h +++ b/Eigen/src/Sparse/SparseSelfAdjointView.h @@ -93,8 +93,8 @@ template<typename MatrixType, unsigned int UpLo> class SparseSelfAdjointView template<typename DerivedU> SparseSelfAdjointView& rankUpdate(const MatrixBase<DerivedU>& u, Scalar alpha = Scalar(1)); - // const SparseLLT<PlainMatrixType, UpLo> llt() const; - // const SparseLDLT<PlainMatrixType, UpLo> ldlt() const; + // const SparseLLT<PlainObject, UpLo> llt() const; + // const SparseLDLT<PlainObject, UpLo> ldlt() const; protected: |