Mercurial > octave
annotate libinterp/operators/op-cs-cs.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 |
---|---|
2928 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
2928 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
2928 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
2928 | 20 |
21 */ | |
22 | |
23 #ifdef HAVE_CONFIG_H | |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
24 # include "config.h" |
2928 | 25 #endif |
26 | |
9551
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
27 #include "Array-util.h" |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
28 |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21024
diff
changeset
|
29 #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
|
30 #include "ovl.h" |
2928 | 31 #include "ov.h" |
32 #include "ov-complex.h" | |
33 #include "ov-cx-mat.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
34 #include "ov-flt-cx-mat.h" |
2928 | 35 #include "ov-typeinfo.h" |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
36 #include "ov-null-mat.h" |
2928 | 37 #include "ops.h" |
38 #include "xdiv.h" | |
39 #include "xpow.h" | |
40 | |
3203 | 41 // unary complex scalar ops. |
42 | |
43 DEFUNOP (not, complex) | |
44 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
45 const octave_complex& v = dynamic_cast<const octave_complex&> (a); |
9551
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
46 Complex x = v.complex_value (); |
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
47 if (xisnan (x)) |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21024
diff
changeset
|
48 err_nan_to_logical_conversion (); |
21024
6176560b03d9
maint: Remove return stmts after gripe function calls.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
49 |
9551
19d298e6f7e5
make ! operator check for NaNs, simplify implementations in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
50 return octave_value (x == 0.0); |
3203 | 51 } |
52 | |
4965 | 53 DEFUNOP_OP (uplus, complex, /* no-op */) |
3203 | 54 DEFUNOP_OP (uminus, complex, -) |
55 DEFUNOP_OP (transpose, complex, /* no-op */) | |
56 | |
57 DEFUNOP (hermitian, complex) | |
58 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
59 const octave_complex& v = dynamic_cast<const octave_complex&> (a); |
3203 | 60 |
61 return octave_value (conj (v.complex_value ())); | |
62 } | |
63 | |
64 DEFNCUNOP_METHOD (incr, complex, increment) | |
65 DEFNCUNOP_METHOD (decr, complex, decrement) | |
66 | |
2928 | 67 // complex scalar by complex scalar ops. |
68 | |
69 DEFBINOP_OP (add, complex, complex, +) | |
70 DEFBINOP_OP (sub, complex, complex, -) | |
71 DEFBINOP_OP (mul, complex, complex, *) | |
72 | |
73 DEFBINOP (div, complex, complex) | |
74 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
75 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
|
76 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
2928 | 77 |
78 Complex d = v2.complex_value (); | |
79 | |
80 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21024
diff
changeset
|
81 warn_divide_by_zero (); |
2928 | 82 |
83 return octave_value (v1.complex_value () / d); | |
84 } | |
85 | |
86 DEFBINOP_FN (pow, complex, complex, xpow) | |
87 | |
88 DEFBINOP (ldiv, complex, complex) | |
89 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
90 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
|
91 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
2928 | 92 |
93 Complex d = v1.complex_value (); | |
94 | |
95 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21024
diff
changeset
|
96 warn_divide_by_zero (); |
2928 | 97 |
98 return octave_value (v2.complex_value () / d); | |
99 } | |
100 | |
9588
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9579
diff
changeset
|
101 DEFCMPLXCMPOP_OP (lt, complex, complex, <) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9579
diff
changeset
|
102 DEFCMPLXCMPOP_OP (le, complex, complex, <=) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9579
diff
changeset
|
103 DEFCMPLXCMPOP_OP (eq, complex, complex, ==) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9579
diff
changeset
|
104 DEFCMPLXCMPOP_OP (ge, complex, complex, >=) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9579
diff
changeset
|
105 DEFCMPLXCMPOP_OP (gt, complex, complex, >) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9579
diff
changeset
|
106 DEFCMPLXCMPOP_OP (ne, complex, complex, !=) |
2928 | 107 |
108 DEFBINOP_OP (el_mul, complex, complex, *) | |
109 | |
110 DEFBINOP (el_div, complex, complex) | |
111 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
112 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
|
113 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
2928 | 114 |
115 Complex d = v2.complex_value (); | |
116 | |
117 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21024
diff
changeset
|
118 warn_divide_by_zero (); |
2928 | 119 |
120 return octave_value (v1.complex_value () / d); | |
121 } | |
122 | |
123 DEFBINOP_FN (el_pow, complex, complex, xpow) | |
124 | |
125 DEFBINOP (el_ldiv, complex, complex) | |
126 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
127 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
|
128 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
2928 | 129 |
130 Complex d = v1.complex_value (); | |
131 | |
132 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
21024
diff
changeset
|
133 warn_divide_by_zero (); |
2928 | 134 |
135 return octave_value (v2.complex_value () / d); | |
136 } | |
137 | |
138 DEFBINOP (el_and, complex, complex) | |
139 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
140 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
|
141 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
2928 | 142 |
143 return v1.complex_value () != 0.0 && v2.complex_value () != 0.0; | |
144 } | |
145 | |
146 DEFBINOP (el_or, complex, complex) | |
147 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
148 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
|
149 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
2928 | 150 |
151 return v1.complex_value () != 0.0 || v2.complex_value () != 0.0; | |
152 } | |
153 | |
4915 | 154 DEFNDCATOP_FN (cs_cs, complex, complex, complex_array, complex_array, concat) |
155 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
156 CONVDECL (complex_to_float_complex) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
157 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
158 const octave_complex& v = dynamic_cast<const octave_complex&> (a); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
159 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
160 return new octave_float_complex_matrix (FloatComplexMatrix (1, 1, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
161 static_cast<FloatComplex> |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
162 (v.complex_value ()))); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
163 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
164 |
2928 | 165 void |
166 install_cs_cs_ops (void) | |
167 { | |
3538 | 168 INSTALL_UNOP (op_not, octave_complex, not); |
4965 | 169 INSTALL_UNOP (op_uplus, octave_complex, uplus); |
3538 | 170 INSTALL_UNOP (op_uminus, octave_complex, uminus); |
171 INSTALL_UNOP (op_transpose, octave_complex, transpose); | |
172 INSTALL_UNOP (op_hermitian, octave_complex, hermitian); | |
3203 | 173 |
3538 | 174 INSTALL_NCUNOP (op_incr, octave_complex, incr); |
175 INSTALL_NCUNOP (op_decr, octave_complex, decr); | |
3203 | 176 |
3538 | 177 INSTALL_BINOP (op_add, octave_complex, octave_complex, add); |
178 INSTALL_BINOP (op_sub, octave_complex, octave_complex, sub); | |
179 INSTALL_BINOP (op_mul, octave_complex, octave_complex, mul); | |
180 INSTALL_BINOP (op_div, octave_complex, octave_complex, div); | |
181 INSTALL_BINOP (op_pow, octave_complex, octave_complex, pow); | |
182 INSTALL_BINOP (op_ldiv, octave_complex, octave_complex, ldiv); | |
183 INSTALL_BINOP (op_lt, octave_complex, octave_complex, lt); | |
184 INSTALL_BINOP (op_le, octave_complex, octave_complex, le); | |
185 INSTALL_BINOP (op_eq, octave_complex, octave_complex, eq); | |
186 INSTALL_BINOP (op_ge, octave_complex, octave_complex, ge); | |
187 INSTALL_BINOP (op_gt, octave_complex, octave_complex, gt); | |
188 INSTALL_BINOP (op_ne, octave_complex, octave_complex, ne); | |
189 INSTALL_BINOP (op_el_mul, octave_complex, octave_complex, el_mul); | |
190 INSTALL_BINOP (op_el_div, octave_complex, octave_complex, el_div); | |
191 INSTALL_BINOP (op_el_pow, octave_complex, octave_complex, el_pow); | |
192 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_complex, el_ldiv); | |
193 INSTALL_BINOP (op_el_and, octave_complex, octave_complex, el_and); | |
194 INSTALL_BINOP (op_el_or, octave_complex, octave_complex, el_or); | |
2928 | 195 |
4915 | 196 INSTALL_CATOP (octave_complex, octave_complex, cs_cs); |
197 | |
2928 | 198 INSTALL_ASSIGNCONV (octave_complex, octave_complex, octave_complex_matrix); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
199 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
200 INSTALL_ASSIGNCONV (octave_complex, octave_null_matrix, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
201 octave_complex_matrix); |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
202 INSTALL_ASSIGNCONV (octave_complex, octave_null_str, octave_complex_matrix); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
203 INSTALL_ASSIGNCONV (octave_complex, octave_null_sq_str, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
204 octave_complex_matrix); |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
205 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
206 INSTALL_CONVOP (octave_complex, octave_float_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
207 complex_to_float_complex); |
2928 | 208 } |