Mercurial > octave
annotate libinterp/operators/op-cs-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:
19697
diff
changeset
|
29 #include "ovl.h" |
| 5164 | 30 #include "ov.h" |
| 31 #include "ov-typeinfo.h" | |
| 32 #include "ov-complex.h" | |
| 33 #include "ops.h" | |
| 34 #include "xpow.h" | |
| 35 | |
| 36 #include "sparse-xpow.h" | |
| 37 #include "sparse-xdiv.h" | |
| 38 #include "ov-re-sparse.h" | |
| 39 #include "ov-cx-sparse.h" | |
| 40 #include "smx-cs-sm.h" | |
| 41 #include "smx-sm-cs.h" | |
| 42 | |
| 43 // complex by sparse matrix ops. | |
| 44 | |
| 45 DEFBINOP_OP (add, complex, sparse_matrix, +) | |
| 46 DEFBINOP_OP (sub, complex, sparse_matrix, -) | |
| 47 DEFBINOP_OP (mul, complex, sparse_matrix, *) | |
| 48 | |
| 49 DEFBINOP (div, complex, sparse_matrix) | |
| 50 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
51 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
52 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 53 |
|
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
|
54 if (v2.rows () == 1 && v2.columns () == 1) |
| 6221 | 55 { |
| 56 double d = v2.scalar_value (); | |
| 57 | |
| 58 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
|
59 warn_divide_by_zero (); |
| 5164 | 60 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
61 return octave_value (SparseComplexMatrix (1, 1, v1.complex_value () / d)); |
| 6221 | 62 } |
| 63 else | |
| 64 { | |
| 65 MatrixType typ = v2.matrix_type (); | |
| 66 ComplexMatrix m1 = ComplexMatrix (1, 1, v1.complex_value ()); | |
| 67 SparseMatrix m2 = v2.sparse_matrix_value (); | |
| 68 ComplexMatrix ret = xdiv (m1, m2, typ); | |
| 69 v2.matrix_type (typ); | |
| 70 return ret; | |
| 71 } | |
| 5164 | 72 } |
| 73 | |
| 74 DEFBINOP (pow, complex, sparse_matrix) | |
| 75 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
76 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
77 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 78 return xpow (v1.complex_value (), v2.matrix_value ()); |
| 79 } | |
| 80 | |
| 81 DEFBINOP (ldiv, complex, sparse_matrix) | |
| 82 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
83 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
84 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 85 |
| 86 Complex d = v1.complex_value (); | |
| 87 octave_value retval; | |
| 88 | |
| 89 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
|
90 warn_divide_by_zero (); |
| 5164 | 91 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
92 retval = octave_value (v2.sparse_matrix_value () / d); |
| 5164 | 93 |
| 94 return retval; | |
| 95 } | |
| 96 | |
| 97 DEFBINOP_FN (lt, complex, sparse_matrix, mx_el_lt) | |
| 98 DEFBINOP_FN (le, complex, sparse_matrix, mx_el_le) | |
| 99 DEFBINOP_FN (eq, complex, sparse_matrix, mx_el_eq) | |
| 100 DEFBINOP_FN (ge, complex, sparse_matrix, mx_el_ge) | |
| 101 DEFBINOP_FN (gt, complex, sparse_matrix, mx_el_gt) | |
| 102 DEFBINOP_FN (ne, complex, sparse_matrix, mx_el_ne) | |
| 103 | |
| 104 DEFBINOP_OP (el_mul, complex, sparse_matrix, *) | |
| 105 DEFBINOP_FN (el_div, complex, sparse_matrix, x_el_div) | |
| 106 DEFBINOP_FN (el_pow, complex, sparse_matrix, elem_xpow) | |
| 107 | |
| 108 DEFBINOP (el_ldiv, complex, sparse_matrix) | |
| 109 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
110 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
111 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 112 |
| 113 Complex d = v1.complex_value (); | |
| 114 octave_value retval; | |
| 115 | |
| 116 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
|
117 warn_divide_by_zero (); |
| 5164 | 118 |
|
8835
1685c61542f8
Don't perform narrowing to full matrices in mixed spare scalar operators
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
119 retval = octave_value (v2.sparse_matrix_value () / d); |
| 5164 | 120 |
| 121 return retval; | |
| 122 } | |
| 123 | |
| 124 DEFBINOP_FN (el_and, complex, sparse_matrix, mx_el_and) | |
| 125 DEFBINOP_FN (el_or, complex, sparse_matrix, mx_el_or) | |
| 126 | |
| 127 DEFCATOP (cs_sm, sparse_matrix, complex) | |
| 128 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
129 octave_complex& v1 = dynamic_cast<octave_complex&> (a1); |
|
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
130 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
| 5164 | 131 SparseComplexMatrix tmp (1, 1, v1.complex_value ()); |
| 132 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
| 133 } | |
| 134 | |
| 135 DEFCONV (sparse_matrix_conv, complex, sparse_matrix) | |
| 136 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
137 const octave_complex& v = dynamic_cast<const octave_complex&> (a); |
| 5164 | 138 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
139 return new octave_sparse_matrix |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
140 (SparseMatrix (v.matrix_value ())); |
| 5164 | 141 } |
| 142 | |
| 143 void | |
| 144 install_cs_sm_ops (void) | |
| 145 { | |
| 146 INSTALL_BINOP (op_add, octave_complex, octave_sparse_matrix, add); | |
| 147 INSTALL_BINOP (op_sub, octave_complex, octave_sparse_matrix, sub); | |
| 148 INSTALL_BINOP (op_mul, octave_complex, octave_sparse_matrix, mul); | |
| 149 INSTALL_BINOP (op_div, octave_complex, octave_sparse_matrix, div); | |
| 150 INSTALL_BINOP (op_pow, octave_complex, octave_sparse_matrix, pow); | |
| 151 INSTALL_BINOP (op_ldiv, octave_complex, octave_sparse_matrix, ldiv); | |
| 152 INSTALL_BINOP (op_lt, octave_complex, octave_sparse_matrix, lt); | |
| 153 INSTALL_BINOP (op_le, octave_complex, octave_sparse_matrix, le); | |
| 154 INSTALL_BINOP (op_eq, octave_complex, octave_sparse_matrix, eq); | |
| 155 INSTALL_BINOP (op_ge, octave_complex, octave_sparse_matrix, ge); | |
| 156 INSTALL_BINOP (op_gt, octave_complex, octave_sparse_matrix, gt); | |
| 157 INSTALL_BINOP (op_ne, octave_complex, octave_sparse_matrix, ne); | |
| 158 INSTALL_BINOP (op_el_mul, octave_complex, octave_sparse_matrix, el_mul); | |
| 159 INSTALL_BINOP (op_el_div, octave_complex, octave_sparse_matrix, el_div); | |
| 160 INSTALL_BINOP (op_el_pow, octave_complex, octave_sparse_matrix, el_pow); | |
| 161 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_sparse_matrix, el_ldiv); | |
| 162 INSTALL_BINOP (op_el_and, octave_complex, octave_sparse_matrix, el_and); | |
| 163 INSTALL_BINOP (op_el_or, octave_complex, octave_sparse_matrix, el_or); | |
| 164 | |
| 165 INSTALL_CATOP (octave_complex, octave_sparse_matrix, cs_sm); | |
| 166 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
167 INSTALL_ASSIGNCONV (octave_complex, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
168 octave_complex_matrix); |
| 5164 | 169 |
| 170 INSTALL_WIDENOP (octave_complex, octave_sparse_matrix, sparse_matrix_conv); | |
| 171 } |