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