Mercurial > octave
annotate src/OPERATORS/op-m-s.cc @ 13160:6abc581bf2c9 stable
Define missing real double -> float complex assignment operators
* op-fcm-fcm.cc: Define new dbl_assign matrix operator, rename old to
dbl_clx_assign. (install_fcm_fcm_ops): Install it.
* op-m-s.cc: Define new clx_sgl_assign scalar operator.
(install_m_s_ops): Install it.
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Mon, 19 Sep 2011 00:56:05 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
11523 | 3 Copyright (C) 1996-2011 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 | |
24 #include <config.h> | |
25 #endif | |
26 | |
27 #include "gripes.h" | |
4055 | 28 #include "oct-obj.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 { | |
47 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
48 | |
49 double d = v2.double_value (); | |
50 | |
51 if (d == 0.0) | |
52 gripe_divide_by_zero (); | |
53 | |
4543 | 54 return octave_value (v1.array_value () / d); |
2928 | 55 } |
56 | |
57 DEFBINOP_FN (pow, matrix, scalar, xpow) | |
58 | |
59 DEFBINOP (ldiv, matrix, scalar) | |
60 { | |
3766 | 61 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); |
62 | |
63 Matrix m1 = v1.matrix_value (); | |
64 Matrix m2 = v2.matrix_value (); | |
5785 | 65 MatrixType typ = v1.matrix_type (); |
3766 | 66 |
5785 | 67 Matrix ret = xleftdiv (m1, m2, typ); |
68 | |
69 v1.matrix_type (typ); | |
70 return ret; | |
2928 | 71 } |
72 | |
4543 | 73 DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt) |
74 DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le) | |
75 DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq) | |
76 DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge) | |
77 DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt) | |
78 DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne) | |
2928 | 79 |
4543 | 80 DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *) |
2928 | 81 |
82 DEFBINOP (el_div, matrix, scalar) | |
83 { | |
84 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
85 | |
86 double d = v2.double_value (); | |
87 | |
88 if (d == 0.0) | |
89 gripe_divide_by_zero (); | |
90 | |
4543 | 91 return octave_value (v1.array_value () / d); |
2928 | 92 } |
93 | |
4543 | 94 DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow) |
2928 | 95 |
96 DEFBINOP (el_ldiv, matrix, scalar) | |
97 { | |
98 CAST_BINOP_ARGS (const octave_matrix&, const octave_scalar&); | |
99 | |
4543 | 100 return x_el_div (v2.double_value (), v1.array_value ()); |
2928 | 101 } |
102 | |
4543 | 103 DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) |
104 DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or) | |
2928 | 105 |
4915 | 106 DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat) |
107 | |
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
108 DEFNDASSIGNOP_FN (assign, matrix, scalar, scalar, assign) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
109 DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_scalar, assign) |
13160
6abc581bf2c9
Define missing real double -> float complex assignment operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
11523
diff
changeset
|
110 DEFNDASSIGNOP_FN (clx_sgl_assign, float_complex_matrix, scalar, float_complex, assign) |
2928 | 111 |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
112 DEFNDASSIGNOP_OP (assign_add, matrix, scalar, scalar, +=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
113 DEFNDASSIGNOP_OP (assign_sub, matrix, scalar, scalar, -=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
114 DEFNDASSIGNOP_OP (assign_mul, matrix, scalar, scalar, *=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
115 DEFNDASSIGNOP_OP (assign_div, matrix, scalar, scalar, /=) |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
116 |
2928 | 117 void |
118 install_m_s_ops (void) | |
119 { | |
3538 | 120 INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); |
121 INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); | |
122 INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); | |
123 INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); | |
124 INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); | |
125 INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); | |
4543 | 126 |
127 // INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); | |
128 | |
129 octave_value_typeinfo::register_binary_op | |
130 (octave_value::op_lt, octave_matrix::static_type_id (), | |
131 octave_scalar::static_type_id (), oct_binop_lt); | |
132 | |
3538 | 133 INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); |
134 INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); | |
135 INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); | |
136 INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); | |
137 INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); | |
138 INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); | |
139 INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); | |
140 INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); | |
141 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); | |
142 INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); | |
143 INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); | |
2928 | 144 |
4915 | 145 INSTALL_CATOP (octave_matrix, octave_scalar, m_s); |
146 | |
3538 | 147 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
|
148 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); |
13160
6abc581bf2c9
Define missing real double -> float complex assignment operators
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
11523
diff
changeset
|
149 INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_scalar, clx_sgl_assign); |
9546
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
150 |
1beb23d2b892
optimize op= in common cases
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
151 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
|
152 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
|
153 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
|
154 INSTALL_ASSIGNOP (op_div_eq, octave_matrix, octave_scalar, assign_div); |
2928 | 155 } |