Mercurial > octave
annotate libinterp/operators/op-cs-m.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:
17744
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 | |
4544 | 27 #include "mx-cs-nda.h" |
28 #include "mx-nda-cs.h" | |
29 #include "mx-cs-nda.h" | |
30 #include "mx-nda-cs.h" | |
2928 | 31 |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
32 #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
|
33 #include "ovl.h" |
2928 | 34 #include "ov.h" |
35 #include "ov-complex.h" | |
36 #include "ov-cx-mat.h" | |
37 #include "ov-re-mat.h" | |
38 #include "ov-typeinfo.h" | |
39 #include "ops.h" | |
40 #include "xdiv.h" | |
41 #include "xpow.h" | |
42 | |
43 // complex scalar by matrix ops. | |
44 | |
4543 | 45 DEFNDBINOP_OP (add, complex, matrix, complex, array, +) |
46 DEFNDBINOP_OP (sub, complex, matrix, complex, array, -) | |
47 DEFNDBINOP_OP (mul, complex, matrix, complex, array, *) | |
2928 | 48 |
49 DEFBINOP (div, complex, 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_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
3766 | 53 |
54 ComplexMatrix m1 = v1.complex_matrix_value (); | |
55 Matrix m2 = v2.matrix_value (); | |
5785 | 56 MatrixType typ = v2.matrix_type (); |
3766 | 57 |
5785 | 58 ComplexMatrix ret = xdiv (m1, m2, typ); |
59 | |
60 v2.matrix_type (typ); | |
61 return ret; | |
2928 | 62 } |
63 | |
64 DEFBINOP_FN (pow, complex, matrix, xpow) | |
65 | |
66 DEFBINOP (ldiv, complex, matrix) | |
67 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
68 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
|
69 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
2928 | 70 |
71 Complex d = v1.complex_value (); | |
72 | |
73 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
|
74 warn_divide_by_zero (); |
2928 | 75 |
4543 | 76 return octave_value (v2.array_value () / d); |
2928 | 77 } |
78 | |
9588
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
79 DEFNDCMPLXCMPOP_FN (lt, complex, matrix, complex, array, mx_el_lt) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
80 DEFNDCMPLXCMPOP_FN (le, complex, matrix, complex, array, mx_el_le) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
81 DEFNDCMPLXCMPOP_FN (eq, complex, matrix, complex, array, mx_el_eq) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
82 DEFNDCMPLXCMPOP_FN (ge, complex, matrix, complex, array, mx_el_ge) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
83 DEFNDCMPLXCMPOP_FN (gt, complex, matrix, complex, array, mx_el_gt) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
84 DEFNDCMPLXCMPOP_FN (ne, complex, matrix, complex, array, mx_el_ne) |
2928 | 85 |
4543 | 86 DEFNDBINOP_OP (el_mul, complex, matrix, complex, array, *) |
87 DEFNDBINOP_FN (el_div, complex, matrix, complex, array, x_el_div) | |
88 DEFNDBINOP_FN (el_pow, complex, matrix, complex, array, elem_xpow) | |
2928 | 89 |
90 DEFBINOP (el_ldiv, complex, matrix) | |
91 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
92 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
|
93 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
2928 | 94 |
95 Complex d = v1.complex_value (); | |
96 | |
97 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
|
98 warn_divide_by_zero (); |
2928 | 99 |
4543 | 100 return octave_value (v2.array_value () / d); |
2928 | 101 } |
102 | |
4543 | 103 DEFNDBINOP_FN (el_and, complex, matrix, complex, array, mx_el_and) |
104 DEFNDBINOP_FN (el_or, complex, matrix, complex, array, mx_el_or) | |
2928 | 105 |
4915 | 106 DEFNDCATOP_FN (cs_m, complex, matrix, complex_array, array, concat) |
107 | |
2928 | 108 void |
109 install_cs_m_ops (void) | |
110 { | |
3538 | 111 INSTALL_BINOP (op_add, octave_complex, octave_matrix, add); |
112 INSTALL_BINOP (op_sub, octave_complex, octave_matrix, sub); | |
113 INSTALL_BINOP (op_mul, octave_complex, octave_matrix, mul); | |
114 INSTALL_BINOP (op_div, octave_complex, octave_matrix, div); | |
115 INSTALL_BINOP (op_pow, octave_complex, octave_matrix, pow); | |
116 INSTALL_BINOP (op_ldiv, octave_complex, octave_matrix, ldiv); | |
117 INSTALL_BINOP (op_lt, octave_complex, octave_matrix, lt); | |
118 INSTALL_BINOP (op_le, octave_complex, octave_matrix, le); | |
119 INSTALL_BINOP (op_eq, octave_complex, octave_matrix, eq); | |
120 INSTALL_BINOP (op_ge, octave_complex, octave_matrix, ge); | |
121 INSTALL_BINOP (op_gt, octave_complex, octave_matrix, gt); | |
122 INSTALL_BINOP (op_ne, octave_complex, octave_matrix, ne); | |
123 INSTALL_BINOP (op_el_mul, octave_complex, octave_matrix, el_mul); | |
124 INSTALL_BINOP (op_el_div, octave_complex, octave_matrix, el_div); | |
125 INSTALL_BINOP (op_el_pow, octave_complex, octave_matrix, el_pow); | |
126 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_matrix, el_ldiv); | |
127 INSTALL_BINOP (op_el_and, octave_complex, octave_matrix, el_and); | |
128 INSTALL_BINOP (op_el_or, octave_complex, octave_matrix, el_or); | |
2928 | 129 |
4915 | 130 INSTALL_CATOP (octave_complex, octave_matrix, cs_m); |
131 | |
2928 | 132 INSTALL_ASSIGNCONV (octave_complex, octave_matrix, octave_complex_matrix); |
133 } |