Mercurial > octave
annotate libinterp/operators/op-m-s.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-re-mat.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
31 #include "ov-flt-re-mat.h" |
13160
6abc581bf2c9
Define missing real double -> float complex assignment operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
11523
diff
changeset
|
32 #include "ov-flt-cx-mat.h" |
2928 | 33 #include "ov-scalar.h" |
34 #include "ov-typeinfo.h" | |
35 #include "ops.h" | |
36 #include "xdiv.h" | |
37 #include "xpow.h" | |
38 | |
39 // matrix by scalar ops. | |
40 | |
4543 | 41 DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +) |
42 DEFNDBINOP_OP (sub, matrix, scalar, array, scalar, -) | |
43 DEFNDBINOP_OP (mul, matrix, scalar, array, scalar, *) | |
2928 | 44 |
45 DEFBINOP (div, matrix, scalar) | |
46 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
47 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
48 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 49 |
50 double d = v2.double_value (); | |
51 | |
52 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
|
53 warn_divide_by_zero (); |
2928 | 54 |
4543 | 55 return octave_value (v1.array_value () / d); |
2928 | 56 } |
57 | |
58 DEFBINOP_FN (pow, matrix, scalar, xpow) | |
59 | |
60 DEFBINOP (ldiv, matrix, scalar) | |
61 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
62 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
63 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
3766 | 64 |
65 Matrix m1 = v1.matrix_value (); | |
66 Matrix m2 = v2.matrix_value (); | |
5785 | 67 MatrixType typ = v1.matrix_type (); |
3766 | 68 |
5785 | 69 Matrix ret = xleftdiv (m1, m2, typ); |
70 | |
71 v1.matrix_type (typ); | |
72 return ret; | |
2928 | 73 } |
74 | |
4543 | 75 DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt) |
76 DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le) | |
77 DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq) | |
78 DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge) | |
79 DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt) | |
80 DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne) | |
2928 | 81 |
4543 | 82 DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *) |
2928 | 83 |
84 DEFBINOP (el_div, matrix, scalar) | |
85 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
86 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
87 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 88 |
89 double d = v2.double_value (); | |
90 | |
91 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
|
92 warn_divide_by_zero (); |
2928 | 93 |
4543 | 94 return octave_value (v1.array_value () / d); |
2928 | 95 } |
96 | |
4543 | 97 DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow) |
2928 | 98 |
99 DEFBINOP (el_ldiv, matrix, scalar) | |
100 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
101 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
102 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 103 |
4543 | 104 return x_el_div (v2.double_value (), v1.array_value ()); |
2928 | 105 } |
106 | |
4543 | 107 DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) |
108 DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or) | |
2928 | 109 |
4915 | 110 DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat) |
111 | |
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
112 DEFNDASSIGNOP_FN (assign, matrix, scalar, scalar, assign) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
113 DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_scalar, assign) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
114 DEFNDASSIGNOP_FN (clx_sgl_assign, float_complex_matrix, scalar, float_complex, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
115 assign) |
2928 | 116 |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
117 DEFNDASSIGNOP_OP (assign_add, matrix, scalar, scalar, +=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
118 DEFNDASSIGNOP_OP (assign_sub, matrix, scalar, scalar, -=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
119 DEFNDASSIGNOP_OP (assign_mul, matrix, scalar, scalar, *=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
120 DEFNDASSIGNOP_OP (assign_div, matrix, scalar, scalar, /=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
121 |
2928 | 122 void |
123 install_m_s_ops (void) | |
124 { | |
3538 | 125 INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); |
126 INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); | |
127 INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); | |
128 INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); | |
129 INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); | |
130 INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); | |
4543 | 131 |
132 // INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); | |
133 | |
134 octave_value_typeinfo::register_binary_op | |
135 (octave_value::op_lt, octave_matrix::static_type_id (), | |
136 octave_scalar::static_type_id (), oct_binop_lt); | |
137 | |
3538 | 138 INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); |
139 INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); | |
140 INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); | |
141 INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); | |
142 INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); | |
143 INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); | |
144 INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); | |
145 INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); | |
146 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); | |
147 INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); | |
148 INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); | |
2928 | 149 |
4915 | 150 INSTALL_CATOP (octave_matrix, octave_scalar, m_s); |
151 | |
3538 | 152 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_scalar, assign); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
153 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
154 INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_scalar, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
155 clx_sgl_assign); |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
156 |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
157 INSTALL_ASSIGNOP (op_add_eq, octave_matrix, octave_scalar, assign_add); |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
158 INSTALL_ASSIGNOP (op_sub_eq, octave_matrix, octave_scalar, assign_sub); |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
159 INSTALL_ASSIGNOP (op_mul_eq, octave_matrix, octave_scalar, assign_mul); |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
160 INSTALL_ASSIGNOP (op_div_eq, octave_matrix, octave_scalar, assign_div); |
2928 | 161 } |