Mercurial > octave
annotate libinterp/operators/op-cm-m.cc @ 20940:48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
* libinterp/corefcn/oct-obj.h: Replaced. Contains a #warning issued if used in
compilation and includes "ovl.h" instead. Original file renamed to
libinterp/octave-value/ovl.h
* libinterp/corefcn/oct-obj.cc: Renamed to libinterp/octave-value/ovl.cc.
* oct-obj.cc (ovl ()): Added new function to return empty octave_value_list.
* libinterp/corefcn/module.mk: Remove oct-obj.cc from build system.
* libinterp/octave-value/module.mk: Add ovl.h and ovl.cc to build system.
* mk-opts.pl, annotation-dialog.h, Cell.cc, __contourc__.cc, __dsearchn__.cc,
__lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc,
betainc.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, dlmread.cc, eig.cc,
error.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc,
gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
graphics.cc, gripes.cc, help.cc, hess.cc, hex2num.cc, hook-fcn.h, input.cc,
input.h, inv.cc, kron.cc, load-save.cc, lookup.cc, ls-hdf5.cc, ls-mat-ascii.cc,
ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, lsode.cc, lu.cc,
luinc.cc, max.cc, mex.cc, oct-hist.cc, oct-lvalue.cc, oct-lvalue.h, oct-map.h,
oct-stream.cc, oct.h, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, quad.cc,
quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sparse-xpow.cc,
strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.h, syscalls.cc, sysdep.cc,
time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc,
variables.cc, xpow.cc, __delaunayn__.cc, __glpk__.cc, __voronoi__.cc,
audiodevinfo.cc, audioread.cc, chol.cc, convhulln.cc, dmperm.cc, qr.cc,
symbfact.cc, mkbuiltins, ov-base-diag.h, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base-sparse.cc, ov-base-sparse.h,
ov-base.cc, ov-bool-mat.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-colon.cc,
ov-complex.cc, ov-cs-list.h, ov-cx-mat.cc, ov-dld-fcn.cc, ov-fcn.cc, ov-fcn.h,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.h, ov-mex-fcn.cc,
ov-perm.h, ov-range.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, octave.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc,
op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.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-double-conv.cc, op-fcdm-fcdm.cc,
op-fcdm-fdm.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-float-conv.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-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc,
op-int-conv.cc, 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-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, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc,
parse.h, pt-arg-list.cc, pt-assign.cc, pt-binop.cc, pt-cbinop.cc, pt-cell.cc,
pt-colon.cc, pt-const.cc, pt-eval.h, pt-fcn-handle.cc, pt-funcall.h, pt-id.cc,
pt-idx.cc, pt-jump.cc, pt-mat.cc, pt-select.cc, pt-unop.cc, token.cc,
Array-sym.cc: replace '#include "oct-obj.h"' with '#include "ovl.h"'.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 18 Dec 2015 16:04:56 -0800 |
parents | 384ff5aa9437 |
children | e39e05d90788 |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
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 | |
24 #include <config.h> | |
25 #endif | |
26 | |
27 #include "mx-cm-m.h" | |
28 #include "mx-m-cm.h" | |
4544 | 29 #include "mx-cnda-nda.h" |
30 #include "mx-nda-cnda.h" | |
2928 | 31 |
32 #include "gripes.h" | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
33 #include "ovl.h" |
2928 | 34 #include "ov.h" |
35 #include "ov-cx-mat.h" | |
36 #include "ov-re-mat.h" | |
37 #include "ov-typeinfo.h" | |
38 #include "ops.h" | |
39 #include "xdiv.h" | |
40 #include "xpow.h" | |
41 | |
42 // complex matrix by matrix ops. | |
43 | |
4550 | 44 DEFNDBINOP_OP (add, complex_matrix, matrix, complex_array, array, +) |
45 DEFNDBINOP_OP (sub, complex_matrix, matrix, complex_array, array, -) | |
4543 | 46 |
2928 | 47 DEFBINOP_OP (mul, complex_matrix, matrix, *) |
5785 | 48 |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
49 DEFBINOP (mul_trans, complex_matrix, matrix) |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
50 { |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
51 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
52 |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
53 ComplexMatrix m1 = v1.complex_matrix_value (); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
54 Matrix m2 = v2.matrix_value (); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
55 |
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9663
diff
changeset
|
56 return ComplexMatrix (xgemm (real (m1), m2, blas_no_trans, blas_trans), |
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9663
diff
changeset
|
57 xgemm (imag (m1), m2, blas_no_trans, blas_trans)); |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
58 } |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
59 |
5785 | 60 DEFBINOP (div, complex_matrix, matrix) |
61 { | |
62 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); | |
63 MatrixType typ = v2.matrix_type (); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
64 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
65 ComplexMatrix ret = xdiv (v1.complex_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9665
diff
changeset
|
66 v2.matrix_value (), typ); |
5785 | 67 |
68 v2.matrix_type (typ); | |
69 return ret; | |
70 } | |
71 | |
2928 | 72 |
73 DEFBINOPX (pow, complex_matrix, matrix) | |
74 { | |
75 error ("can't do A ^ B for A and B both matrices"); | |
76 } | |
77 | |
5785 | 78 DEFBINOP (ldiv, complex_matrix, matrix) |
79 { | |
80 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); | |
81 MatrixType typ = v1.matrix_type (); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
82 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
83 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9665
diff
changeset
|
84 v2.matrix_value (), typ); |
5785 | 85 |
86 v1.matrix_type (typ); | |
87 return ret; | |
88 } | |
2928 | 89 |
9588
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
90 DEFNDCMPLXCMPOP_FN (lt, complex_matrix, matrix, complex_array, array, mx_el_lt) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
91 DEFNDCMPLXCMPOP_FN (le, complex_matrix, matrix, complex_array, array, mx_el_le) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
92 DEFNDCMPLXCMPOP_FN (eq, complex_matrix, matrix, complex_array, array, mx_el_eq) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
93 DEFNDCMPLXCMPOP_FN (ge, complex_matrix, matrix, complex_array, array, mx_el_ge) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
94 DEFNDCMPLXCMPOP_FN (gt, complex_matrix, matrix, complex_array, array, mx_el_gt) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
95 DEFNDCMPLXCMPOP_FN (ne, complex_matrix, matrix, complex_array, array, mx_el_ne) |
2928 | 96 |
4550 | 97 DEFNDBINOP_FN (el_mul, complex_matrix, matrix, complex_array, array, product) |
98 DEFNDBINOP_FN (el_div, complex_matrix, matrix, complex_array, array, quotient) | |
99 DEFNDBINOP_FN (el_pow, complex_matrix, matrix, complex_array, array, elem_xpow) | |
2928 | 100 |
101 DEFBINOP (el_ldiv, complex_matrix, matrix) | |
102 { | |
103 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); | |
104 | |
4550 | 105 return quotient (v2.array_value (), v1.complex_array_value ()); |
2928 | 106 } |
107 | |
4550 | 108 DEFNDBINOP_FN (el_and, complex_matrix, matrix, complex_array, array, mx_el_and) |
109 DEFNDBINOP_FN (el_or, complex_matrix, matrix, complex_array, array, mx_el_or) | |
2928 | 110 |
4915 | 111 DEFNDCATOP_FN (cm_m, complex_matrix, matrix, complex_array, array, concat) |
112 | |
4686 | 113 DEFNDASSIGNOP_FN (assign, complex_matrix, matrix, complex_array, assign) |
2928 | 114 |
115 void | |
116 install_cm_m_ops (void) | |
117 { | |
3538 | 118 INSTALL_BINOP (op_add, octave_complex_matrix, octave_matrix, add); |
119 INSTALL_BINOP (op_sub, octave_complex_matrix, octave_matrix, sub); | |
120 INSTALL_BINOP (op_mul, octave_complex_matrix, octave_matrix, mul); | |
121 INSTALL_BINOP (op_div, octave_complex_matrix, octave_matrix, div); | |
122 INSTALL_BINOP (op_pow, octave_complex_matrix, octave_matrix, pow); | |
123 INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_matrix, ldiv); | |
124 INSTALL_BINOP (op_lt, octave_complex_matrix, octave_matrix, lt); | |
125 INSTALL_BINOP (op_le, octave_complex_matrix, octave_matrix, le); | |
126 INSTALL_BINOP (op_eq, octave_complex_matrix, octave_matrix, eq); | |
127 INSTALL_BINOP (op_ge, octave_complex_matrix, octave_matrix, ge); | |
128 INSTALL_BINOP (op_gt, octave_complex_matrix, octave_matrix, gt); | |
129 INSTALL_BINOP (op_ne, octave_complex_matrix, octave_matrix, ne); | |
130 INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_matrix, el_mul); | |
131 INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_matrix, el_div); | |
132 INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_matrix, el_pow); | |
133 INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_matrix, el_ldiv); | |
134 INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_matrix, el_and); | |
135 INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_matrix, el_or); | |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
136 INSTALL_BINOP (op_mul_trans, octave_complex_matrix, octave_matrix, mul_trans); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
137 INSTALL_BINOP (op_mul_herm, octave_complex_matrix, octave_matrix, mul_trans); |
2928 | 138 |
4915 | 139 INSTALL_CATOP (octave_complex_matrix, octave_matrix, cm_m); |
140 | |
3538 | 141 INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_matrix, assign); |
2928 | 142 } |