Mercurial > octave
annotate libinterp/operators/op-scm-m.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 |
---|---|
5164 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 2004-2015 David Bateman |
11523 | 4 Copyright (C) 1998-2004 Andy Adler |
7016 | 5 |
6 This file is part of Octave. | |
5164 | 7 |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
5164 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
5164 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
28 #include "gripes.h" | |
29 #include "oct-obj.h" | |
30 #include "ov.h" | |
31 #include "ov-typeinfo.h" | |
32 #include "ov-re-mat.h" | |
33 #include "ov-cx-mat.h" | |
34 #include "ops.h" | |
35 #include "xdiv.h" | |
36 | |
37 #include "sparse-xpow.h" | |
38 #include "sparse-xdiv.h" | |
39 #include "smx-scm-m.h" | |
40 #include "smx-m-scm.h" | |
41 #include "ov-cx-sparse.h" | |
42 | |
43 // sparse complex matrix by matrix ops. | |
44 | |
45 DEFBINOP_OP (add, sparse_complex_matrix, matrix, +) | |
46 DEFBINOP_OP (sub, sparse_complex_matrix, matrix, -) | |
47 | |
5429 | 48 DEFBINOP_OP (mul, sparse_complex_matrix, matrix, *) |
5164 | 49 |
50 DEFBINOP (div, sparse_complex_matrix, matrix) | |
51 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
52 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, |
5322 | 53 const octave_matrix&); |
5785 | 54 MatrixType typ = v2.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
55 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
56 ComplexMatrix ret = xdiv (v1.complex_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
57 v2.matrix_value (), typ); |
5785 | 58 |
59 v2.matrix_type (typ); | |
60 return ret; | |
5164 | 61 } |
62 | |
63 DEFBINOPX (pow, sparse_complex_matrix, matrix) | |
64 { | |
65 error ("can't do A ^ B for A and B both matrices"); | |
66 } | |
67 | |
68 DEFBINOP (ldiv, sparse_complex_matrix, matrix) | |
69 { | |
5760 | 70 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_matrix&); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
71 |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
72 if (v1.rows () == 1 && v1.columns () == 1) |
6221 | 73 { |
74 Complex d = v1.complex_value (); | |
75 | |
76 if (d == 0.0) | |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
77 gripe_divide_by_zero (); |
5322 | 78 |
6221 | 79 return octave_value (v2.array_value () / d); |
80 } | |
81 else | |
82 { | |
83 MatrixType typ = v1.matrix_type (); | |
5322 | 84 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
85 ComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
86 v2.matrix_value (), typ); |
6221 | 87 |
88 v1.matrix_type (typ); | |
89 return ret; | |
90 } | |
5164 | 91 } |
92 | |
93 DEFBINOP_FN (lt, sparse_complex_matrix, matrix, mx_el_lt) | |
94 DEFBINOP_FN (le, sparse_complex_matrix, matrix, mx_el_le) | |
95 DEFBINOP_FN (eq, sparse_complex_matrix, matrix, mx_el_eq) | |
96 DEFBINOP_FN (ge, sparse_complex_matrix, matrix, mx_el_ge) | |
97 DEFBINOP_FN (gt, sparse_complex_matrix, matrix, mx_el_gt) | |
98 DEFBINOP_FN (ne, sparse_complex_matrix, matrix, mx_el_ne) | |
99 | |
100 DEFBINOP_FN (el_mul, sparse_complex_matrix, matrix, product) | |
101 DEFBINOP_FN (el_div, sparse_complex_matrix, matrix, quotient) | |
102 | |
103 DEFBINOP (el_pow, sparse_complex_matrix, matrix) | |
104 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
105 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
106 const octave_matrix&); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
107 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
108 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
109 (elem_xpow (v1.sparse_complex_matrix_value (), SparseMatrix |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
110 (v2.matrix_value ()))); |
5164 | 111 } |
112 | |
113 DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) | |
114 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
115 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
116 const octave_matrix&); |
5164 | 117 |
118 return octave_value | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
119 (quotient (v2.matrix_value (), v1.sparse_complex_matrix_value ())); |
5164 | 120 } |
121 | |
122 DEFBINOP_FN (el_and, sparse_complex_matrix, matrix, mx_el_and) | |
123 DEFBINOP_FN (el_or, sparse_complex_matrix, matrix, mx_el_or) | |
124 | |
125 DEFCATOP (scm_m, sparse_complex_matrix, matrix) | |
126 { | |
127 CAST_BINOP_ARGS (octave_sparse_complex_matrix&, const octave_matrix&); | |
128 SparseMatrix tmp (v2.matrix_value ()); | |
129 return octave_value | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
130 (v1.sparse_complex_matrix_value (). concat (tmp, ra_idx)); |
5164 | 131 } |
132 | |
133 DEFASSIGNOP (assign, sparse_complex_matrix, matrix) | |
134 { | |
135 CAST_BINOP_ARGS (octave_sparse_complex_matrix&, const octave_matrix&); | |
136 | |
137 SparseComplexMatrix tmp (v2.complex_matrix_value ()); | |
138 v1.assign (idx, tmp); | |
139 return octave_value (); | |
140 } | |
141 | |
142 void | |
143 install_scm_m_ops (void) | |
144 { | |
145 INSTALL_BINOP (op_add, octave_sparse_complex_matrix, octave_matrix, add); | |
146 INSTALL_BINOP (op_sub, octave_sparse_complex_matrix, octave_matrix, sub); | |
147 INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_matrix, mul); | |
148 INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_matrix, div); | |
149 INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, octave_matrix, pow); | |
150 INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, octave_matrix, ldiv); | |
151 INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, octave_matrix, lt); | |
152 INSTALL_BINOP (op_le, octave_sparse_complex_matrix, octave_matrix, le); | |
153 INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, octave_matrix, eq); | |
154 INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, octave_matrix, ge); | |
155 INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_matrix, gt); | |
156 INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_matrix, ne); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
157 INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
158 el_mul); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
159 INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
160 el_div); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
161 INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
162 el_pow); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
163 INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
164 el_ldiv); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
165 INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
166 el_and); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
167 INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
168 el_or); |
5164 | 169 |
170 INSTALL_CATOP (octave_sparse_complex_matrix, octave_matrix, scm_m); | |
171 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
172 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
173 assign); |
5164 | 174 } |