Mercurial > hg > octave-nkf
diff liboctave/CSparse.cc @ 8966:1bba53c0a38d
Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag.
Date: Mon, 9 Mar 2009 17:45:22 -0400
This does not use the typical sparse-mx-ops generator. I suspect the
sematics of elementwise multiplication and division to be rather
controversial, so they are not included. If comparison operations are
added, the implementation should be shifted over to use the typical
generator.
The template in Sparse-diag-op-defs.h likely could use const bools
rather than functional argument operations. I haven't measured which
is optimized more effectively.
Also, the Octave binding layer in op-dm-scm.cc likely could use all
sorts of macro or template trickery, but it's far easier to let Emacs
handle it for now. That would be worth revisiting if further
elementwise sparse and diagonal operations are added.
| author | Jason Riedy <jason@acm.org> |
|---|---|
| date | Mon, 09 Mar 2009 17:49:14 -0400 |
| parents | f4f4d65faaa0 |
| children | 5bbbf482909a |
line wrap: on
line diff
--- a/liboctave/CSparse.cc +++ b/liboctave/CSparse.cc @@ -7622,6 +7622,68 @@ return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); } +SparseComplexMatrix +operator + (const ComplexDiagMatrix& d, const SparseMatrix& a) +{ + return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator + (const DiagMatrix& d, const SparseComplexMatrix& a) +{ + return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator + (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) +{ + return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator + (const SparseMatrix& a, const ComplexDiagMatrix& d) +{ + return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d); +} +SparseComplexMatrix +operator + (const SparseComplexMatrix& a, const DiagMatrix& d) +{ + return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d); +} +SparseComplexMatrix +operator + (const SparseComplexMatrix&a, const ComplexDiagMatrix& d) +{ + return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d); +} + +SparseComplexMatrix +operator - (const ComplexDiagMatrix& d, const SparseMatrix& a) +{ + return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator - (const DiagMatrix& d, const SparseComplexMatrix& a) +{ + return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator - (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) +{ + return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a); +} +SparseComplexMatrix +operator - (const SparseMatrix& a, const ComplexDiagMatrix& d) +{ + return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d); +} +SparseComplexMatrix +operator - (const SparseComplexMatrix& a, const DiagMatrix& d) +{ + return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d); +} +SparseComplexMatrix +operator - (const SparseComplexMatrix&a, const ComplexDiagMatrix& d) +{ + return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d); +} + // FIXME -- it would be nice to share code among the min/max // functions below.