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