Mercurial > octave
annotate libinterp/operators/op-scm-sm.cc @ 21647:66cae7a6dc47
eliminate some macros for operator definitions
* ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL,
NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN,
UNOPDECL, BINOPDECL, CATOPDECL): Delete macros.
* make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc,
ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc,
ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc,
op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-cs.cc,
op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc,
op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc,
op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc,
op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc,
op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc,
op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc,
op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc,
op-fs-fs.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc,
op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc,
op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc,
op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc,
op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc,
op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc,
op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, ops.h:
Expand eliminated macros in place.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 27 Apr 2016 16:13:40 -0400 |
| parents | 40de9f8f23a6 |
| children | aba2e6293dd8 |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
|
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 2004-2015 David Bateman |
| 11523 | 4 Copyright (C) 1998-2004 Andy Adler |
| 7016 | 5 |
| 6 This file is part of Octave. | |
| 5164 | 7 |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 5164 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 5164 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
|
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
25 # include "config.h" |
| 5164 | 26 #endif |
| 27 | |
|
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
28 #include "errwarn.h" |
|
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
29 #include "ovl.h" |
| 5164 | 30 #include "ov.h" |
| 31 #include "ov-typeinfo.h" | |
| 32 #include "ops.h" | |
| 33 | |
| 34 #include "sparse-xdiv.h" | |
| 35 #include "sparse-xpow.h" | |
| 36 #include "smx-sm-scm.h" | |
| 37 #include "smx-scm-sm.h" | |
| 38 #include "ov-re-sparse.h" | |
| 39 #include "ov-cx-sparse.h" | |
| 40 | |
| 41 // sparse complex matrix by sparse matrix ops. | |
| 42 | |
| 43 DEFBINOP_OP (add, sparse_complex_matrix, sparse_matrix, +) | |
| 44 DEFBINOP_OP (sub, sparse_complex_matrix, sparse_matrix, -) | |
| 45 | |
| 46 DEFBINOP_OP (mul, sparse_complex_matrix, sparse_matrix, *) | |
| 47 | |
| 5322 | 48 DEFBINOP (div, sparse_complex_matrix, sparse_matrix) |
| 49 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
50 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
51 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 6221 | 52 |
|
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
|
53 if (v2.rows () == 1 && v2.columns () == 1) |
| 6221 | 54 { |
| 55 double d = v2.scalar_value (); | |
| 56 | |
| 57 if (d == 0.0) | |
|
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
58 warn_divide_by_zero (); |
| 6221 | 59 |
| 60 return octave_value (v1.sparse_complex_matrix_value () / d); | |
| 61 } | |
| 62 else | |
| 63 { | |
| 64 MatrixType typ = v2.matrix_type (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
65 SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
66 v2.sparse_matrix_value (), typ); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
67 |
| 6221 | 68 v2.matrix_type (typ); |
| 69 return ret; | |
| 70 } | |
| 5322 | 71 } |
| 5164 | 72 |
| 73 DEFBINOPX (pow, sparse_complex_matrix, sparse_matrix) | |
| 74 { | |
| 75 error ("can't do A ^ B for A and B both matrices"); | |
| 76 } | |
| 77 | |
| 5322 | 78 DEFBINOP (ldiv, sparse_complex_matrix, sparse_matrix) |
| 79 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
80 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
81 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 6221 | 82 |
|
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
|
83 if (v1.rows () == 1 && v1.columns () == 1) |
| 6221 | 84 { |
| 85 Complex d = v1.complex_value (); | |
| 86 | |
| 87 if (d == 0.0) | |
|
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
88 warn_divide_by_zero (); |
| 5322 | 89 |
| 6221 | 90 return octave_value (v2.sparse_matrix_value () / d); |
| 91 } | |
| 92 else | |
| 93 { | |
| 94 MatrixType typ = v1.matrix_type (); | |
| 5322 | 95 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
96 SparseComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
97 v2.sparse_matrix_value (), typ); |
| 6221 | 98 |
| 99 v1.matrix_type (typ); | |
| 100 return ret; | |
| 101 } | |
| 5322 | 102 } |
| 5164 | 103 |
| 104 DEFBINOP_FN (lt, sparse_complex_matrix, sparse_matrix, mx_el_lt) | |
| 105 DEFBINOP_FN (le, sparse_complex_matrix, sparse_matrix, mx_el_le) | |
| 106 DEFBINOP_FN (eq, sparse_complex_matrix, sparse_matrix, mx_el_eq) | |
| 107 DEFBINOP_FN (ge, sparse_complex_matrix, sparse_matrix, mx_el_ge) | |
| 108 DEFBINOP_FN (gt, sparse_complex_matrix, sparse_matrix, mx_el_gt) | |
| 109 DEFBINOP_FN (ne, sparse_complex_matrix, sparse_matrix, mx_el_ne) | |
| 110 | |
| 111 DEFBINOP_FN (el_mul, sparse_complex_matrix, sparse_matrix, product) | |
| 112 DEFBINOP_FN (el_div, sparse_complex_matrix, sparse_matrix, quotient) | |
| 113 DEFBINOP_FN (el_pow, sparse_complex_matrix, sparse_matrix, elem_xpow) | |
| 114 | |
| 115 DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_matrix) | |
| 116 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
117 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
118 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 119 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
120 return octave_value (quotient (v2.sparse_matrix_value (), |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
121 v1.sparse_complex_matrix_value ())); |
| 5164 | 122 } |
| 123 | |
| 124 DEFBINOP_FN (el_and, sparse_complex_matrix, sparse_matrix, mx_el_and) | |
| 125 DEFBINOP_FN (el_or, sparse_complex_matrix, sparse_matrix, mx_el_or) | |
| 126 | |
| 127 DEFCATOP_FN (scm_sm, sparse_complex_matrix, sparse_matrix, concat) | |
| 128 | |
| 129 DEFASSIGNOP_FN (assign, sparse_complex_matrix, sparse_matrix, assign) | |
| 130 | |
| 131 void | |
| 132 install_scm_sm_ops (void) | |
| 133 { | |
| 134 INSTALL_BINOP (op_add, octave_sparse_complex_matrix, octave_sparse_matrix, | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
135 add); |
| 5164 | 136 INSTALL_BINOP (op_sub, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
137 sub); |
| 5164 | 138 INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
139 mul); |
| 5164 | 140 INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
141 div); |
| 5164 | 142 INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
143 pow); |
| 5164 | 144 INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
145 ldiv); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
146 INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
147 lt); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
148 INSTALL_BINOP (op_le, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
149 le); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
150 INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
151 eq); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
152 INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
153 ge); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
154 INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
155 gt); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
156 INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
157 ne); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
158 INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
159 octave_sparse_matrix, el_mul); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
160 INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
161 octave_sparse_matrix, el_div); |
| 5164 | 162 INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
163 octave_sparse_matrix, el_pow); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
164 INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
165 octave_sparse_matrix, el_ldiv); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
166 INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
167 octave_sparse_matrix, el_and); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
168 INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
169 octave_sparse_matrix, el_or); |
| 5164 | 170 |
| 171 INSTALL_CATOP (octave_sparse_complex_matrix, octave_sparse_matrix, scm_sm); | |
| 172 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
173 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
174 octave_sparse_matrix, assign); |
| 5164 | 175 } |