Mercurial > octave
annotate libinterp/operators/op-sm-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 "ov-re-mat.h" | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
33 #include "ov-null-mat.h" |
| 5164 | 34 #include "ops.h" |
| 35 | |
| 36 #include "sparse-xpow.h" | |
| 37 #include "sparse-xdiv.h" | |
| 38 #include "ov-re-sparse.h" | |
| 39 | |
| 40 // sparse matrix unary ops. | |
| 41 | |
| 42 DEFUNOP_OP (not, sparse_matrix, !) | |
| 43 DEFUNOP_OP (uplus, sparse_matrix, /* no-op */) | |
| 44 DEFUNOP_OP (uminus, sparse_matrix, -) | |
| 45 | |
| 46 DEFUNOP (transpose, sparse_matrix) | |
| 47 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
48 const octave_sparse_matrix& v = dynamic_cast<const octave_sparse_matrix&> (a); |
|
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
|
49 return octave_value (v.sparse_matrix_value ().transpose (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
50 v.matrix_type ().transpose ()); |
| 5164 | 51 } |
| 52 | |
| 53 // sparse matrix by sparse matrix ops. | |
| 54 | |
| 55 DEFBINOP_OP (add, sparse_matrix, sparse_matrix, +) | |
| 7342 | 56 |
| 57 // DEFBINOP_OP (sub, sparse_matrix, sparse_matrix, -) | |
| 58 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
59 static octave_value |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
60 oct_binop_sub (const octave_base_value& a1, const octave_base_value& a2) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
61 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
62 const octave_sparse_matrix& v1 = |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
63 dynamic_cast<const octave_sparse_matrix&> (a1); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
64 const octave_sparse_matrix& v2 = |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
65 dynamic_cast<const octave_sparse_matrix&> (a2); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
66 SparseMatrix m = v1.sparse_matrix_value () - v2.sparse_matrix_value (); |
| 7342 | 67 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
68 return octave_value (m); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
69 } |
| 7342 | 70 |
| 5164 | 71 DEFBINOP_OP (mul, sparse_matrix, sparse_matrix, *) |
| 72 | |
| 5322 | 73 DEFBINOP (div, sparse_matrix, sparse_matrix) |
| 74 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
75 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
76 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 6221 | 77 |
|
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
|
78 if (v2.rows () == 1 && v2.columns () == 1) |
| 6221 | 79 { |
| 80 double d = v2.scalar_value (); | |
| 81 | |
| 82 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
|
83 warn_divide_by_zero (); |
| 6221 | 84 |
| 85 return octave_value (v1.sparse_matrix_value () / d); | |
| 86 } | |
| 87 else | |
| 88 { | |
| 89 MatrixType typ = v2.matrix_type (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
90 SparseMatrix ret = xdiv (v1.sparse_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
91 v2.sparse_matrix_value (), typ); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
92 |
| 6221 | 93 v2.matrix_type (typ); |
| 94 return ret; | |
| 95 } | |
| 5322 | 96 } |
| 5164 | 97 |
| 98 DEFBINOPX (pow, sparse_matrix, sparse_matrix) | |
| 99 { | |
| 100 error ("can't do A ^ B for A and B both matrices"); | |
| 101 } | |
| 102 | |
| 5322 | 103 DEFBINOP (ldiv, sparse_matrix, sparse_matrix) |
| 104 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
105 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
106 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 6221 | 107 |
|
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
|
108 if (v1.rows () == 1 && v1.columns () == 1) |
| 6221 | 109 { |
| 110 double d = v1.double_value (); | |
| 111 | |
| 112 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
|
113 warn_divide_by_zero (); |
| 5322 | 114 |
| 6221 | 115 return octave_value (v2.sparse_matrix_value () / d); |
| 116 } | |
| 117 else | |
| 118 { | |
| 119 MatrixType typ = v1.matrix_type (); | |
| 5322 | 120 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
121 SparseMatrix ret = xleftdiv (v1.sparse_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
122 v2.sparse_matrix_value (), typ); |
| 6221 | 123 |
| 124 v1.matrix_type (typ); | |
| 125 return ret; | |
| 126 } | |
| 5322 | 127 } |
| 5164 | 128 |
| 129 DEFBINOP_FN (lt, sparse_matrix, sparse_matrix, mx_el_lt) | |
| 130 DEFBINOP_FN (le, sparse_matrix, sparse_matrix, mx_el_le) | |
| 131 DEFBINOP_FN (eq, sparse_matrix, sparse_matrix, mx_el_eq) | |
| 132 DEFBINOP_FN (ge, sparse_matrix, sparse_matrix, mx_el_ge) | |
| 133 DEFBINOP_FN (gt, sparse_matrix, sparse_matrix, mx_el_gt) | |
| 134 DEFBINOP_FN (ne, sparse_matrix, sparse_matrix, mx_el_ne) | |
| 135 | |
| 136 DEFBINOP_FN (el_mul, sparse_matrix, sparse_matrix, product) | |
| 137 DEFBINOP_FN (el_div, sparse_matrix, sparse_matrix, quotient) | |
| 138 | |
| 139 DEFBINOP_FN (el_pow, sparse_matrix, sparse_matrix, elem_xpow) | |
| 140 | |
| 141 DEFBINOP (el_ldiv, sparse_matrix, sparse_matrix) | |
| 142 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
143 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
144 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 145 return octave_value |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
146 (quotient (v2.sparse_matrix_value (), v1.sparse_matrix_value ())); |
| 5164 | 147 } |
| 148 | |
| 149 DEFBINOP_FN (el_and, sparse_matrix, sparse_matrix, mx_el_and) | |
| 150 DEFBINOP_FN (el_or, sparse_matrix, sparse_matrix, mx_el_or) | |
| 151 | |
| 152 DEFCATOP_FN (sm_sm, sparse_matrix, sparse_matrix, concat) | |
| 153 | |
| 154 DEFASSIGNOP_FN (assign, sparse_matrix, sparse_matrix, assign) | |
| 155 | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
156 DEFNULLASSIGNOP_FN (null_assign, sparse_matrix, delete_elements) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
157 |
| 5164 | 158 void |
| 159 install_sm_sm_ops (void) | |
| 160 { | |
| 161 INSTALL_UNOP (op_not, octave_sparse_matrix, not); | |
| 162 INSTALL_UNOP (op_uplus, octave_sparse_matrix, uplus); | |
| 163 INSTALL_UNOP (op_uminus, octave_sparse_matrix, uminus); | |
| 164 INSTALL_UNOP (op_transpose, octave_sparse_matrix, transpose); | |
| 165 INSTALL_UNOP (op_hermitian, octave_sparse_matrix, transpose); | |
| 166 | |
| 167 INSTALL_BINOP (op_add, octave_sparse_matrix, octave_sparse_matrix, add); | |
| 168 INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_sparse_matrix, sub); | |
| 169 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_sparse_matrix, mul); | |
| 170 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_sparse_matrix, div); | |
| 171 INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_sparse_matrix, pow); | |
| 172 INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_sparse_matrix, ldiv); | |
| 173 INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_sparse_matrix, lt); | |
| 174 INSTALL_BINOP (op_le, octave_sparse_matrix, octave_sparse_matrix, le); | |
| 175 INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_sparse_matrix, eq); | |
| 176 INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_sparse_matrix, ge); | |
| 177 INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_sparse_matrix, gt); | |
| 178 INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_sparse_matrix, ne); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
179 INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
180 el_mul); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
181 INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
182 el_div); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
183 INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
184 el_pow); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
185 INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
186 el_ldiv); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
187 INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
188 el_and); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
189 INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
190 el_or); |
| 5164 | 191 |
| 192 INSTALL_CATOP (octave_sparse_matrix, octave_sparse_matrix, sm_sm); | |
| 193 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
194 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
195 assign); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
196 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
197 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_matrix, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
198 null_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
199 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_str, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
200 null_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
201 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_sq_str, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
202 null_assign); |
| 5164 | 203 } |