Mercurial > octave
annotate libinterp/operators/op-cs-cm.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 | |
|
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
27 #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
|
28 #include "ovl.h" |
| 2928 | 29 #include "ov.h" |
| 30 #include "ov-complex.h" | |
| 31 #include "ov-cx-mat.h" | |
| 32 #include "ov-typeinfo.h" | |
| 33 #include "ops.h" | |
| 34 #include "xdiv.h" | |
| 35 #include "xpow.h" | |
| 36 | |
| 37 // complex scalar by complex matrix ops. | |
| 38 | |
| 4550 | 39 DEFNDBINOP_OP (add, complex, complex_matrix, complex, complex_array, +) |
| 40 DEFNDBINOP_OP (sub, complex, complex_matrix, complex, complex_array, -) | |
| 41 DEFNDBINOP_OP (mul, complex, complex_matrix, complex, complex_array, *) | |
| 2928 | 42 |
| 43 DEFBINOP (div, complex, complex_matrix) | |
| 44 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
45 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
|
46 const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); |
| 3766 | 47 |
| 48 ComplexMatrix m1 = v1.complex_matrix_value (); | |
| 49 ComplexMatrix m2 = v2.complex_matrix_value (); | |
| 5785 | 50 MatrixType typ = v2.matrix_type (); |
| 3766 | 51 |
| 5785 | 52 ComplexMatrix ret = xdiv (m1, m2, typ); |
| 53 | |
| 54 v2.matrix_type (typ); | |
| 55 return ret; | |
| 2928 | 56 } |
| 57 | |
| 58 DEFBINOP_FN (pow, complex, complex_matrix, xpow) | |
| 59 | |
| 60 DEFBINOP (ldiv, complex, complex_matrix) | |
| 61 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
62 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
|
63 const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); |
| 2928 | 64 |
| 65 Complex d = v1.complex_value (); | |
| 66 | |
| 67 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
|
68 warn_divide_by_zero (); |
| 2928 | 69 |
| 4550 | 70 return octave_value (v2.complex_array_value () / d); |
| 2928 | 71 } |
| 72 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
73 DEFNDCMPLXCMPOP_FN (lt, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
74 mx_el_lt) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
75 DEFNDCMPLXCMPOP_FN (le, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
76 mx_el_le) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
77 DEFNDCMPLXCMPOP_FN (eq, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
78 mx_el_eq) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
79 DEFNDCMPLXCMPOP_FN (ge, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
80 mx_el_ge) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
81 DEFNDCMPLXCMPOP_FN (gt, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
82 mx_el_gt) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
83 DEFNDCMPLXCMPOP_FN (ne, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
84 mx_el_ne) |
| 2928 | 85 |
| 4550 | 86 DEFNDBINOP_OP (el_mul, complex, complex_matrix, complex, complex_array, *) |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
87 DEFNDBINOP_FN (el_div, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
88 x_el_div) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
89 DEFNDBINOP_FN (el_pow, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
90 elem_xpow) |
| 2928 | 91 |
| 92 DEFBINOP (el_ldiv, complex, complex_matrix) | |
| 93 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
94 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
|
95 const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); |
| 2928 | 96 |
| 97 Complex d = v1.complex_value (); | |
| 98 | |
| 99 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
|
100 warn_divide_by_zero (); |
| 2928 | 101 |
| 4550 | 102 return octave_value (v2.complex_array_value () / d); |
| 2928 | 103 } |
| 104 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
105 DEFNDBINOP_FN (el_and, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
106 mx_el_and) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
107 DEFNDBINOP_FN (el_or, complex, complex_matrix, complex, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
108 mx_el_or) |
| 2928 | 109 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
110 DEFNDCATOP_FN (cs_cm, complex, complex_matrix, complex_array, complex_array, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
111 concat) |
| 4915 | 112 |
| 2928 | 113 DEFCONV (complex_matrix_conv, complex, complex_matrix) |
| 114 { | |
|
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
115 const octave_complex& v = dynamic_cast<const octave_complex&> (a); |
| 2928 | 116 |
| 117 return new octave_complex_matrix (v.complex_matrix_value ()); | |
| 118 } | |
| 119 | |
| 120 void | |
| 121 install_cs_cm_ops (void) | |
| 122 { | |
| 3538 | 123 INSTALL_BINOP (op_add, octave_complex, octave_complex_matrix, add); |
| 124 INSTALL_BINOP (op_sub, octave_complex, octave_complex_matrix, sub); | |
| 125 INSTALL_BINOP (op_mul, octave_complex, octave_complex_matrix, mul); | |
| 126 INSTALL_BINOP (op_div, octave_complex, octave_complex_matrix, div); | |
| 127 INSTALL_BINOP (op_pow, octave_complex, octave_complex_matrix, pow); | |
| 128 INSTALL_BINOP (op_ldiv, octave_complex, octave_complex_matrix, ldiv); | |
| 129 INSTALL_BINOP (op_lt, octave_complex, octave_complex_matrix, lt); | |
| 130 INSTALL_BINOP (op_le, octave_complex, octave_complex_matrix, le); | |
| 131 INSTALL_BINOP (op_eq, octave_complex, octave_complex_matrix, eq); | |
| 132 INSTALL_BINOP (op_ge, octave_complex, octave_complex_matrix, ge); | |
| 133 INSTALL_BINOP (op_gt, octave_complex, octave_complex_matrix, gt); | |
| 134 INSTALL_BINOP (op_ne, octave_complex, octave_complex_matrix, ne); | |
| 135 INSTALL_BINOP (op_el_mul, octave_complex, octave_complex_matrix, el_mul); | |
| 136 INSTALL_BINOP (op_el_div, octave_complex, octave_complex_matrix, el_div); | |
| 137 INSTALL_BINOP (op_el_pow, octave_complex, octave_complex_matrix, el_pow); | |
| 138 INSTALL_BINOP (op_el_ldiv, octave_complex, octave_complex_matrix, el_ldiv); | |
| 139 INSTALL_BINOP (op_el_and, octave_complex, octave_complex_matrix, el_and); | |
| 140 INSTALL_BINOP (op_el_or, octave_complex, octave_complex_matrix, el_or); | |
| 2928 | 141 |
| 4915 | 142 INSTALL_CATOP (octave_complex, octave_complex_matrix, cs_cm); |
| 143 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
144 INSTALL_ASSIGNCONV (octave_complex, octave_complex_matrix, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
145 octave_complex_matrix); |
| 2928 | 146 |
| 3540 | 147 INSTALL_WIDENOP (octave_complex, octave_complex_matrix, complex_matrix_conv); |
| 2928 | 148 } |