Big rewrite in the Sparse module: SparseMatrixBase no longer inherits MatrixBase.

That means a lot of features which were available for sparse matrices
via the dense (and super slow) implemention are no longer available.
All features which make sense for sparse matrices (aka can be implemented efficiently) will be
implemented soon, but don't expect to see an API as rich as for the dense path.
Other changes:
* no block(), row(), col() anymore.
* instead use .innerVector() to get a col or row vector of a matrix.
* .segment(), start(), end() will be back soon, not sure for block()
* faster cwise product
This commit is contained in:
Gael Guennebaud
2009-01-14 14:24:10 +00:00
parent ee87f5ee49
commit c4c70669d1
31 changed files with 1920 additions and 200 deletions

View File

@@ -25,46 +25,16 @@
#ifndef EIGEN_SPARSEREDUX_H
#define EIGEN_SPARSEREDUX_H
template<typename Derived, int Vectorization, int Unrolling>
struct ei_sum_impl<Derived, Vectorization, Unrolling, IsSparse>
template<typename Derived>
typename ei_traits<Derived>::Scalar
SparseMatrixBase<Derived>::sum() const
{
typedef typename Derived::Scalar Scalar;
static Scalar run(const Derived& mat)
{
ei_assert(mat.rows()>0 && mat.cols()>0 && "you are using a non initialized matrix");
Scalar res = 0;
for (int j=0; j<mat.outerSize(); ++j)
for (typename Derived::InnerIterator iter(mat,j); iter; ++iter)
res += iter.value();
return res;
}
};
template<typename Derived1, typename Derived2, int Vectorization, int Unrolling>
struct ei_dot_impl<Derived1, Derived2, Vectorization, Unrolling, IsSparse>
{
typedef typename Derived1::Scalar Scalar;
static Scalar run(const Derived1& v1, const Derived2& v2)
{
ei_assert(v1.size()>0 && "you are using a non initialized vector");
typename Derived1::InnerIterator i(v1,0);
typename Derived2::InnerIterator j(v2,0);
Scalar res = 0;
while (i && j)
{
if (i.index()==j.index())
{
res += i.value() * ei_conj(j.value());
++i; ++j;
}
else if (i.index()<j.index())
++i;
else
++j;
}
return res;
}
};
ei_assert(rows()>0 && cols()>0 && "you are using a non initialized matrix");
Scalar res = 0;
for (int j=0; j<outerSize(); ++j)
for (typename Derived::InnerIterator iter(derived(),j); iter; ++iter)
res += iter.value();
return res;
}
#endif // EIGEN_SPARSEREDUX_H