Mercurial > octave
annotate libinterp/operators/op-m-cm.cc @ 20893:384ff5aa9437
2015 Code Sprint: Eliminate useless return statements after error ().
* data.cc, graphics.cc, graphics.in.h, ls-mat4.cc, ls-mat5.cc, oct-fstrm.cc,
oct-stream.cc, oct-strstrm.cc, __delaunayn__.cc, ov-base-int.cc, ov-classdef.h,
ov-complex.cc, ov-cx-sparse.cc, ov-fcn-inline.cc, ov-float.cc,
ov-flt-complex.cc, ov-java.cc, ov-range.cc, ov-re-sparse.cc, ov-scalar.cc,
ov-struct.cc, ov-usr-fcn.cc, ov.cc, op-cm-cm.cc, op-cm-m.cc, op-cm-scm.cc,
op-cm-sm.cc, op-fcm-fcm.cc, op-fcm-fm.cc, op-fm-fcm.cc, op-fm-fm.cc,
op-m-cm.cc, op-m-m.cc, op-m-scm.cc, op-m-sm.cc, op-scm-cm.cc, op-scm-m.cc,
op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-m.cc, op-sm-scm.cc,
op-sm-sm.cc, pt-exp.cc:
Eliminate useless return statements after error ().
author | Rik <rik@octave.org> |
---|---|
date | Mon, 14 Dec 2015 12:59:29 -0800 |
parents | 4197fc428c7d |
children | 48b2ad5ee801 |
rev | line source |
---|---|
2928 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
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-m-cm.h" | |
28 #include "mx-cm-m.h" | |
4544 | 29 #include "mx-nda-cnda.h" |
30 #include "mx-cnda-nda.h" | |
2928 | 31 |
32 #include "gripes.h" | |
4055 | 33 #include "oct-obj.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 { |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
53 CAST_BINOP_ARGS (const octave_matrix&, const octave_complex_matrix&); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
54 |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
55 Matrix m1 = v1.matrix_value (); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
56 ComplexMatrix m2 = v2.complex_matrix_value (); |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
57 |
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9663
diff
changeset
|
58 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
|
59 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
|
60 } |
7e5b4de5fbfe
improve mixed real x complex ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9662
diff
changeset
|
61 |
5785 | 62 DEFBINOP (div, matrix, complex_matrix) |
63 { | |
64 CAST_BINOP_ARGS (const octave_matrix&, const octave_complex_matrix&); | |
65 MatrixType typ = v2.matrix_type (); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
66 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
67 ComplexMatrix ret = xdiv (v1.matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9665
diff
changeset
|
68 v2.complex_matrix_value (), typ); |
5785 | 69 |
70 v2.matrix_type (typ); | |
71 return ret; | |
72 } | |
2928 | 73 |
74 DEFBINOPX (pow, matrix, complex_matrix) | |
75 { | |
76 error ("can't do A ^ B for A and B both matrices"); | |
77 } | |
78 | |
5785 | 79 DEFBINOP (ldiv, matrix, complex_matrix) |
80 { | |
81 CAST_BINOP_ARGS (const octave_matrix&, const octave_complex_matrix&); | |
82 MatrixType typ = v1.matrix_type (); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
83 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
84 ComplexMatrix ret = xleftdiv (v1.matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
9665
diff
changeset
|
85 v2.complex_matrix_value (), typ); |
5785 | 86 |
87 v1.matrix_type (typ); | |
88 return ret; | |
89 } | |
2928 | 90 |
9662
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
91 DEFBINOP (trans_ldiv, matrix, complex_matrix) |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
92 { |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
93 CAST_BINOP_ARGS (const octave_matrix&, const octave_complex_matrix&); |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
94 MatrixType typ = v1.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
95 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
96 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
|
97 v2.complex_matrix_value (), typ, blas_trans); |
9662
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
98 |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
99 v1.matrix_type (typ); |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
100 return ret; |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
101 } |
0d3b248f4ab6
further improve mixed real-complex division
Jaroslav Hajek <highegg@gmail.com>
parents:
9588
diff
changeset
|
102 |
9588
319e2ab9b8ae
warn about the complex comparison ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
103 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
|
104 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
|
105 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
|
106 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
|
107 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
|
108 DEFNDCMPLXCMPOP_FN (ne, matrix, complex_matrix, array, complex_array, mx_el_ne) |
2928 | 109 |
4550 | 110 DEFNDBINOP_FN (el_mul, matrix, complex_matrix, array, complex_array, product) |
111 DEFNDBINOP_FN (el_div, matrix, complex_matrix, array, complex_array, quotient) | |
112 DEFNDBINOP_FN (el_pow, matrix, complex_matrix, array, complex_array, elem_xpow) | |
2928 | 113 |
114 DEFBINOP (el_ldiv, matrix, complex_matrix) | |
115 { | |
116 CAST_BINOP_ARGS (const octave_matrix&, const octave_complex_matrix&); | |
117 | |
4550 | 118 return quotient (v2.complex_array_value (), v1.array_value ()); |
2928 | 119 } |
120 | |
4550 | 121 DEFNDBINOP_FN (el_and, matrix, complex_matrix, array, complex_array, mx_el_and) |
122 DEFNDBINOP_FN (el_or, matrix, complex_matrix, array, complex_array, mx_el_or) | |
2928 | 123 |
4915 | 124 DEFNDCATOP_FN (m_cm, matrix, complex_matrix, array, complex_array, concat) |
125 | |
2928 | 126 DEFCONV (complex_matrix_conv, matrix, complex_matrix) |
127 { | |
128 CAST_CONV_ARG (const octave_matrix&); | |
129 | |
4543 | 130 return new octave_complex_matrix (ComplexNDArray (v.array_value ())); |
2928 | 131 } |
132 | |
133 void | |
134 install_m_cm_ops (void) | |
135 { | |
3538 | 136 INSTALL_BINOP (op_add, octave_matrix, octave_complex_matrix, add); |
137 INSTALL_BINOP (op_sub, octave_matrix, octave_complex_matrix, sub); | |
138 INSTALL_BINOP (op_mul, octave_matrix, octave_complex_matrix, mul); | |
139 INSTALL_BINOP (op_div, octave_matrix, octave_complex_matrix, div); | |
140 INSTALL_BINOP (op_pow, octave_matrix, octave_complex_matrix, pow); | |
141 INSTALL_BINOP (op_ldiv, octave_matrix, octave_complex_matrix, ldiv); | |
142 INSTALL_BINOP (op_lt, octave_matrix, octave_complex_matrix, lt); | |
143 INSTALL_BINOP (op_le, octave_matrix, octave_complex_matrix, le); | |
144 INSTALL_BINOP (op_eq, octave_matrix, octave_complex_matrix, eq); | |
145 INSTALL_BINOP (op_ge, octave_matrix, octave_complex_matrix, ge); | |
146 INSTALL_BINOP (op_gt, octave_matrix, octave_complex_matrix, gt); | |
147 INSTALL_BINOP (op_ne, octave_matrix, octave_complex_matrix, ne); | |
148 INSTALL_BINOP (op_el_mul, octave_matrix, octave_complex_matrix, el_mul); | |
149 INSTALL_BINOP (op_el_div, octave_matrix, octave_complex_matrix, el_div); | |
150 INSTALL_BINOP (op_el_pow, octave_matrix, octave_complex_matrix, el_pow); | |
151 INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_complex_matrix, el_ldiv); | |
152 INSTALL_BINOP (op_el_and, octave_matrix, octave_complex_matrix, el_and); | |
153 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
|
154 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
|
155 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
|
156 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
|
157 trans_ldiv); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
158 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
|
159 trans_ldiv); |
2928 | 160 |
4915 | 161 INSTALL_CATOP (octave_matrix, octave_complex_matrix, m_cm); |
162 | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
163 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
|
164 octave_complex_matrix); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
165 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
|
166 octave_float_complex_matrix); |
2928 | 167 |
3540 | 168 INSTALL_WIDENOP (octave_matrix, octave_complex_matrix, complex_matrix_conv); |
2928 | 169 } |