Mercurial > octave-nkf

comparison liboctave/CSparse.cc @ 8967:5bbbf482909a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
7590 7590
7591 // diag * sparse and sparse * diag 7591 // diag * sparse and sparse * diag
7592 SparseComplexMatrix 7592 SparseComplexMatrix
7593 operator * (const DiagMatrix& d, const SparseComplexMatrix& a) 7593 operator * (const DiagMatrix& d, const SparseComplexMatrix& a)
7594 { 7594 {
7595 return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a); 7595 return do_mul_dm_sm<SparseComplexMatrix> (d, a);
7596 } 7596 }
7597 SparseComplexMatrix 7597 SparseComplexMatrix
7598 operator * (const SparseComplexMatrix& a, const DiagMatrix& d) 7598 operator * (const SparseComplexMatrix& a, const DiagMatrix& d)
7599 { 7599 {
7600 return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); 7600 return do_mul_sm_dm<SparseComplexMatrix> (a, d);
7601 } 7601 }
7602 7602
7603 SparseComplexMatrix 7603 SparseComplexMatrix
7604 operator * (const ComplexDiagMatrix& d, const SparseMatrix& a) 7604 operator * (const ComplexDiagMatrix& d, const SparseMatrix& a)
7605 { 7605 {
7606 return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a); 7606 return do_mul_dm_sm<SparseComplexMatrix> (d, a);
7607 } 7607 }
7608 SparseComplexMatrix 7608 SparseComplexMatrix
7609 operator * (const SparseMatrix& a, const ComplexDiagMatrix& d) 7609 operator * (const SparseMatrix& a, const ComplexDiagMatrix& d)
7610 { 7610 {
7611 return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); 7611 return do_mul_sm_dm<SparseComplexMatrix> (a, d);
7612 } 7612 }
7613 7613
7614 SparseComplexMatrix 7614 SparseComplexMatrix
7615 operator * (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) 7615 operator * (const ComplexDiagMatrix& d, const SparseComplexMatrix& a)
7616 { 7616 {
7617 return octave_impl::do_mul_dm_sm<SparseComplexMatrix> (d, a); 7617 return do_mul_dm_sm<SparseComplexMatrix> (d, a);
7618 } 7618 }
7619 SparseComplexMatrix 7619 SparseComplexMatrix
7620 operator * (const SparseComplexMatrix& a, const ComplexDiagMatrix& d) 7620 operator * (const SparseComplexMatrix& a, const ComplexDiagMatrix& d)
7621 { 7621 {
7622 return octave_impl::do_mul_sm_dm<SparseComplexMatrix> (a, d); 7622 return do_mul_sm_dm<SparseComplexMatrix> (a, d);
7623 } 7623 }
7624 7624
7625 SparseComplexMatrix 7625 SparseComplexMatrix
7626 operator + (const ComplexDiagMatrix& d, const SparseMatrix& a) 7626 operator + (const ComplexDiagMatrix& d, const SparseMatrix& a)
7627 { 7627 {
7628 return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a); 7628 return do_add_dm_sm<SparseComplexMatrix> (d, a);
7629 } 7629 }
7630 SparseComplexMatrix 7630 SparseComplexMatrix
7631 operator + (const DiagMatrix& d, const SparseComplexMatrix& a) 7631 operator + (const DiagMatrix& d, const SparseComplexMatrix& a)
7632 { 7632 {
7633 return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a); 7633 return do_add_dm_sm<SparseComplexMatrix> (d, a);
7634 } 7634 }
7635 SparseComplexMatrix 7635 SparseComplexMatrix
7636 operator + (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) 7636 operator + (const ComplexDiagMatrix& d, const SparseComplexMatrix& a)
7637 { 7637 {
7638 return octave_impl::do_add_dm_sm<SparseComplexMatrix> (d, a); 7638 return do_add_dm_sm<SparseComplexMatrix> (d, a);
7639 } 7639 }
7640 SparseComplexMatrix 7640 SparseComplexMatrix
7641 operator + (const SparseMatrix& a, const ComplexDiagMatrix& d) 7641 operator + (const SparseMatrix& a, const ComplexDiagMatrix& d)
7642 { 7642 {
7643 return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d); 7643 return do_add_sm_dm<SparseComplexMatrix> (a, d);
7644 } 7644 }
7645 SparseComplexMatrix 7645 SparseComplexMatrix
7646 operator + (const SparseComplexMatrix& a, const DiagMatrix& d) 7646 operator + (const SparseComplexMatrix& a, const DiagMatrix& d)
7647 { 7647 {
7648 return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d); 7648 return do_add_sm_dm<SparseComplexMatrix> (a, d);
7649 } 7649 }
7650 SparseComplexMatrix 7650 SparseComplexMatrix
7651 operator + (const SparseComplexMatrix&a, const ComplexDiagMatrix& d) 7651 operator + (const SparseComplexMatrix&a, const ComplexDiagMatrix& d)
7652 { 7652 {
7653 return octave_impl::do_add_sm_dm<SparseComplexMatrix> (a, d); 7653 return do_add_sm_dm<SparseComplexMatrix> (a, d);
7654 } 7654 }
7655 7655
7656 SparseComplexMatrix 7656 SparseComplexMatrix
7657 operator - (const ComplexDiagMatrix& d, const SparseMatrix& a) 7657 operator - (const ComplexDiagMatrix& d, const SparseMatrix& a)
7658 { 7658 {
7659 return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a); 7659 return do_sub_dm_sm<SparseComplexMatrix> (d, a);
7660 } 7660 }
7661 SparseComplexMatrix 7661 SparseComplexMatrix
7662 operator - (const DiagMatrix& d, const SparseComplexMatrix& a) 7662 operator - (const DiagMatrix& d, const SparseComplexMatrix& a)
7663 { 7663 {
7664 return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a); 7664 return do_sub_dm_sm<SparseComplexMatrix> (d, a);
7665 } 7665 }
7666 SparseComplexMatrix 7666 SparseComplexMatrix
7667 operator - (const ComplexDiagMatrix& d, const SparseComplexMatrix& a) 7667 operator - (const ComplexDiagMatrix& d, const SparseComplexMatrix& a)
7668 { 7668 {
7669 return octave_impl::do_sub_dm_sm<SparseComplexMatrix> (d, a); 7669 return do_sub_dm_sm<SparseComplexMatrix> (d, a);
7670 } 7670 }
7671 SparseComplexMatrix 7671 SparseComplexMatrix
7672 operator - (const SparseMatrix& a, const ComplexDiagMatrix& d) 7672 operator - (const SparseMatrix& a, const ComplexDiagMatrix& d)
7673 { 7673 {
7674 return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d); 7674 return do_sub_sm_dm<SparseComplexMatrix> (a, d);
7675 } 7675 }
7676 SparseComplexMatrix 7676 SparseComplexMatrix
7677 operator - (const SparseComplexMatrix& a, const DiagMatrix& d) 7677 operator - (const SparseComplexMatrix& a, const DiagMatrix& d)
7678 { 7678 {
7679 return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d); 7679 return do_sub_sm_dm<SparseComplexMatrix> (a, d);
7680 } 7680 }
7681 SparseComplexMatrix 7681 SparseComplexMatrix
7682 operator - (const SparseComplexMatrix&a, const ComplexDiagMatrix& d) 7682 operator - (const SparseComplexMatrix&a, const ComplexDiagMatrix& d)
7683 { 7683 {
7684 return octave_impl::do_sub_sm_dm<SparseComplexMatrix> (a, d); 7684 return do_sub_sm_dm<SparseComplexMatrix> (a, d);
7685 } 7685 }
7686 7686
7687 // FIXME -- it would be nice to share code among the min/max 7687 // FIXME -- it would be nice to share code among the min/max
7688 // functions below. 7688 // functions below.
7689 7689