Mercurial > octave
annotate libinterp/operators/op-sm-sm.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" | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
33 #include "ov-null-mat.h" |
| 5164 | 34 #include "ops.h" |
| 35 | |
| 36 #include "sparse-xpow.h" | |
| 37 #include "sparse-xdiv.h" | |
| 38 #include "ov-re-sparse.h" | |
| 39 | |
| 40 // sparse matrix unary ops. | |
| 41 | |
| 42 DEFUNOP_OP (not, sparse_matrix, !) | |
| 43 DEFUNOP_OP (uplus, sparse_matrix, /* no-op */) | |
| 44 DEFUNOP_OP (uminus, sparse_matrix, -) | |
| 45 | |
| 46 DEFUNOP (transpose, sparse_matrix) | |
| 47 { | |
| 48 CAST_UNOP_ARG (const octave_sparse_matrix&); | |
|
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
|
49 return octave_value (v.sparse_matrix_value ().transpose (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
50 v.matrix_type ().transpose ()); |
| 5164 | 51 } |
| 52 | |
| 53 // sparse matrix by sparse matrix ops. | |
| 54 | |
| 55 DEFBINOP_OP (add, sparse_matrix, sparse_matrix, +) | |
| 7342 | 56 |
| 57 // DEFBINOP_OP (sub, sparse_matrix, sparse_matrix, -) | |
| 58 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
59 static octave_value |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
60 oct_binop_sub (const octave_base_value& a1, const octave_base_value& a2) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
61 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
62 const octave_sparse_matrix& v1 = |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
63 dynamic_cast<const octave_sparse_matrix&> (a1); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
64 const octave_sparse_matrix& v2 = |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
65 dynamic_cast<const octave_sparse_matrix&> (a2); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
66 SparseMatrix m = v1.sparse_matrix_value () - v2.sparse_matrix_value (); |
| 7342 | 67 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
68 return octave_value (m); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
69 } |
| 7342 | 70 |
| 5164 | 71 DEFBINOP_OP (mul, sparse_matrix, sparse_matrix, *) |
| 72 | |
| 5322 | 73 DEFBINOP (div, sparse_matrix, sparse_matrix) |
| 74 { | |
| 5760 | 75 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_sparse_matrix&); |
| 6221 | 76 |
|
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
|
77 if (v2.rows () == 1 && v2.columns () == 1) |
| 6221 | 78 { |
| 79 double d = v2.scalar_value (); | |
| 80 | |
| 81 if (d == 0.0) | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
82 gripe_divide_by_zero (); |
| 6221 | 83 |
| 84 return octave_value (v1.sparse_matrix_value () / d); | |
| 85 } | |
| 86 else | |
| 87 { | |
| 88 MatrixType typ = v2.matrix_type (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
89 SparseMatrix ret = xdiv (v1.sparse_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
90 v2.sparse_matrix_value (), typ); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
91 |
| 6221 | 92 v2.matrix_type (typ); |
| 93 return ret; | |
| 94 } | |
| 5322 | 95 } |
| 5164 | 96 |
| 97 DEFBINOPX (pow, sparse_matrix, sparse_matrix) | |
| 98 { | |
| 99 error ("can't do A ^ B for A and B both matrices"); | |
| 100 } | |
| 101 | |
| 5322 | 102 DEFBINOP (ldiv, sparse_matrix, sparse_matrix) |
| 103 { | |
| 5760 | 104 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_sparse_matrix&); |
| 6221 | 105 |
|
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
|
106 if (v1.rows () == 1 && v1.columns () == 1) |
| 6221 | 107 { |
| 108 double d = v1.double_value (); | |
| 109 | |
| 110 if (d == 0.0) | |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
111 gripe_divide_by_zero (); |
| 5322 | 112 |
| 6221 | 113 return octave_value (v2.sparse_matrix_value () / d); |
| 114 } | |
| 115 else | |
| 116 { | |
| 117 MatrixType typ = v1.matrix_type (); | |
| 5322 | 118 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
119 SparseMatrix ret = xleftdiv (v1.sparse_matrix_value (), |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
120 v2.sparse_matrix_value (), typ); |
| 6221 | 121 |
| 122 v1.matrix_type (typ); | |
| 123 return ret; | |
| 124 } | |
| 5322 | 125 } |
| 5164 | 126 |
| 127 DEFBINOP_FN (lt, sparse_matrix, sparse_matrix, mx_el_lt) | |
| 128 DEFBINOP_FN (le, sparse_matrix, sparse_matrix, mx_el_le) | |
| 129 DEFBINOP_FN (eq, sparse_matrix, sparse_matrix, mx_el_eq) | |
| 130 DEFBINOP_FN (ge, sparse_matrix, sparse_matrix, mx_el_ge) | |
| 131 DEFBINOP_FN (gt, sparse_matrix, sparse_matrix, mx_el_gt) | |
| 132 DEFBINOP_FN (ne, sparse_matrix, sparse_matrix, mx_el_ne) | |
| 133 | |
| 134 DEFBINOP_FN (el_mul, sparse_matrix, sparse_matrix, product) | |
| 135 DEFBINOP_FN (el_div, sparse_matrix, sparse_matrix, quotient) | |
| 136 | |
| 137 DEFBINOP_FN (el_pow, sparse_matrix, sparse_matrix, elem_xpow) | |
| 138 | |
| 139 DEFBINOP (el_ldiv, sparse_matrix, sparse_matrix) | |
| 140 { | |
| 141 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_sparse_matrix&); | |
| 142 return octave_value | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
143 (quotient (v2.sparse_matrix_value (), v1.sparse_matrix_value ())); |
| 5164 | 144 } |
| 145 | |
| 146 DEFBINOP_FN (el_and, sparse_matrix, sparse_matrix, mx_el_and) | |
| 147 DEFBINOP_FN (el_or, sparse_matrix, sparse_matrix, mx_el_or) | |
| 148 | |
| 149 DEFCATOP_FN (sm_sm, sparse_matrix, sparse_matrix, concat) | |
| 150 | |
| 151 DEFASSIGNOP_FN (assign, sparse_matrix, sparse_matrix, assign) | |
| 152 | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
153 DEFNULLASSIGNOP_FN (null_assign, sparse_matrix, delete_elements) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
154 |
| 5164 | 155 void |
| 156 install_sm_sm_ops (void) | |
| 157 { | |
| 158 INSTALL_UNOP (op_not, octave_sparse_matrix, not); | |
| 159 INSTALL_UNOP (op_uplus, octave_sparse_matrix, uplus); | |
| 160 INSTALL_UNOP (op_uminus, octave_sparse_matrix, uminus); | |
| 161 INSTALL_UNOP (op_transpose, octave_sparse_matrix, transpose); | |
| 162 INSTALL_UNOP (op_hermitian, octave_sparse_matrix, transpose); | |
| 163 | |
| 164 INSTALL_BINOP (op_add, octave_sparse_matrix, octave_sparse_matrix, add); | |
| 165 INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_sparse_matrix, sub); | |
| 166 INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_sparse_matrix, mul); | |
| 167 INSTALL_BINOP (op_div, octave_sparse_matrix, octave_sparse_matrix, div); | |
| 168 INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_sparse_matrix, pow); | |
| 169 INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_sparse_matrix, ldiv); | |
| 170 INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_sparse_matrix, lt); | |
| 171 INSTALL_BINOP (op_le, octave_sparse_matrix, octave_sparse_matrix, le); | |
| 172 INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_sparse_matrix, eq); | |
| 173 INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_sparse_matrix, ge); | |
| 174 INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_sparse_matrix, gt); | |
| 175 INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_sparse_matrix, ne); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
176 INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
177 el_mul); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
178 INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
179 el_div); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
180 INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
181 el_pow); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
182 INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
183 el_ldiv); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
184 INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
185 el_and); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
186 INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
187 el_or); |
| 5164 | 188 |
| 189 INSTALL_CATOP (octave_sparse_matrix, octave_sparse_matrix, sm_sm); | |
| 190 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
191 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_sparse_matrix, |
|
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
192 assign); |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7342
diff
changeset
|
193 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
194 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_matrix, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
195 null_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
196 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_str, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
197 null_assign); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
198 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_sq_str, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
199 null_assign); |
| 5164 | 200 } |