diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-12-02 19:02:49 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-12-02 19:02:49 +0100 |
commit | e759086dcd31358ece573226abf5fc650db8b1dc (patch) | |
tree | f2579af252616b9d61af0604e8571dc474bcb1e9 /Eigen/src/SparseCore | |
parent | 4ca89f32ed7bbbc4938825a416642782583988e0 (diff) |
improve documentation of some sparse related classes
Diffstat (limited to 'Eigen/src/SparseCore')
-rw-r--r-- | Eigen/src/SparseCore/SparseMatrixBase.h | 9 | ||||
-rw-r--r-- | Eigen/src/SparseCore/SparseProduct.h | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/Eigen/src/SparseCore/SparseMatrixBase.h b/Eigen/src/SparseCore/SparseMatrixBase.h index 849e00593..7f5532fd4 100644 --- a/Eigen/src/SparseCore/SparseMatrixBase.h +++ b/Eigen/src/SparseCore/SparseMatrixBase.h @@ -154,12 +154,12 @@ template<typename Derived> class SparseMatrixBase : public EigenBase<Derived> { return *static_cast<Derived*>(const_cast<SparseMatrixBase*>(this)); } #endif // not EIGEN_PARSED_BY_DOXYGEN - /** \returns the number of rows. \sa cols(), RowsAtCompileTime */ + /** \returns the number of rows. \sa cols() */ inline Index rows() const { return derived().rows(); } - /** \returns the number of columns. \sa rows(), ColsAtCompileTime*/ + /** \returns the number of columns. \sa rows() */ inline Index cols() const { return derived().cols(); } /** \returns the number of coefficients, which is \a rows()*cols(). - * \sa rows(), cols(), SizeAtCompileTime. */ + * \sa rows(), cols(). */ inline Index size() const { return rows() * cols(); } /** \returns the number of nonzero coefficients which is in practice the number * of stored coefficients. */ @@ -272,9 +272,6 @@ template<typename Derived> class SparseMatrixBase : public EigenBase<Derived> template<typename Lhs, typename Rhs> inline Derived& operator=(const SparseSparseProduct<Lhs,Rhs>& product); - template<typename Lhs, typename Rhs> - inline void _experimentalNewProduct(const Lhs& lhs, const Rhs& rhs); - friend std::ostream & operator << (std::ostream & s, const SparseMatrixBase& m) { if (Flags&RowMajorBit) diff --git a/Eigen/src/SparseCore/SparseProduct.h b/Eigen/src/SparseCore/SparseProduct.h index f3b9b40b0..1c7acc307 100644 --- a/Eigen/src/SparseCore/SparseProduct.h +++ b/Eigen/src/SparseCore/SparseProduct.h @@ -175,7 +175,17 @@ inline Derived& SparseMatrixBase<Derived>::operator=(const SparseSparseProduct<L return derived(); } -// sparse * sparse +/** \returns an expression of the product of two sparse matrices. + * By default a conservative product preserving the symbolic non zeros is performed. + * The automatic pruning of the small values can be achieved by calling the pruned() function + * in which case a totally different product algorithm is employed: + * \code + * C = (A*B).pruned(); // supress numerical zeros (exact) + * C = (A*B).pruned(ref); + * C = (A*B).pruned(ref,epsilon); + * \endcode + * where \c ref is a meaningful non zero reference value. + * */ template<typename Derived> template<typename OtherDerived> inline const typename SparseSparseProductReturnType<Derived,OtherDerived>::Type |