Mercurial > octave
annotate libinterp/operators/op-m-cm.cc @ 23084:ef4d915df748
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 23 Jan 2017 14:27:48 -0500 |
parents | 3a2b891d0b33 e9a0469dedd9 |
children | 092078913d54 |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
22323
bac0d6f07a3e
maint: Update copyright notices for 2016.
John W. Eaton <jwe@octave.org>
parents:
21724
diff
changeset
|
3 Copyright (C) 1996-2016 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 | |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
8 under the terms of the GNU General Public License as published by |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
9 the Free Software Foundation; either version 3 of the License, or |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
10 (at your option) any later version. |
2928 | 11 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
12 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
13 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
15 GNU General Public License for more details. |
2928 | 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 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
23 #if defined (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 | |
27 #include "mx-m-cm.h" | |
28 #include "mx-cm-m.h" | |
4544 | 29 #include "mx-nda-cnda.h" |
30 #include "mx-cnda-nda.h" | |
2928 | 31 |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
32 #include "errwarn.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-re-mat.h" | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
36 #include "ov-flt-re-mat.h" |
2928 | 37 #include "ov-cx-mat.h" |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
38 #include "ov-flt-cx-mat.h" |
2928 | 39 #include "ov-typeinfo.h" |
40 #include "ops.h" | |
41 #include "xdiv.h" | |
42 #include "xpow.h" | |
43 | |
44 // matrix by complex matrix ops. | |
45 | |
4550 | 46 DEFNDBINOP_OP (add, matrix, complex_matrix, array, complex_array, +) |
47 DEFNDBINOP_OP (sub, matrix, complex_matrix, array, complex_array, -) | |
4543 | 48 |
2928 | 49 DEFBINOP_OP (mul, matrix, complex_matrix, *) |
5785 | 50 |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
51 DEFBINOP (trans_mul, matrix, complex_matrix) |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
52 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
53 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
54 const octave_complex_matrix& v2 |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
55 = dynamic_cast<const octave_complex_matrix&> (a2); |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
56 |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
57 Matrix m1 = v1.matrix_value (); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
58 ComplexMatrix m2 = v2.complex_matrix_value (); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
59 |
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9663
diff
changeset
|
60 return ComplexMatrix (xgemm (m1, real (m2), blas_trans, blas_no_trans), |
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9663
diff
changeset
|
61 xgemm (m1, imag (m2), blas_trans, blas_no_trans)); |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
62 } |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
63 |
5785 | 64 DEFBINOP (div, matrix, complex_matrix) |
65 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
66 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
67 const octave_complex_matrix& v2 |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
68 = dynamic_cast<const octave_complex_matrix&> (a2); |
5785 | 69 MatrixType typ = v2.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
70 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
71 ComplexMatrix ret = xdiv (v1.matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9665
diff
changeset
|
72 v2.complex_matrix_value (), typ); |
5785 | 73 |
74 v2.matrix_type (typ); | |
75 return ret; | |
76 } | |
2928 | 77 |
78 DEFBINOPX (pow, matrix, complex_matrix) | |
79 { | |
80 error ("can't do A ^ B for A and B both matrices"); | |
81 } | |
82 | |
5785 | 83 DEFBINOP (ldiv, matrix, complex_matrix) |
84 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
85 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
86 const octave_complex_matrix& v2 |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
87 = dynamic_cast<const octave_complex_matrix&> (a2); |
5785 | 88 MatrixType typ = v1.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
89 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
90 ComplexMatrix ret = xleftdiv (v1.matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9665
diff
changeset
|
91 v2.complex_matrix_value (), typ); |
5785 | 92 |
93 v1.matrix_type (typ); | |
94 return ret; | |
95 } | |
2928 | 96 |
9662
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
97 DEFBINOP (trans_ldiv, matrix, complex_matrix) |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
98 { |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
99 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
100 const octave_complex_matrix& v2 |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
101 = dynamic_cast<const octave_complex_matrix&> (a2); |
9662
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
102 MatrixType typ = v1.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
103 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
104 ComplexMatrix ret = xleftdiv (v1.matrix_value (), |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
105 v2.complex_matrix_value (), typ, blas_trans); |
9662
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
106 |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
107 v1.matrix_type (typ); |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
108 return ret; |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
109 } |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
110 |
9588
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
111 DEFNDCMPLXCMPOP_FN (lt, matrix, complex_matrix, array, complex_array, mx_el_lt) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
112 DEFNDCMPLXCMPOP_FN (le, matrix, complex_matrix, array, complex_array, mx_el_le) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
113 DEFNDCMPLXCMPOP_FN (eq, matrix, complex_matrix, array, complex_array, mx_el_eq) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
114 DEFNDCMPLXCMPOP_FN (ge, matrix, complex_matrix, array, complex_array, mx_el_ge) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
115 DEFNDCMPLXCMPOP_FN (gt, matrix, complex_matrix, array, complex_array, mx_el_gt) |
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
116 DEFNDCMPLXCMPOP_FN (ne, matrix, complex_matrix, array, complex_array, mx_el_ne) |
2928 | 117 |
4550 | 118 DEFNDBINOP_FN (el_mul, matrix, complex_matrix, array, complex_array, product) |
119 DEFNDBINOP_FN (el_div, matrix, complex_matrix, array, complex_array, quotient) | |
120 DEFNDBINOP_FN (el_pow, matrix, complex_matrix, array, complex_array, elem_xpow) | |
2928 | 121 |
122 DEFBINOP (el_ldiv, matrix, complex_matrix) | |
123 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
124 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
125 const octave_complex_matrix& v2 |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
126 = dynamic_cast<const octave_complex_matrix&> (a2); |
2928 | 127 |
4550 | 128 return quotient (v2.complex_array_value (), v1.array_value ()); |
2928 | 129 } |
130 | |
4550 | 131 DEFNDBINOP_FN (el_and, matrix, complex_matrix, array, complex_array, mx_el_and) |
132 DEFNDBINOP_FN (el_or, matrix, complex_matrix, array, complex_array, mx_el_or) | |
2928 | 133 |
4915 | 134 DEFNDCATOP_FN (m_cm, matrix, complex_matrix, array, complex_array, concat) |
135 | |
2928 | 136 DEFCONV (complex_matrix_conv, matrix, complex_matrix) |
137 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
138 const octave_matrix& v = dynamic_cast<const octave_matrix&> (a); |
2928 | 139 |
4543 | 140 return new octave_complex_matrix (ComplexNDArray (v.array_value ())); |
2928 | 141 } |
142 | |
143 void | |
144 install_m_cm_ops (void) | |
145 { | |
3538 | 146 INSTALL_BINOP (op_add, octave_matrix, octave_complex_matrix, add); |
147 INSTALL_BINOP (op_sub, octave_matrix, octave_complex_matrix, sub); | |
148 INSTALL_BINOP (op_mul, octave_matrix, octave_complex_matrix, mul); | |
149 INSTALL_BINOP (op_div, octave_matrix, octave_complex_matrix, div); | |
150 INSTALL_BINOP (op_pow, octave_matrix, octave_complex_matrix, pow); | |
151 INSTALL_BINOP (op_ldiv, octave_matrix, octave_complex_matrix, ldiv); | |
152 INSTALL_BINOP (op_lt, octave_matrix, octave_complex_matrix, lt); | |
153 INSTALL_BINOP (op_le, octave_matrix, octave_complex_matrix, le); | |
154 INSTALL_BINOP (op_eq, octave_matrix, octave_complex_matrix, eq); | |
155 INSTALL_BINOP (op_ge, octave_matrix, octave_complex_matrix, ge); | |
156 INSTALL_BINOP (op_gt, octave_matrix, octave_complex_matrix, gt); | |
157 INSTALL_BINOP (op_ne, octave_matrix, octave_complex_matrix, ne); | |
158 INSTALL_BINOP (op_el_mul, octave_matrix, octave_complex_matrix, el_mul); | |
159 INSTALL_BINOP (op_el_div, octave_matrix, octave_complex_matrix, el_div); | |
160 INSTALL_BINOP (op_el_pow, octave_matrix, octave_complex_matrix, el_pow); | |
161 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_complex_matrix, el_ldiv); | |
162 INSTALL_BINOP (op_el_and, octave_matrix, octave_complex_matrix, el_and); | |
163 INSTALL_BINOP (op_el_or, octave_matrix, octave_complex_matrix, el_or); | |
9663
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
164 INSTALL_BINOP (op_trans_mul, octave_matrix, octave_complex_matrix, trans_mul); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
165 INSTALL_BINOP (op_herm_mul, octave_matrix, octave_complex_matrix, trans_mul); |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
166 INSTALL_BINOP (op_trans_ldiv, octave_matrix, octave_complex_matrix, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
167 trans_ldiv); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
168 INSTALL_BINOP (op_herm_ldiv, octave_matrix, octave_complex_matrix, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
169 trans_ldiv); |
2928 | 170 |
4915 | 171 INSTALL_CATOP (octave_matrix, octave_complex_matrix, m_cm); |
172 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
173 INSTALL_ASSIGNCONV (octave_matrix, octave_complex_matrix, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
174 octave_complex_matrix); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
175 INSTALL_ASSIGNCONV (octave_float_matrix, octave_complex_matrix, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
176 octave_float_complex_matrix); |
2928 | 177 |
3540 | 178 INSTALL_WIDENOP (octave_matrix, octave_complex_matrix, complex_matrix_conv); |
2928 | 179 } |