Mercurial > hg > octave-nkf
diff liboctave/CSparse.cc @ 8964:f4f4d65faaa0
Implement sparse * diagonal and diagonal * sparse operations, double-prec only.
Date: Sun, 8 Mar 2009 16:28:18 -0400
These preserve sparsity, so eye(5) * sprand (5, 5, .2) is *sparse*
and not dense. This may affect people who use multiplication by
eye() rather than full().
The liboctave routines do *not* check if arguments are scalars in
disguise. There is a type problem with checking at that level. I
suspect we want diag * "sparse scalar" to stay diagonal, but we have
to return a sparse matrix at the liboctave. Rather than worrying
about that in liboctave, we cope with it when binding to Octave and
return the correct higher-level type.
The implementation is in Sparse-diag-op-defs.h rather than
Sparse-op-defs.h to limit recompilation. And the implementations
are templates rather than macros to produce better compiler errors
and debugging information.
| author | Jason Riedy <jason@acm.org> |
|---|---|
| date | Mon, 09 Mar 2009 17:49:13 -0400 |
| parents | eb63fbe60fab |
| children | 1bba53c0a38d |
line wrap: on
line diff
--- a/liboctave/CSparse.cc +++ b/liboctave/CSparse.cc @@ -37,6 +37,8 @@ #include "dRowVector.h" #include "oct-locbuf.h" +#include "dDiagMatrix.h" +#include "CDiagMatrix.h" #include "CSparse.h" #include "boolSparse.h" #include "dSparse.h" @@ -48,6 +50,8 @@ #include "SparseCmplxCHOL.h" #include "SparseCmplxQR.h" +#include "Sparse-diag-op-defs.h" + // Define whether to use a basic QR solver or one that uses a Dulmange // Mendelsohn factorization to seperate the problem into under-determined, // well-determined and over-determined parts and solves them seperately @@ -7584,6 +7588,40 @@ SPARSE_FULL_TRANS_MUL (ComplexMatrix, Complex, Complex (0.,0.), conj); } +// diag * sparse and sparse * diag +SparseComplexMatrix +operator * (const DiagMatrix& d, const SparseComplexMatrix& a) +{ + return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator * (const SparseComplexMatrix& a, const DiagMatrix& d) +{ + return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); +} + +SparseComplexMatrix +operator * (const ComplexDiagMatrix& d, const SparseMatrix& a) +{ + return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator * (const SparseMatrix& a, const ComplexDiagMatrix& d) +{ + return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); +} + +SparseComplexMatrix +operator * (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) +{ + return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator * (const SparseComplexMatrix& a, const ComplexDiagMatrix& d) +{ + return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); +} + // FIXME -- it would be nice to share code among the min/max // functions below.