Mercurial > octave-dspies
comparison liboctave/dSparse.cc @ 8967:5bbbf482909a
fix omissions adjusting JR's patches
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Thu, 12 Mar 2009 11:46:56 +0100 |
parents | 1bba53c0a38d |
children | 91d53dc37f79 |
comparison
equal
deleted
inserted
replaced
8966:1bba53c0a38d | 8967:5bbbf482909a |
---|---|
7705 // diag * sparse and sparse * diag | 7705 // diag * sparse and sparse * diag |
7706 | 7706 |
7707 SparseMatrix | 7707 SparseMatrix |
7708 operator * (const DiagMatrix& d, const SparseMatrix& a) | 7708 operator * (const DiagMatrix& d, const SparseMatrix& a) |
7709 { | 7709 { |
7710 return octave_impl::do_mul_dm_sm<SparseMatrix> (d, a); | 7710 return do_mul_dm_sm<SparseMatrix> (d, a); |
7711 } | 7711 } |
7712 | 7712 |
7713 SparseMatrix | 7713 SparseMatrix |
7714 operator * (const SparseMatrix& a, const DiagMatrix& d) | 7714 operator * (const SparseMatrix& a, const DiagMatrix& d) |
7715 { | 7715 { |
7716 return octave_impl::do_mul_sm_dm<SparseMatrix> (a, d); | 7716 return do_mul_sm_dm<SparseMatrix> (a, d); |
7717 } | 7717 } |
7718 | 7718 |
7719 SparseMatrix | 7719 SparseMatrix |
7720 operator + (const DiagMatrix& d, const SparseMatrix& a) | 7720 operator + (const DiagMatrix& d, const SparseMatrix& a) |
7721 { | 7721 { |
7722 return octave_impl::do_add_dm_sm<SparseMatrix> (d, a); | 7722 return do_add_dm_sm<SparseMatrix> (d, a); |
7723 } | 7723 } |
7724 | 7724 |
7725 SparseMatrix | 7725 SparseMatrix |
7726 operator - (const DiagMatrix& d, const SparseMatrix& a) | 7726 operator - (const DiagMatrix& d, const SparseMatrix& a) |
7727 { | 7727 { |
7728 return octave_impl::do_sub_dm_sm<SparseMatrix> (d, a); | 7728 return do_sub_dm_sm<SparseMatrix> (d, a); |
7729 } | 7729 } |
7730 | 7730 |
7731 SparseMatrix | 7731 SparseMatrix |
7732 operator + (const SparseMatrix& a, const DiagMatrix& d) | 7732 operator + (const SparseMatrix& a, const DiagMatrix& d) |
7733 { | 7733 { |
7734 return octave_impl::do_add_sm_dm<SparseMatrix> (a, d); | 7734 return do_add_sm_dm<SparseMatrix> (a, d); |
7735 } | 7735 } |
7736 | 7736 |
7737 SparseMatrix | 7737 SparseMatrix |
7738 operator - (const SparseMatrix& a, const DiagMatrix& d) | 7738 operator - (const SparseMatrix& a, const DiagMatrix& d) |
7739 { | 7739 { |
7740 return octave_impl::do_sub_sm_dm<SparseMatrix> (a, d); | 7740 return do_sub_sm_dm<SparseMatrix> (a, d); |
7741 } | 7741 } |
7742 | 7742 |
7743 // FIXME -- it would be nice to share code among the min/max | 7743 // FIXME -- it would be nice to share code among the min/max |
7744 // functions below. | 7744 // functions below. |
7745 | 7745 |