octave: libinterp/operators/op-dm-scm.cc annotate

annotate libinterp/operators/op-dm-scm.cc @ 27919:1891570abac8

update Octave Project Developers copyright for the new year In files that have the "Octave Project Developers" copyright notice, update for 2020.

author	John W. Eaton <jwe@octave.org>
date	Mon, 06 Jan 2020 22:29:51 -0500
parents	b442ec6dda5c
children	bd51beb6205e

rev	line source
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	1 /*
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	2
27919 1891570abac8 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27918 diff changeset	3 Copyright (C) 2009-2020 The Octave Project Developers
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26596 diff changeset	4
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26596 diff changeset	5 See the file COPYRIGHT.md in the top-level directory of this distribution
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26596 diff changeset	6 or <https://octave.org/COPYRIGHT.html/>.
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 26596 diff changeset	7
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	8
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	9 This file is part of Octave.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	10
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	11 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	13 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 (at your option) any later version.
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	15
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	16 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	17 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	19 GNU General Public License for more details.
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	20
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	21 You should have received a copy of the GNU General Public License
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	22 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23220 diff changeset	23 <https://www.gnu.org/licenses/>.
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	24
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	25 */
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	26
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21647 diff changeset	27 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	28 # include "config.h"
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	29 #endif
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	30
19269 65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	31 #include "mx-cm-s.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	32 #include "mx-s-cm.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	33
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	34 #include "mx-dm-cs.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	35 #include "mx-cs-dm.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	36
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	37 #include "mx-m-cs.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	38 #include "mx-cs-m.h"
65554f5847ac don't include oct-locbuf.h in header files unnecessarily John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	39
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 19697 diff changeset	40 #include "ovl.h"
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	41 #include "ov.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	42 #include "ov-typeinfo.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	43 #include "ops.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	44
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	45 #include "ov-re-diag.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	46 #include "ov-cx-diag.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	47 #include "ov-re-sparse.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	48 #include "ov-cx-sparse.h"
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	49
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	50 #include "sparse-xdiv.h"
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	51
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	52 // diagonal matrix by sparse matrix ops
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	53
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	54 DEFBINOP (mul_dm_scm, diag_matrix, sparse_complex_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	55 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	56 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	57 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	58 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	59
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	60 if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	61 // If v2 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	62 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	63 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	64 std::complex<double> d = v2.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	65
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	66 return octave_value (v1.diag_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	67 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	68 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	69 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	70 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	71 SparseComplexMatrix ret = v1.diag_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	72 v2.sparse_complex_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	73 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	74 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	75 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	76 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	77 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	78 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	79
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	80 DEFBINOP (mul_cdm_sm, complex_diag_matrix, sparse_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	81 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	82 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	83 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	84 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	85 = dynamic_cast<const octave_sparse_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	86
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	87 if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	88 // If v2 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	89 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	90 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	91 std::complex<double> d = v2.scalar_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	92
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	93 return octave_value (v1.complex_diag_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	94 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	95 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	96 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	97 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	98 SparseComplexMatrix ret = v1.complex_diag_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	99 v2.sparse_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	100 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	101 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	102 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	103 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	104 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	105 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	106
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	107 DEFBINOP (mul_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	108 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	109 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	110 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	111 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	112 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	113
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	114 if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	115 // If v2 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	116 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	117 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	118 std::complex<double> d = v2.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	119
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	120 return octave_value (v1.complex_diag_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	121 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	122 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	123 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	124 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	125 SparseComplexMatrix ret = v1.complex_diag_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	126 v2.sparse_complex_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	127 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	128 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	129 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	130 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	131 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	132 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	133
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	134 DEFBINOP (ldiv_dm_scm, diag_matrix, sparse_complex_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	135 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	136 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	137 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	138 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	139
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	140 MatrixType typ = v2.matrix_type ();
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	141 return xleftdiv (v1.diag_matrix_value (), v2.sparse_complex_matrix_value (),
9931 fb6b6fcafa62 untabify files in src/OPERATORS directory John W. Eaton <jwe@octave.org> parents: 9732 diff changeset	142 typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	143 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	144
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	145 DEFBINOP (ldiv_cdm_sm, complex_diag_matrix, sparse_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	146 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	147 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	148 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	149 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	150 = dynamic_cast<const octave_sparse_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	151
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	152 MatrixType typ = v2.matrix_type ();
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	153 return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_matrix_value (),
9931 fb6b6fcafa62 untabify files in src/OPERATORS directory John W. Eaton <jwe@octave.org> parents: 9732 diff changeset	154 typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	155 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	156
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	157 DEFBINOP (ldiv_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	158 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	159 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	160 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	161 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	162 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	163
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	164 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	165 return xleftdiv (v1.complex_diag_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	166 v2.sparse_complex_matrix_value (),
9931 fb6b6fcafa62 untabify files in src/OPERATORS directory John W. Eaton <jwe@octave.org> parents: 9732 diff changeset	167 typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	168 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	169
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	170 DEFBINOP (add_dm_scm, diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	171 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	172 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	173 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	174 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	175
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	176 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	177 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	178 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	179 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	180 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	181
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	182 return octave_value (v1.matrix_value () + d);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	183 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	184 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	185 return v1.diag_matrix_value () + v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	186 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	187
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	188 DEFBINOP (add_cdm_sm, complex_diag_matrix, sparse_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	189 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	190 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	191 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	192 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	193 = dynamic_cast<const octave_sparse_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	194
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	195 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	196 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	197 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	198 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	199 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	200
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	201 return octave_value (v1.complex_matrix_value () + d);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	202 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	203 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	204 return v1.complex_diag_matrix_value () + v2.sparse_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	205 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	206
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	207 DEFBINOP (add_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	208 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	209 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	210 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	211 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	212 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	213
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	214 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	215 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	216 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	217 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	218 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	219
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	220 return octave_value (v1.complex_matrix_value () + d);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	221 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	222 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	223 return v1.complex_diag_matrix_value () + v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	224 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	225
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	226 DEFBINOP (sub_dm_scm, diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	227 {
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	228 const octave_diag_matrix& v1 = dynamic_cast<const octave_diag_matrix&> (a1);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	229 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	230 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	231
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	232 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	233 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	234 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	235 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	236 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	237
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	238 return octave_value (v1.matrix_value () + (-d));
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	239 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	240 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	241 return v1.diag_matrix_value () - v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	242 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	243
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	244 DEFBINOP (sub_cdm_sm, complex_diag_matrix, sparse_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	245 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	246 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	247 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	248 const octave_sparse_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	249 = dynamic_cast<const octave_sparse_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	250
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	251 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	252 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	253 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	254 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	255 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	256
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	257 return octave_value (v1.complex_matrix_value () + (-d));
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	258 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	259 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	260 return v1.complex_diag_matrix_value () - v2.sparse_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	261 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	262
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	263 DEFBINOP (sub_cdm_scm, complex_diag_matrix, sparse_complex_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	264 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	265 const octave_complex_diag_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	266 = dynamic_cast<const octave_complex_diag_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	267 const octave_sparse_complex_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	268 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	269
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	270 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	271 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	272 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	273 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	274 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	275
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 8966 diff changeset	276 return octave_value (v1.complex_matrix_value () + (-d));
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	277 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	278 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	279 return v1.complex_diag_matrix_value () - v2.sparse_complex_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	280 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	281
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	282 // sparse matrix by diagonal matrix ops
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	283
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	284 DEFBINOP (mul_scm_dm, sparse_complex_matrix, diag_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	285 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	286 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	287 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	288 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	289
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	290 if (v1.rows () == 1 && v1.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	291 // If v1 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	292 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	293 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	294 std::complex<double> d = v1.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	295
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	296 return octave_value (d * v2.diag_matrix_value ());
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	297 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	298 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	299 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	300 MatrixType typ = v1.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	301 SparseComplexMatrix ret = v1.sparse_complex_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	302 v2.diag_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	303 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	304 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	305 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	306 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	307 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	308 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	309
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	310 DEFBINOP (mul_sm_cdm, sparse_matrix, complex_diag_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	311 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	312 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	313 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	314 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	315 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	316
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	317 if (v1.rows () == 1 && v1.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	318 // If v1 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	319 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	320 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	321 std::complex<double> d = v1.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	322
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	323 return octave_value (d * v2.complex_diag_matrix_value ());
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	324 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	325 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	326 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	327 MatrixType typ = v1.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	328 SparseComplexMatrix ret = v1.sparse_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	329 v2.complex_diag_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	330 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	331 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	332 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	333 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	334 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	335 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	336
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	337 DEFBINOP (mul_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	338 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	339 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	340 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	341 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	342 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	343
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	344 if (v1.rows () == 1 && v1.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	345 // If v1 is a scalar in disguise, return a diagonal matrix rather than
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	346 // a sparse matrix.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	347 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	348 std::complex<double> d = v1.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	349
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	350 return octave_value (d * v2.complex_diag_matrix_value ());
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	351 }
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	352 else if (v2.rows () == 1 && v2.columns () == 1)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	353 // If v2 is a scalar in disguise, don't bother with further dispatching.
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	354 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	355 std::complex<double> d = v2.complex_value ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	356
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	357 return octave_value (v1.sparse_complex_matrix_value () * d);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	358 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	359 else
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	360 {
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	361 MatrixType typ = v1.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	362 SparseComplexMatrix ret = v1.sparse_complex_matrix_value () *
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	363 v2.complex_diag_matrix_value ();
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	364 octave_value out = octave_value (ret);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	365 typ.mark_as_unsymmetric ();
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	366 out.matrix_type (typ);
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	367 return out;
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	368 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	369 }
f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	370
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	371 DEFBINOP (div_scm_dm, sparse_complex_matrix, diag_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	372 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	373 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	374 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	375 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	376
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	377 if (v2.rows () == 1 && v2.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	378 return octave_value (v1.sparse_complex_matrix_value () / v2.scalar_value ());
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	379 else
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	380 {
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	381 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	382 return xdiv (v1.sparse_complex_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	383 v2.diag_matrix_value (), typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	384 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	385 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	386
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	387 DEFBINOP (div_sm_cdm, sparse_matrix, complex_diag_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	388 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	389 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	390 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	391 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	392 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	393
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	394 if (v2.rows () == 1 && v2.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	395 return octave_value (v1.sparse_matrix_value () / v2.complex_value ());
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	396 else
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	397 {
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	398 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	399 return xdiv (v1.sparse_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	400 v2.complex_diag_matrix_value (), typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	401 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	402 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	403
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	404 DEFBINOP (div_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	405 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	406 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	407 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	408 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	409 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	410
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	411 if (v2.rows () == 1 && v2.columns () == 1)
26596 cc0d942d0e20 Remove inconsistent warning "Octave:divide-by-zero" (bug #46650). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 26376 diff changeset	412 return octave_value (v1.sparse_complex_matrix_value () / v2.complex_value ());
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	413 else
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	414 {
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	415 MatrixType typ = v2.matrix_type ();
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	416 return xdiv (v1.sparse_complex_matrix_value (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	417 v2.complex_diag_matrix_value (), typ);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	418 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	419 }
42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	420
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	421 DEFBINOP (add_sm_cdm, sparse_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	422 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	423 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	424 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	425 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	426 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	427
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	428 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	429 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	430 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	431 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	432 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	433
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	434 return octave_value (v1.sparse_matrix_value () + d);
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	435 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	436 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	437 return v1.sparse_matrix_value () + v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	438 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	439
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	440 DEFBINOP (add_scm_dm, sparse_complex_matrix, diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	441 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	442 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	443 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	444 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	445
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	446 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	447 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	448 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	449 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	450 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	451
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	452 return octave_value (v1.sparse_complex_matrix_value () + d);
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	453 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	454 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	455 return v1.sparse_complex_matrix_value () + v2.diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	456 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	457
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	458 DEFBINOP (add_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	459 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	460 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	461 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	462 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	463 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	464
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	465 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	466 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	467 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	468 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	469 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	470
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	471 return octave_value (v1.sparse_complex_matrix_value () + d);
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	472 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	473 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	474 return v1.sparse_complex_matrix_value () + v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	475 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	476
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	477 DEFBINOP (sub_sm_cdm, sparse_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	478 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	479 const octave_sparse_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	480 = dynamic_cast<const octave_sparse_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	481 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	482 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	483
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	484 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	485 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	486 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	487 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	488 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	489
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	490 return octave_value (v1.sparse_matrix_value () + (-d));
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	491 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	492 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	493 return v1.sparse_matrix_value () - v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	494 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	495
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	496 DEFBINOP (sub_scm_dm, sparse_complex_matrix, diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	497 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	498 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	499 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
21647 66cae7a6dc47 eliminate some macros for operator definitions John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	500 const octave_diag_matrix& v2 = dynamic_cast<const octave_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	501
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	502 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	503 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	504 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	505 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	506 double d = v2.scalar_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	507
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	508 return octave_value (v1.sparse_complex_matrix_value () + (-d));
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	509 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	510 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	511 return v1.sparse_complex_matrix_value () - v2.diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	512 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	513
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	514 DEFBINOP (sub_scm_cdm, sparse_complex_matrix, complex_diag_matrix)
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	515 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	516 const octave_sparse_complex_matrix& v1
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	517 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	518 const octave_complex_diag_matrix& v2
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	519 = dynamic_cast<const octave_complex_diag_matrix&> (a2);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	520
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	521 if (v2.rows () == 1 && v2.columns () == 1)
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	522 // If v2 is a scalar in disguise, return a diagonal matrix rather than
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	523 // a sparse matrix.
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	524 {
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	525 std::complex<double> d = v2.complex_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	526
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	527 return octave_value (v1.sparse_complex_matrix_value () + (-d));
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	528 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	529 else
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	530 return v1.sparse_complex_matrix_value () - v2.complex_diag_matrix_value ();
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	531 }
1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	532
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	533 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	534 install_dm_scm_ops (octave::type_info& ti)
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	535 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	536 INSTALL_BINOP_TI (ti, op_mul, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	537 mul_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	538 INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	539 mul_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	540 INSTALL_BINOP_TI (ti, op_mul, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	541 octave_sparse_complex_matrix, mul_cdm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	542 INSTALL_BINOP_TI (ti, op_ldiv, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	543 ldiv_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	544 INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	545 ldiv_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	546 INSTALL_BINOP_TI (ti, op_ldiv, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	547 octave_sparse_complex_matrix, ldiv_cdm_scm);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	548
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	549 INSTALL_BINOP_TI (ti, op_add, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	550 add_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	551 INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	552 add_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	553 INSTALL_BINOP_TI (ti, op_add, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	554 octave_sparse_complex_matrix, add_cdm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	555 INSTALL_BINOP_TI (ti, op_sub, octave_diag_matrix, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	556 sub_dm_scm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	557 INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix, octave_sparse_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	558 sub_cdm_sm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	559 INSTALL_BINOP_TI (ti, op_sub, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	560 octave_sparse_complex_matrix, sub_cdm_scm);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	561
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	562 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	563 mul_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	564 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	565 mul_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	566 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	567 octave_complex_diag_matrix, mul_scm_cdm);
8965 42aff15e059b Implement diag \ sparse and sparse / diag. Jason Riedy <jason@acm.org> parents: 8964 diff changeset	568
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	569 INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	570 div_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	571 INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	572 div_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	573 INSTALL_BINOP_TI (ti, op_div, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	574 octave_complex_diag_matrix, div_scm_cdm);
8966 1bba53c0a38d Implement diag + sparse, diag - sparse, sparse + diag, sparse - diag. Jason Riedy <jason@acm.org> parents: 8965 diff changeset	575
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	576 INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	577 add_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	578 INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	579 add_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	580 INSTALL_BINOP_TI (ti, op_add, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	581 octave_complex_diag_matrix, add_scm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	582 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix, octave_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	583 sub_scm_dm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	584 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_complex_diag_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	585 sub_sm_cdm);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	586 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_complex_matrix,
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	587 octave_complex_diag_matrix, sub_scm_cdm);
8964 f4f4d65faaa0 Implement sparse * diagonal and diagonal * sparse operations, double-prec only. Jason Riedy <jason@acm.org> parents: diff changeset	588 }

Mercurial > octave

annotate libinterp/operators/op-dm-scm.cc @ 27919:1891570abac8