Mercurial > octave
annotate libinterp/operators/op-sm-scm.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 "ops.h" | |
33 | |
34 #include "sparse-xdiv.h" | |
35 #include "sparse-xpow.h" | |
36 #include "smx-sm-scm.h" | |
37 #include "smx-scm-sm.h" | |
38 #include "ov-re-sparse.h" | |
39 #include "ov-cx-sparse.h" | |
40 | |
41 // sparse matrix by sparse complex matrix ops. | |
42 | |
43 DEFBINOP_OP (add, sparse_matrix, sparse_complex_matrix, +) | |
44 DEFBINOP_OP (sub, sparse_matrix, sparse_complex_matrix, -) | |
45 | |
46 DEFBINOP_OP (mul, sparse_matrix, sparse_complex_matrix, *) | |
47 | |
5322 | 48 DEFBINOP (div, sparse_matrix, sparse_complex_matrix) |
49 { | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
50 CAST_BINOP_ARGS (const octave_sparse_matrix&, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
51 const octave_sparse_complex_matrix&); |
6221 | 52 |
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
|
53 if (v2.rows () == 1 && v2.columns () == 1) |
6221 | 54 { |
55 Complex d = v2.complex_value (); | |
56 | |
57 if (d == 0.0) | |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
58 gripe_divide_by_zero (); |
6221 | 59 |
60 return octave_value (v1.sparse_matrix_value () / d); | |
61 } | |
62 else | |
63 { | |
64 MatrixType typ = v2.matrix_type (); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
65 SparseComplexMatrix ret = xdiv (v1.sparse_matrix_value (), |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
66 v2.sparse_complex_matrix_value (), typ); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
67 |
6221 | 68 v2.matrix_type (typ); |
69 return ret; | |
70 } | |
5322 | 71 } |
5164 | 72 |
73 DEFBINOPX (pow, sparse_matrix, sparse_complex_matrix) | |
74 { | |
75 error ("can't do A ^ B for A and B both matrices"); | |
76 } | |
77 | |
5322 | 78 DEFBINOP (ldiv, sparse_matrix, sparse_complex_matrix) |
79 { | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
80 CAST_BINOP_ARGS (const octave_sparse_matrix&, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
81 const octave_sparse_complex_matrix&); |
6221 | 82 |
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
|
83 if (v1.rows () == 1 && v1.columns () == 1) |
6221 | 84 { |
85 double d = v1.scalar_value (); | |
86 | |
87 if (d == 0.0) | |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
88 gripe_divide_by_zero (); |
5322 | 89 |
6221 | 90 return octave_value (v2.sparse_complex_matrix_value () / d); |
91 } | |
92 else | |
93 { | |
94 MatrixType typ = v1.matrix_type (); | |
5322 | 95 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
96 SparseComplexMatrix ret = |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
97 xleftdiv (v1.sparse_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
98 v2.sparse_complex_matrix_value (), typ); |
6221 | 99 |
100 v1.matrix_type (typ); | |
101 return ret; | |
102 } | |
5322 | 103 } |
5164 | 104 |
105 DEFBINOP_FN (lt, sparse_matrix, sparse_complex_matrix, mx_el_lt) | |
106 DEFBINOP_FN (le, sparse_matrix, sparse_complex_matrix, mx_el_le) | |
107 DEFBINOP_FN (eq, sparse_matrix, sparse_complex_matrix, mx_el_eq) | |
108 DEFBINOP_FN (ge, sparse_matrix, sparse_complex_matrix, mx_el_ge) | |
109 DEFBINOP_FN (gt, sparse_matrix, sparse_complex_matrix, mx_el_gt) | |
110 DEFBINOP_FN (ne, sparse_matrix, sparse_complex_matrix, mx_el_ne) | |
111 | |
112 DEFBINOP_FN (el_mul, sparse_matrix, sparse_complex_matrix, product) | |
113 DEFBINOP_FN (el_div, sparse_matrix, sparse_complex_matrix, quotient) | |
114 DEFBINOP_FN (el_pow, sparse_matrix, sparse_complex_matrix, elem_xpow) | |
115 | |
116 DEFBINOP (el_ldiv, sparse_matrix, sparse_complex_matrix) | |
117 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
118 CAST_BINOP_ARGS (const octave_sparse_matrix&, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
119 const octave_sparse_complex_matrix&); |
5164 | 120 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
121 return octave_value (quotient (v2.sparse_complex_matrix_value (), |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
122 v1.sparse_matrix_value ())); |
5164 | 123 } |
124 | |
125 DEFBINOP_FN (el_and, sparse_matrix, sparse_complex_matrix, mx_el_and) | |
126 DEFBINOP_FN (el_or, sparse_matrix, sparse_complex_matrix, mx_el_or) | |
127 | |
128 DEFCATOP_FN (sm_scm, sparse_matrix, sparse_complex_matrix, concat) | |
129 | |
130 DEFCONV (sparse_complex_matrix_conv, sparse_matrix, sparse_complex_matrix) | |
131 { | |
132 CAST_CONV_ARG (const octave_sparse_matrix&); | |
133 return new octave_sparse_complex_matrix (v.sparse_complex_matrix_value ()); | |
134 } | |
135 | |
136 void | |
137 install_sm_scm_ops (void) | |
138 { | |
139 INSTALL_BINOP (op_add, octave_sparse_matrix, octave_sparse_complex_matrix, | |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
140 add); |
5164 | 141 INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
142 sub); |
5164 | 143 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
144 mul); |
5164 | 145 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
146 div); |
5164 | 147 INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
148 pow); |
5164 | 149 INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
150 ldiv); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
151 INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
152 lt); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
153 INSTALL_BINOP (op_le, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
154 le); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
155 INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
156 eq); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
157 INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
158 ge); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
159 INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
160 gt); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
161 INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
162 ne); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
163 INSTALL_BINOP (op_el_mul, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
164 octave_sparse_complex_matrix, el_mul); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
165 INSTALL_BINOP (op_el_div, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
166 octave_sparse_complex_matrix, el_div); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
167 INSTALL_BINOP (op_el_pow, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
168 octave_sparse_complex_matrix, el_pow); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
169 INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
170 octave_sparse_complex_matrix, el_ldiv); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
171 INSTALL_BINOP (op_el_and, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
172 octave_sparse_complex_matrix, el_and); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
173 INSTALL_BINOP (op_el_or, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
174 octave_sparse_complex_matrix, el_or); |
5164 | 175 |
176 INSTALL_CATOP (octave_sparse_matrix, octave_sparse_complex_matrix, sm_scm); | |
177 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
178 INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
179 octave_sparse_complex_matrix); |
5164 | 180 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
181 INSTALL_WIDENOP (octave_sparse_matrix, octave_sparse_complex_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
182 sparse_complex_matrix_conv); |
5164 | 183 } |