Mercurial > hg > octave-lyh
comparison src/operators/op-fcm-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-fcm-fm.cc@72c96de7a403 |
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 "mx-fcm-fm.h" | |
28 #include "mx-fm-fcm.h" | |
29 #include "mx-fcnda-fnda.h" | |
30 #include "mx-fnda-fcnda.h" | |
31 | |
32 #include "gripes.h" | |
33 #include "oct-obj.h" | |
34 #include "ov.h" | |
35 #include "ov-cx-mat.h" | |
36 #include "ov-flt-cx-mat.h" | |
37 #include "ov-flt-re-mat.h" | |
38 #include "ov-re-mat.h" | |
39 #include "ov-typeinfo.h" | |
40 #include "ops.h" | |
41 #include "xdiv.h" | |
42 #include "xpow.h" | |
43 | |
44 // complex matrix by matrix ops. | |
45 | |
46 DEFNDBINOP_OP (add, float_complex_matrix, float_matrix, float_complex_array, float_array, +) | |
47 DEFNDBINOP_OP (sub, float_complex_matrix, float_matrix, float_complex_array, float_array, -) | |
48 | |
49 DEFBINOP_OP (mul, float_complex_matrix, float_matrix, *) | |
50 | |
51 DEFBINOP (mul_trans, float_complex_matrix, float_matrix) | |
52 { | |
53 CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_matrix&); | |
54 | |
55 FloatComplexMatrix m1 = v1.float_complex_matrix_value (); | |
56 FloatMatrix m2 = v2.float_matrix_value (); | |
57 | |
58 return FloatComplexMatrix (xgemm (real (m1), m2, blas_no_trans, blas_trans), | |
59 xgemm (imag (m1), m2, blas_no_trans, blas_trans)); | |
60 } | |
61 | |
62 DEFBINOP (div, float_complex_matrix, float_matrix) | |
63 { | |
64 CAST_BINOP_ARGS (const octave_float_complex_matrix&, | |
65 const octave_float_matrix&); | |
66 MatrixType typ = v2.matrix_type (); | |
67 | |
68 FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), | |
69 v2.float_matrix_value (), typ); | |
70 | |
71 v2.matrix_type (typ); | |
72 return ret; | |
73 } | |
74 | |
75 | |
76 DEFBINOPX (pow, float_complex_matrix, float_matrix) | |
77 { | |
78 error ("can't do A ^ B for A and B both matrices"); | |
79 return octave_value (); | |
80 } | |
81 | |
82 DEFBINOP (ldiv, float_complex_matrix, float_matrix) | |
83 { | |
84 CAST_BINOP_ARGS (const octave_float_complex_matrix&, | |
85 const octave_float_matrix&); | |
86 MatrixType typ = v1.matrix_type (); | |
87 | |
88 FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), | |
89 v2.float_matrix_value (), typ); | |
90 | |
91 v1.matrix_type (typ); | |
92 return ret; | |
93 } | |
94 | |
95 DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_matrix, | |
96 float_complex_array, float_array, mx_el_lt) | |
97 DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_matrix, | |
98 float_complex_array, float_array, mx_el_le) | |
99 DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_matrix, | |
100 float_complex_array, float_array, mx_el_eq) | |
101 DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_matrix, | |
102 float_complex_array, float_array, mx_el_ge) | |
103 DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_matrix, | |
104 float_complex_array, float_array, mx_el_gt) | |
105 DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_matrix, | |
106 float_complex_array, float_array, mx_el_ne) | |
107 | |
108 DEFNDBINOP_FN (el_mul, float_complex_matrix, float_matrix, | |
109 float_complex_array, float_array, product) | |
110 DEFNDBINOP_FN (el_div, float_complex_matrix, float_matrix, | |
111 float_complex_array, float_array, quotient) | |
112 DEFNDBINOP_FN (el_pow, float_complex_matrix, float_matrix, | |
113 float_complex_array, float_array, elem_xpow) | |
114 | |
115 DEFBINOP (el_ldiv, float_complex_matrix, float_matrix) | |
116 { | |
117 CAST_BINOP_ARGS (const octave_float_complex_matrix&, | |
118 const octave_float_matrix&); | |
119 | |
120 return quotient (v2.float_array_value (), v1.float_complex_array_value ()); | |
121 } | |
122 | |
123 DEFNDBINOP_FN (el_and, float_complex_matrix, float_matrix, | |
124 float_complex_array, float_array, mx_el_and) | |
125 DEFNDBINOP_FN (el_or, float_complex_matrix, float_matrix, | |
126 float_complex_array, float_array, mx_el_or) | |
127 | |
128 DEFNDCATOP_FN (fcm_fm, float_complex_matrix, float_matrix, | |
129 float_complex_array, float_array, concat) | |
130 | |
131 DEFNDCATOP_FN (cm_fm, complex_matrix, float_matrix, | |
132 float_complex_array, float_array, concat) | |
133 | |
134 DEFNDCATOP_FN (fcm_m, float_complex_matrix, matrix, | |
135 float_complex_array, float_array, concat) | |
136 | |
137 DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_matrix, | |
138 float_complex_array, assign) | |
139 DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_matrix, | |
140 complex_array, assign) | |
141 | |
142 void | |
143 install_fcm_fm_ops (void) | |
144 { | |
145 INSTALL_BINOP (op_add, octave_float_complex_matrix, octave_float_matrix, add); | |
146 INSTALL_BINOP (op_sub, octave_float_complex_matrix, octave_float_matrix, sub); | |
147 INSTALL_BINOP (op_mul, octave_float_complex_matrix, octave_float_matrix, mul); | |
148 INSTALL_BINOP (op_div, octave_float_complex_matrix, octave_float_matrix, div); | |
149 INSTALL_BINOP (op_pow, octave_float_complex_matrix, octave_float_matrix, pow); | |
150 INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, | |
151 octave_float_matrix, ldiv); | |
152 INSTALL_BINOP (op_lt, octave_float_complex_matrix, octave_float_matrix, lt); | |
153 INSTALL_BINOP (op_le, octave_float_complex_matrix, octave_float_matrix, le); | |
154 INSTALL_BINOP (op_eq, octave_float_complex_matrix, octave_float_matrix, eq); | |
155 INSTALL_BINOP (op_ge, octave_float_complex_matrix, octave_float_matrix, ge); | |
156 INSTALL_BINOP (op_gt, octave_float_complex_matrix, octave_float_matrix, gt); | |
157 INSTALL_BINOP (op_ne, octave_float_complex_matrix, octave_float_matrix, ne); | |
158 INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, | |
159 octave_float_matrix, el_mul); | |
160 INSTALL_BINOP (op_el_div, octave_float_complex_matrix, | |
161 octave_float_matrix, el_div); | |
162 INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, | |
163 octave_float_matrix, el_pow); | |
164 INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, | |
165 octave_float_matrix, el_ldiv); | |
166 INSTALL_BINOP (op_el_and, octave_float_complex_matrix, | |
167 octave_float_matrix, el_and); | |
168 INSTALL_BINOP (op_el_or, octave_float_complex_matrix, | |
169 octave_float_matrix, el_or); | |
170 INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, | |
171 octave_float_matrix, mul_trans); | |
172 INSTALL_BINOP (op_mul_herm, octave_float_complex_matrix, | |
173 octave_float_matrix, mul_trans); | |
174 | |
175 INSTALL_CATOP (octave_float_complex_matrix, octave_float_matrix, fcm_fm); | |
176 INSTALL_CATOP (octave_complex_matrix, octave_float_matrix, cm_fm); | |
177 INSTALL_CATOP (octave_float_complex_matrix, octave_matrix, fcm_m); | |
178 | |
179 INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, | |
180 octave_float_matrix, assign); | |
181 INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, | |
182 octave_float_matrix, dbl_assign); | |
183 } |