comparison src/operators/op-fm-fm.cc @ 15057:46b19589b593

maint: Partition src/ directory with more code in subdirs. Create new octave-value dir for ov* code. Create new parse-tre dir for pt* code. Move OPERATORS and TEMPLATE-INST directories to lowercase names * octave-value/module.mk: Hook code in octave-value dir into build system. * octave-value/ov-base-diag.cc, octave-value/ov-base-diag.h, octave-value/ov-base-int.cc, octave-value/ov-base-int.h, octave-value/ov-base-mat.cc, octave-value/ov-base-mat.h, octave-value/ov-base-scalar.cc, octave-value/ov-base-scalar.h, octave-value/ov-base-sparse.cc, octave-value/ov-base-sparse.h, octave-value/ov-base.cc, octave-value/ov-base.h, octave-value/ov-bool-mat.cc, octave-value/ov-bool-mat.h, octave-value/ov-bool-sparse.cc, octave-value/ov-bool-sparse.h, octave-value/ov-bool.cc, octave-value/ov-bool.h, octave-value/ov-builtin.cc, octave-value/ov-builtin.h, octave-value/ov-cell.cc, octave-value/ov-cell.h, octave-value/ov-ch-mat.cc, octave-value/ov-ch-mat.h, octave-value/ov-class.cc, octave-value/ov-class.h, octave-value/ov-colon.cc, octave-value/ov-colon.h, octave-value/ov-complex.cc, octave-value/ov-complex.h, octave-value/ov-cs-list.cc, octave-value/ov-cs-list.h, octave-value/ov-cx-diag.cc, octave-value/ov-cx-diag.h, octave-value/ov-cx-mat.cc, octave-value/ov-cx-mat.h, octave-value/ov-cx-sparse.cc, octave-value/ov-cx-sparse.h, octave-value/ov-dld-fcn.cc, octave-value/ov-dld-fcn.h, octave-value/ov-fcn-handle.cc, octave-value/ov-fcn-handle.h, octave-value/ov-fcn-inline.cc, octave-value/ov-fcn-inline.h, octave-value/ov-fcn.cc, octave-value/ov-fcn.h, octave-value/ov-float.cc, octave-value/ov-float.h, octave-value/ov-flt-complex.cc, octave-value/ov-flt-complex.h, octave-value/ov-flt-cx-diag.cc, octave-value/ov-flt-cx-diag.h, octave-value/ov-flt-cx-mat.cc, octave-value/ov-flt-cx-mat.h, octave-value/ov-flt-re-diag.cc, octave-value/ov-flt-re-diag.h, octave-value/ov-flt-re-mat.cc, octave-value/ov-flt-re-mat.h, octave-value/ov-int-traits.h, octave-value/ov-int16.cc, octave-value/ov-int16.h, octave-value/ov-int32.cc, octave-value/ov-int32.h, octave-value/ov-int64.cc, octave-value/ov-int64.h, octave-value/ov-int8.cc, octave-value/ov-int8.h, octave-value/ov-intx.h, octave-value/ov-lazy-idx.cc, octave-value/ov-lazy-idx.h, octave-value/ov-mex-fcn.cc, octave-value/ov-mex-fcn.h, octave-value/ov-null-mat.cc, octave-value/ov-null-mat.h, octave-value/ov-oncleanup.cc, octave-value/ov-oncleanup.h, octave-value/ov-perm.cc, octave-value/ov-perm.h, octave-value/ov-range.cc, octave-value/ov-range.h, octave-value/ov-re-diag.cc, octave-value/ov-re-diag.h, octave-value/ov-re-mat.cc, octave-value/ov-re-mat.h, octave-value/ov-re-sparse.cc, octave-value/ov-re-sparse.h, octave-value/ov-scalar.cc, octave-value/ov-scalar.h, octave-value/ov-str-mat.cc, octave-value/ov-str-mat.h, octave-value/ov-struct.cc, octave-value/ov-struct.h, octave-value/ov-type-conv.h, octave-value/ov-typeinfo.cc, octave-value/ov-typeinfo.h, octave-value/ov-uint16.cc, octave-value/ov-uint16.h, octave-value/ov-uint32.cc, octave-value/ov-uint32.h, octave-value/ov-uint64.cc, octave-value/ov-uint64.h, octave-value/ov-uint8.cc, octave-value/ov-uint8.h, octave-value/ov-usr-fcn.cc, octave-value/ov-usr-fcn.h, octave-value/ov.cc, octave-value/ov.h: Moved from src/ dir to octave-value dir. * operators/module.mk, operators/op-b-b.cc, operators/op-b-bm.cc, operators/op-b-sbm.cc, operators/op-bm-b.cc, operators/op-bm-bm.cc, operators/op-bm-sbm.cc, operators/op-cdm-cdm.cc, operators/op-cdm-cm.cc, operators/op-cdm-cs.cc, operators/op-cdm-dm.cc, operators/op-cdm-m.cc, operators/op-cdm-s.cc, operators/op-cell.cc, operators/op-chm.cc, operators/op-class.cc, operators/op-cm-cdm.cc, operators/op-cm-cm.cc, operators/op-cm-cs.cc, operators/op-cm-dm.cc, operators/op-cm-m.cc, operators/op-cm-pm.cc, operators/op-cm-s.cc, operators/op-cm-scm.cc, operators/op-cm-sm.cc, operators/op-cs-cm.cc, operators/op-cs-cs.cc, operators/op-cs-m.cc, operators/op-cs-s.cc, operators/op-cs-scm.cc, operators/op-cs-sm.cc, operators/op-dm-cdm.cc, operators/op-dm-cm.cc, operators/op-dm-cs.cc, operators/op-dm-dm.cc, operators/op-dm-m.cc, operators/op-dm-s.cc, operators/op-dm-scm.cc, operators/op-dm-sm.cc, operators/op-dm-template.cc, operators/op-dms-template.cc, operators/op-double-conv.cc, operators/op-fcdm-fcdm.cc, operators/op-fcdm-fcm.cc, operators/op-fcdm-fcs.cc, operators/op-fcdm-fdm.cc, operators/op-fcdm-fm.cc, operators/op-fcdm-fs.cc, operators/op-fcm-fcdm.cc, operators/op-fcm-fcm.cc, operators/op-fcm-fcs.cc, operators/op-fcm-fdm.cc, operators/op-fcm-fm.cc, operators/op-fcm-fs.cc, operators/op-fcm-pm.cc, operators/op-fcn.cc, operators/op-fcs-fcm.cc, operators/op-fcs-fcs.cc, operators/op-fcs-fm.cc, operators/op-fcs-fs.cc, operators/op-fdm-fcdm.cc, operators/op-fdm-fcm.cc, operators/op-fdm-fcs.cc, operators/op-fdm-fdm.cc, operators/op-fdm-fm.cc, operators/op-fdm-fs.cc, operators/op-float-conv.cc, operators/op-fm-fcdm.cc, operators/op-fm-fcm.cc, operators/op-fm-fcs.cc, operators/op-fm-fdm.cc, operators/op-fm-fm.cc, operators/op-fm-fs.cc, operators/op-fm-pm.cc, operators/op-fs-fcm.cc, operators/op-fs-fcs.cc, operators/op-fs-fm.cc, operators/op-fs-fs.cc, operators/op-i16-i16.cc, operators/op-i32-i32.cc, operators/op-i64-i64.cc, operators/op-i8-i8.cc, operators/op-int-concat.cc, operators/op-int-conv.cc, operators/op-int.h, operators/op-m-cdm.cc, operators/op-m-cm.cc, operators/op-m-cs.cc, operators/op-m-dm.cc, operators/op-m-m.cc, operators/op-m-pm.cc, operators/op-m-s.cc, operators/op-m-scm.cc, operators/op-m-sm.cc, operators/op-pm-cm.cc, operators/op-pm-fcm.cc, operators/op-pm-fm.cc, operators/op-pm-m.cc, operators/op-pm-pm.cc, operators/op-pm-scm.cc, operators/op-pm-sm.cc, operators/op-pm-template.cc, operators/op-range.cc, operators/op-s-cm.cc, operators/op-s-cs.cc, operators/op-s-m.cc, operators/op-s-s.cc, operators/op-s-scm.cc, operators/op-s-sm.cc, operators/op-sbm-b.cc, operators/op-sbm-bm.cc, operators/op-sbm-sbm.cc, operators/op-scm-cm.cc, operators/op-scm-cs.cc, operators/op-scm-m.cc, operators/op-scm-s.cc, operators/op-scm-scm.cc, operators/op-scm-sm.cc, operators/op-sm-cm.cc, operators/op-sm-cs.cc, operators/op-sm-m.cc, operators/op-sm-s.cc, operators/op-sm-scm.cc, operators/op-sm-sm.cc, operators/op-str-m.cc, operators/op-str-s.cc, operators/op-str-str.cc, operators/op-struct.cc, operators/op-ui16-ui16.cc, operators/op-ui32-ui32.cc, operators/op-ui64-ui64.cc, operators/op-ui8-ui8.cc: Moved from OPERATORS/ dir to operators/ directory. * mkops: Correctly print comment in generated file ops.cc that it is made by mkops. Change sed expression for OPERATORS/ to operators/. * parse-tree/module.mk: Hook code in parse-tree dir into build system. * parse-tree/pt-all.h, parse-tree/pt-arg-list.cc, parse-tree/pt-arg-list.h, parse-tree/pt-assign.cc, parse-tree/pt-assign.h, parse-tree/pt-binop.cc, parse-tree/pt-binop.h, parse-tree/pt-bp.cc, parse-tree/pt-bp.h, parse-tree/pt-cbinop.cc, parse-tree/pt-cbinop.h, parse-tree/pt-cell.cc, parse-tree/pt-cell.h, parse-tree/pt-check.cc, parse-tree/pt-check.h, parse-tree/pt-cmd.cc, parse-tree/pt-cmd.h, parse-tree/pt-colon.cc, parse-tree/pt-colon.h, parse-tree/pt-const.cc, parse-tree/pt-const.h, parse-tree/pt-decl.cc, parse-tree/pt-decl.h, parse-tree/pt-eval.cc, parse-tree/pt-eval.h, parse-tree/pt-except.cc, parse-tree/pt-except.h, parse-tree/pt-exp.cc, parse-tree/pt-exp.h, parse-tree/pt-fcn-handle.cc, parse-tree/pt-fcn-handle.h, parse-tree/pt-id.cc, parse-tree/pt-id.h, parse-tree/pt-idx.cc, parse-tree/pt-idx.h, parse-tree/pt-jump.cc, parse-tree/pt-jump.h, parse-tree/pt-loop.cc, parse-tree/pt-loop.h, parse-tree/pt-mat.cc, parse-tree/pt-mat.h, parse-tree/pt-misc.cc, parse-tree/pt-misc.h, parse-tree/pt-pr-code.cc, parse-tree/pt-pr-code.h, parse-tree/pt-select.cc, parse-tree/pt-select.h, parse-tree/pt-stmt.cc, parse-tree/pt-stmt.h, parse-tree/pt-unop.cc, parse-tree/pt-unop.h, parse-tree/pt-walk.h, parse-tree/pt.cc, parse-tree/pt.h: Moved from src/ dir to parse-tree dir. * template-inst/Array-jit.cc, template-inst/Array-os.cc, template-inst/Array-sym.cc, template-inst/Array-tc.cc, template-inst/module.mk: Moved from TEMPLATE-INST dir to template-inst/ directory. * src/Makefile.am: Add new directories to build system. * corefcn/module.mk: Use COREFCN_SRC with all capitals to indicate it is not an Automake special target.
author Rik <rik@octave.org>
date Mon, 30 Jul 2012 15:29:19 -0700
parents src/OPERATORS/op-fm-fm.cc@460a3c6d8bf1
children
comparison
equal deleted inserted replaced
15056:bc32288f4a42 15057:46b19589b593
1 /*
2
3 Copyright (C) 1996-2012 John W. Eaton
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
9 Free Software Foundation; either version 3 of the License, or (at your
10 option) any later version.
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
18 along with Octave; see the file COPYING. If not, see
19 <http://www.gnu.org/licenses/>.
20
21 */
22
23 #ifdef HAVE_CONFIG_H
24 #include <config.h>
25 #endif
26
27 #include "gripes.h"
28 #include "oct-obj.h"
29 #include "ov.h"
30 #include "ov-re-mat.h"
31 #include "ov-flt-re-mat.h"
32 #include "ov-typeinfo.h"
33 #include "ov-null-mat.h"
34 #include "ops.h"
35 #include "xdiv.h"
36 #include "xpow.h"
37
38 // matrix unary ops.
39
40 DEFNDUNOP_OP (not, float_matrix, float_array, !)
41 DEFNDUNOP_OP (uplus, float_matrix, float_array, /* no-op */)
42 DEFNDUNOP_OP (uminus, float_matrix, float_array, -)
43
44 DEFUNOP (transpose, float_matrix)
45 {
46 CAST_UNOP_ARG (const octave_float_matrix&);
47
48 if (v.ndims () > 2)
49 {
50 error ("transpose not defined for N-d objects");
51 return octave_value ();
52 }
53 else
54 return octave_value (v.float_matrix_value ().transpose ());
55 }
56
57 DEFNCUNOP_METHOD (incr, float_matrix, increment)
58 DEFNCUNOP_METHOD (decr, float_matrix, decrement)
59 DEFNCUNOP_METHOD (changesign, float_matrix, changesign)
60
61 // matrix by matrix ops.
62
63 DEFNDBINOP_OP (add, float_matrix, float_matrix, float_array, float_array, +)
64 DEFNDBINOP_OP (sub, float_matrix, float_matrix, float_array, float_array, -)
65
66 DEFBINOP_OP (mul, float_matrix, float_matrix, *)
67
68 DEFBINOP (div, float_matrix, float_matrix)
69 {
70 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&);
71 MatrixType typ = v2.matrix_type ();
72
73 FloatMatrix ret = xdiv (v1.float_matrix_value (),
74 v2.float_matrix_value (), typ);
75
76 v2.matrix_type (typ);
77 return ret;
78 }
79
80 DEFBINOPX (pow, float_matrix, float_matrix)
81 {
82 error ("can't do A ^ B for A and B both matrices");
83 return octave_value ();
84 }
85
86 DEFBINOP (ldiv, float_matrix, float_matrix)
87 {
88 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&);
89 MatrixType typ = v1.matrix_type ();
90
91 FloatMatrix ret = xleftdiv (v1.float_matrix_value (),
92 v2.float_matrix_value (), typ);
93
94 v1.matrix_type (typ);
95 return ret;
96 }
97
98 DEFBINOP (trans_mul, float_matrix, float_matrix)
99 {
100 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&);
101 return octave_value(xgemm (v1.float_matrix_value (),
102 v2.float_matrix_value (),
103 blas_trans, blas_no_trans));
104 }
105
106 DEFBINOP (mul_trans, float_matrix, float_matrix)
107 {
108 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&);
109 return octave_value(xgemm (v1.float_matrix_value (),
110 v2.float_matrix_value (),
111 blas_no_trans, blas_trans));
112 }
113
114 DEFBINOP (trans_ldiv, float_matrix, float_matrix)
115 {
116 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&);
117 MatrixType typ = v1.matrix_type ();
118
119 FloatMatrix ret = xleftdiv (v1.float_matrix_value (),
120 v2.float_matrix_value (), typ, blas_trans);
121
122 v1.matrix_type (typ);
123 return ret;
124 }
125
126 DEFNDBINOP_FN (lt, float_matrix, float_matrix, float_array,
127 float_array, mx_el_lt)
128 DEFNDBINOP_FN (le, float_matrix, float_matrix, float_array,
129 float_array, mx_el_le)
130 DEFNDBINOP_FN (eq, float_matrix, float_matrix, float_array,
131 float_array, mx_el_eq)
132 DEFNDBINOP_FN (ge, float_matrix, float_matrix, float_array,
133 float_array, mx_el_ge)
134 DEFNDBINOP_FN (gt, float_matrix, float_matrix, float_array,
135 float_array, mx_el_gt)
136 DEFNDBINOP_FN (ne, float_matrix, float_matrix, float_array,
137 float_array, mx_el_ne)
138
139 DEFNDBINOP_FN (el_mul, float_matrix, float_matrix, float_array,
140 float_array, product)
141 DEFNDBINOP_FN (el_div, float_matrix, float_matrix, float_array,
142 float_array, quotient)
143 DEFNDBINOP_FN (el_pow, float_matrix, float_matrix, float_array,
144 float_array, elem_xpow)
145
146 DEFBINOP (el_ldiv, float_matrix, float_matrix)
147 {
148 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&);
149
150 return octave_value (quotient (v2.float_array_value (),
151 v1.float_array_value ()));
152 }
153
154 DEFNDBINOP_FN (el_and, float_matrix, float_matrix, float_array,
155 float_array, mx_el_and)
156 DEFNDBINOP_FN (el_or, float_matrix, float_matrix, float_array,
157 float_array, mx_el_or)
158 DEFNDBINOP_FN (el_not_and, float_matrix, float_matrix, float_array,
159 float_array, mx_el_not_and)
160 DEFNDBINOP_FN (el_not_or, float_matrix, float_matrix, float_array,
161 float_array, mx_el_not_or)
162 DEFNDBINOP_FN (el_and_not, float_matrix, float_matrix, float_array,
163 float_array, mx_el_and_not)
164 DEFNDBINOP_FN (el_or_not, float_matrix, float_matrix, float_array,
165 float_array, mx_el_or_not)
166
167
168
169 DEFNDCATOP_FN (fm_fm, float_matrix, float_matrix, float_array,
170 float_array, concat)
171
172 DEFNDCATOP_FN (m_fm, matrix, float_matrix, float_array, float_array, concat)
173
174 DEFNDCATOP_FN (fm_m, float_matrix, matrix, float_array, float_array, concat)
175
176 DEFNDASSIGNOP_FN (assign, float_matrix, float_matrix, float_array, assign)
177
178 DEFNDASSIGNOP_FN (dbl_assign, matrix, float_matrix, array, assign)
179
180 DEFNULLASSIGNOP_FN (null_assign, float_matrix, delete_elements)
181
182 DEFNDASSIGNOP_OP (assign_add, float_matrix, float_matrix, float_array, +=)
183 DEFNDASSIGNOP_OP (assign_sub, float_matrix, float_matrix, float_array, -=)
184 DEFNDASSIGNOP_FNOP (assign_el_mul, float_matrix, float_matrix, float_array, product_eq)
185 DEFNDASSIGNOP_FNOP (assign_el_div, float_matrix, float_matrix, float_array, quotient_eq)
186
187 CONVDECL (float_matrix_to_matrix)
188 {
189 CAST_CONV_ARG (const octave_float_matrix&);
190
191 return new octave_matrix (v.array_value ());
192 }
193
194 void
195 install_fm_fm_ops (void)
196 {
197 INSTALL_UNOP (op_not, octave_float_matrix, not);
198 INSTALL_UNOP (op_uplus, octave_float_matrix, uplus);
199 INSTALL_UNOP (op_uminus, octave_float_matrix, uminus);
200 INSTALL_UNOP (op_transpose, octave_float_matrix, transpose);
201 INSTALL_UNOP (op_hermitian, octave_float_matrix, transpose);
202
203 INSTALL_NCUNOP (op_incr, octave_float_matrix, incr);
204 INSTALL_NCUNOP (op_decr, octave_float_matrix, decr);
205 INSTALL_NCUNOP (op_uminus, octave_float_matrix, changesign);
206
207 INSTALL_BINOP (op_add, octave_float_matrix, octave_float_matrix, add);
208 INSTALL_BINOP (op_sub, octave_float_matrix, octave_float_matrix, sub);
209 INSTALL_BINOP (op_mul, octave_float_matrix, octave_float_matrix, mul);
210 INSTALL_BINOP (op_div, octave_float_matrix, octave_float_matrix, div);
211 INSTALL_BINOP (op_pow, octave_float_matrix, octave_float_matrix, pow);
212 INSTALL_BINOP (op_ldiv, octave_float_matrix, octave_float_matrix, ldiv);
213 INSTALL_BINOP (op_lt, octave_float_matrix, octave_float_matrix, lt);
214 INSTALL_BINOP (op_le, octave_float_matrix, octave_float_matrix, le);
215 INSTALL_BINOP (op_eq, octave_float_matrix, octave_float_matrix, eq);
216 INSTALL_BINOP (op_ge, octave_float_matrix, octave_float_matrix, ge);
217 INSTALL_BINOP (op_gt, octave_float_matrix, octave_float_matrix, gt);
218 INSTALL_BINOP (op_ne, octave_float_matrix, octave_float_matrix, ne);
219 INSTALL_BINOP (op_el_mul, octave_float_matrix, octave_float_matrix, el_mul);
220 INSTALL_BINOP (op_el_div, octave_float_matrix, octave_float_matrix, el_div);
221 INSTALL_BINOP (op_el_pow, octave_float_matrix, octave_float_matrix, el_pow);
222 INSTALL_BINOP (op_el_ldiv, octave_float_matrix, octave_float_matrix, el_ldiv);
223 INSTALL_BINOP (op_el_and, octave_float_matrix, octave_float_matrix, el_and);
224 INSTALL_BINOP (op_el_or, octave_float_matrix, octave_float_matrix, el_or);
225 INSTALL_BINOP (op_el_and_not, octave_float_matrix, octave_float_matrix, el_and_not);
226 INSTALL_BINOP (op_el_or_not, octave_float_matrix, octave_float_matrix, el_or_not);
227 INSTALL_BINOP (op_el_not_and, octave_float_matrix, octave_float_matrix, el_not_and);
228 INSTALL_BINOP (op_el_not_or, octave_float_matrix, octave_float_matrix, el_not_or);
229 INSTALL_BINOP (op_trans_mul, octave_float_matrix, octave_float_matrix, trans_mul);
230 INSTALL_BINOP (op_mul_trans, octave_float_matrix, octave_float_matrix, mul_trans);
231 INSTALL_BINOP (op_herm_mul, octave_float_matrix, octave_float_matrix, trans_mul);
232 INSTALL_BINOP (op_mul_herm, octave_float_matrix, octave_float_matrix, mul_trans);
233 INSTALL_BINOP (op_trans_ldiv, octave_float_matrix, octave_float_matrix, trans_ldiv);
234 INSTALL_BINOP (op_herm_ldiv, octave_float_matrix, octave_float_matrix, trans_ldiv);
235
236 INSTALL_CATOP (octave_float_matrix, octave_float_matrix, fm_fm);
237 INSTALL_CATOP (octave_matrix, octave_float_matrix, m_fm);
238 INSTALL_CATOP (octave_float_matrix, octave_matrix, fm_m);
239
240 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix,
241 octave_float_matrix, assign);
242 INSTALL_ASSIGNOP (op_asn_eq, octave_matrix,
243 octave_float_matrix, dbl_assign);
244
245 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_null_matrix, null_assign);
246 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_null_str, null_assign);
247 INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_null_sq_str, null_assign);
248
249 INSTALL_ASSIGNOP (op_add_eq, octave_float_matrix, octave_float_matrix, assign_add);
250 INSTALL_ASSIGNOP (op_sub_eq, octave_float_matrix, octave_float_matrix, assign_sub);
251 INSTALL_ASSIGNOP (op_el_mul_eq, octave_float_matrix, octave_float_matrix, assign_el_mul);
252 INSTALL_ASSIGNOP (op_el_div_eq, octave_float_matrix, octave_float_matrix, assign_el_div);
253
254 INSTALL_CONVOP (octave_float_matrix, octave_matrix, float_matrix_to_matrix);
255 }