From fd7eba339491ed212b244bea6a6b3a0f71e1cdb2 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 2 Jan 2009 08:47:09 +0000 Subject: Added a SparseVector class (not tested yet) --- Eigen/Sparse | 4 +- Eigen/src/Sparse/SparseMatrix.h | 8 +- Eigen/src/Sparse/SparseMatrixBase.h | 1 + Eigen/src/Sparse/SparseUtil.h | 3 +- Eigen/src/Sparse/SparseVector.h | 308 ++++++++++++++++++++++++++++++++++++ 5 files changed, 315 insertions(+), 9 deletions(-) create mode 100644 Eigen/src/Sparse/SparseVector.h diff --git a/Eigen/Sparse b/Eigen/Sparse index 6bf263540..ce65d4dad 100644 --- a/Eigen/Sparse +++ b/Eigen/Sparse @@ -77,10 +77,8 @@ namespace Eigen { #include "src/Sparse/RandomSetter.h" #include "src/Sparse/SparseBlock.h" #include "src/Sparse/SparseMatrix.h" -//#include "src/Sparse/HashMatrix.h" -//#include "src/Sparse/LinkedVectorMatrix.h" +#include "src/Sparse/SparseVector.h" #include "src/Sparse/CoreIterators.h" -//#include "src/Sparse/SparseSetter.h" #include "src/Sparse/SparseProduct.h" #include "src/Sparse/TriangularSolver.h" #include "src/Sparse/SparseLLT.h" diff --git a/Eigen/src/Sparse/SparseMatrix.h b/Eigen/src/Sparse/SparseMatrix.h index f41a9586d..c829dfbac 100644 --- a/Eigen/src/Sparse/SparseMatrix.h +++ b/Eigen/src/Sparse/SparseMatrix.h @@ -415,13 +415,13 @@ class SparseMatrix::InnerIterator m_start(m_id), m_end(m_matrix.m_outerIndex[outer+1]) {} - InnerIterator& operator++() { m_id++; return *this; } + inline InnerIterator& operator++() { m_id++; return *this; } - Scalar value() const { return m_matrix.m_data.value(m_id); } + inline Scalar value() const { return m_matrix.m_data.value(m_id); } - int index() const { return m_matrix.m_data.index(m_id); } + inline int index() const { return m_matrix.m_data.index(m_id); } - operator bool() const { return (m_id < m_end) && (m_id>=m_start); } + inline operator bool() const { return (m_id < m_end) && (m_id>=m_start); } protected: const SparseMatrix& m_matrix; diff --git a/Eigen/src/Sparse/SparseMatrixBase.h b/Eigen/src/Sparse/SparseMatrixBase.h index 4968514eb..4ea95939f 100644 --- a/Eigen/src/Sparse/SparseMatrixBase.h +++ b/Eigen/src/Sparse/SparseMatrixBase.h @@ -32,6 +32,7 @@ class SparseMatrixBase : public MatrixBase typedef MatrixBase Base; typedef typename Base::Scalar Scalar; + typedef typename Base::RealScalar RealScalar; enum { Flags = Base::Flags, RowMajor = ei_traits::Flags&RowMajorBit ? 1 : 0 diff --git a/Eigen/src/Sparse/SparseUtil.h b/Eigen/src/Sparse/SparseUtil.h index 4b44949dc..dcafcc008 100644 --- a/Eigen/src/Sparse/SparseUtil.h +++ b/Eigen/src/Sparse/SparseUtil.h @@ -62,8 +62,7 @@ enum { template class SparseMatrixBase; template class SparseMatrix; -template class HashMatrix; -template class LinkedVectorMatrix; +template class SparseVector; const int AccessPatternNotSupported = 0x0; const int AccessPatternSupported = 0x1; diff --git a/Eigen/src/Sparse/SparseVector.h b/Eigen/src/Sparse/SparseVector.h new file mode 100644 index 000000000..2f80b6ea1 --- /dev/null +++ b/Eigen/src/Sparse/SparseVector.h @@ -0,0 +1,308 @@ +// This file is part of Eigen, a lightweight C++ template library +// for linear algebra. Eigen itself is part of the KDE project. +// +// Copyright (C) 2008 Gael Guennebaud +// +// Eigen is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 3 of the License, or (at your option) any later version. +// +// Alternatively, you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of +// the License, or (at your option) any later version. +// +// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License or the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License and a copy of the GNU General Public License along with +// Eigen. If not, see . + +#ifndef EIGEN_SPARSEVECTOR_H +#define EIGEN_SPARSEVECTOR_H + +/** \class SparseVector + * + * \brief a sparse vector class + * + * \param _Scalar the scalar type, i.e. the type of the coefficients + * + * See http://www.netlib.org/linalg/html_templates/node91.html for details on the storage scheme. + * + */ +template +struct ei_traits > +{ + typedef _Scalar Scalar; + enum { + IsColVector = _Flags & RowMajorBit ? 0 : 1, + + RowsAtCompileTime = IsColVector ? Dynamic : 1, + ColsAtCompileTime = IsColVector ? 1 : Dynamic, + MaxRowsAtCompileTime = RowsAtCompileTime, + MaxColsAtCompileTime = ColsAtCompileTime, + Flags = SparseBit | _Flags, + CoeffReadCost = NumTraits::ReadCost, + SupportedAccessPatterns = FullyCoherentAccessPattern + }; +}; + + + +template +class SparseVector + : public SparseMatrixBase > +{ + public: + EIGEN_GENERIC_PUBLIC_INTERFACE(SparseVector) + + protected: + public: + + typedef SparseMatrixBase SparseBase; + enum { + IsColVector = ei_traits::IsColVector + }; + + SparseArray m_data; + int m_size; + + + public: + + inline int rows() const { return IsColVector ? m_size : 1; } + inline int cols() const { return IsColVector ? 1 : m_size; } + inline int innerSize() const { return m_size; } + inline int outerSize() const { return 1; } + inline int innerNonZeros(int j) const { ei_assert(j==0); return m_size; } + + inline const Scalar* _valuePtr() const { return &m_data.value(0); } + inline Scalar* _valuePtr() { return &m_data.value(0); } + + inline const int* _innerIndexPtr() const { return &m_data.index(0); } + inline int* _innerIndexPtr() { return &m_data.index(0); } + + inline Scalar coeff(int row, int col) const + { + ei_assert((IsColVector ? col : row)==0); + return coeff(IsColVector ? row : col); + } + inline Scalar coeff(int i) const + { + int start = 0; + int end = m_data.size(); + if (start==end) + return Scalar(0); + else if (end>0 && i==m_data.index(end-1)) + return m_data.value(end-1); + // ^^ optimization: let's first check if it is the last coefficient + // (very common in high level algorithms) + + // TODO move this search to ScalarArray + const int* r = std::lower_bound(&m_data.index(start),&m_data.index(end-1),i); + const int id = r-&m_data.index(0); + return ((*r==i) && (id=start && "you probably called coeffRef on a non finalized vector"); + ei_assert(end>start && "coeffRef cannot be called on a zero coefficient"); + int* r = std::lower_bound(&m_data.index(start),&m_data.index(end),i); + const int id = r-&m_data.index(0); + ei_assert((*r==i) && (id= startId) && (m_data.index(id) > i) ) + { + m_data.index(id+1) = m_data.index(id); + m_data.value(id+1) = m_data.value(id); + --id; + } + m_data.index(id+1) = i; + m_data.value(id+1) = 0; + return m_data.value(id+1); + } + + void resize(int newSize) + { + m_size = newSize; + m_data.clear(); + } + + void resizeNonZeros(int size) { m_data.resize(size); } + + inline SparseVector() : m_size(0) { resize(0, 0); } + + inline SparseVector(int size) : m_size(0) { resize(size); } + + template + inline SparseVector(const MatrixBase& other) + : m_size(0) + { + *this = other.derived(); + } + + inline SparseVector(const SparseVector& other) + : m_size(0) + { + *this = other.derived(); + } + + inline void swap(SparseVector& other) + { + std::swap(m_size, other.m_size); + m_data.swap(other.m_data); + } + + inline SparseVector& operator=(const SparseVector& other) + { + if (other.isRValue()) + { + swap(other.const_cast_derived()); + } + else + { + resize(other.size()); + m_data = other.m_data; + } + return *this; + } + +// template +// inline SparseVector& operator=(const MatrixBase& other) +// { +// const bool needToTranspose = (Flags & RowMajorBit) != (OtherDerived::Flags & RowMajorBit); +// if (needToTranspose) +// { +// // two passes algorithm: +// // 1 - compute the number of coeffs per dest inner vector +// // 2 - do the actual copy/eval +// // Since each coeff of the rhs has to be evaluated twice, let's evauluate it if needed +// typedef typename ei_nested::type OtherCopy; +// OtherCopy otherCopy(other.derived()); +// typedef typename ei_cleantype::type _OtherCopy; +// +// resize(other.rows(), other.cols()); +// Eigen::Map(m_outerIndex,outerSize()).setZero(); +// // pass 1 +// // FIXME the above copy could be merged with that pass +// for (int j=0; j::operator=(other.derived()); +// } +// } + + friend std::ostream & operator << (std::ostream & s, const SparseVector& m) + { + for (unsigned int i=0; i +class SparseVector::InnerIterator +{ + public: + InnerIterator(const SparseVector& vec, int outer=0) + : m_vector(vec), m_id(0), m_end(vec.nonZeros()) + { + ei_assert(outer==0); + } + + template + InnerIterator(const Flagged& vec, int outer) + : m_vector(vec._expression()), m_id(0), m_end(m_vector.nonZeros()) + {} + + inline InnerIterator& operator++() { m_id++; return *this; } + + inline Scalar value() const { return m_vector.m_data.value(m_id); } + + inline int index() const { return m_vector.m_data.index(m_id); } + + inline operator bool() const { return (m_id < m_end); } + + protected: + const SparseVector& m_vector; + int m_id; + const int m_end; +}; + +#endif // EIGEN_SPARSEVECTOR_H -- cgit v1.2.3