Mercurial > octave
annotate libinterp/operators/op-m-sm.cc @ 25054:6652d3823428 stable
maint: Update copyright dates in all source files.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 30 Mar 2018 09:19:05 -0400 |
parents | 46440078d73b |
children | 078b795c5219 |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
25054
6652d3823428
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
24540
diff
changeset
|
3 Copyright (C) 2004-2018 David Bateman |
11523 | 4 Copyright (C) 1998-2004 Andy Adler |
7016 | 5 |
6 This file is part of Octave. | |
5164 | 7 |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
8 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
9 under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
11 (at your option) any later version. |
5164 | 12 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
13 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
16 GNU General Public License for more details. |
5164 | 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 |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
20 <https://www.gnu.org/licenses/>. |
5164 | 21 |
22 */ | |
23 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
24 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
25 # include "config.h" |
5164 | 26 #endif |
27 | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
28 #include "errwarn.h" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
29 #include "ovl.h" |
5164 | 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 // matrix by sparse matrix ops. | |
43 | |
44 DEFBINOP_OP (add, matrix, sparse_matrix, +) | |
45 DEFBINOP_OP (sub, matrix, sparse_matrix, -) | |
46 | |
5429 | 47 DEFBINOP_OP (mul, matrix, sparse_matrix, *) |
5164 | 48 |
49 DEFBINOP (div, matrix, sparse_matrix) | |
50 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
51 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
52 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
6221 | 53 |
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
|
54 if (v2.rows () == 1 && v2.columns () == 1) |
6221 | 55 { |
56 double d = v2.scalar_value (); | |
57 | |
58 if (d == 0.0) | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
59 warn_divide_by_zero (); |
5322 | 60 |
6221 | 61 return octave_value (v1.array_value () / d); |
62 } | |
63 else | |
64 { | |
65 MatrixType typ = v2.matrix_type (); | |
5322 | 66 |
6221 | 67 Matrix ret = xdiv (v1.matrix_value (), v2.sparse_matrix_value (), typ); |
68 | |
69 v2.matrix_type (typ); | |
70 return ret; | |
71 } | |
5164 | 72 } |
73 | |
74 DEFBINOPX (pow, matrix, sparse_matrix) | |
75 { | |
76 error ("can't do A ^ B for A and B both matrices"); | |
77 } | |
78 | |
79 DEFBINOP (ldiv, matrix, sparse_matrix) | |
80 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
81 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
82 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5785 | 83 MatrixType typ = v1.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
84 |
5785 | 85 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); |
86 | |
87 v1.matrix_type (typ); | |
88 return ret; | |
5164 | 89 } |
90 | |
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
91 DEFBINOP_FN (mul_trans, matrix, sparse_matrix, mul_trans); |
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
92 |
5164 | 93 DEFBINOP_FN (lt, matrix, sparse_matrix, mx_el_lt) |
94 DEFBINOP_FN (le, matrix, sparse_matrix, mx_el_le) | |
95 DEFBINOP_FN (eq, matrix, sparse_matrix, mx_el_eq) | |
96 DEFBINOP_FN (ge, matrix, sparse_matrix, mx_el_ge) | |
97 DEFBINOP_FN (gt, matrix, sparse_matrix, mx_el_gt) | |
98 DEFBINOP_FN (ne, matrix, sparse_matrix, mx_el_ne) | |
99 | |
100 DEFBINOP_FN (el_mul, matrix, sparse_matrix, product) | |
101 DEFBINOP_FN (el_div, matrix, sparse_matrix, quotient) | |
102 | |
103 DEFBINOP (el_pow, matrix, sparse_matrix) | |
104 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
105 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
106 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
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 (elem_xpow (SparseMatrix (v1.matrix_value ()), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
109 v2.sparse_matrix_value ())); |
5164 | 110 } |
111 | |
112 DEFBINOP (el_ldiv, matrix, sparse_matrix) | |
113 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
114 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
115 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
116 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
117 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
118 (quotient (v2.sparse_matrix_value (), v1.matrix_value ())); |
5164 | 119 } |
120 | |
121 DEFBINOP_FN (el_and, matrix, sparse_matrix, mx_el_and) | |
122 DEFBINOP_FN (el_or, matrix, sparse_matrix, mx_el_or) | |
123 | |
124 DEFCATOP (m_sm, matrix, sparse_matrix) | |
125 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
126 octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
127 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5164 | 128 SparseMatrix tmp (v1.matrix_value ()); |
129 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
130 } | |
131 | |
132 DEFCONV (sparse_matrix_conv, matrix, sparse_matrix) | |
133 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
134 const octave_matrix& v = dynamic_cast<const octave_matrix&> (a); |
5164 | 135 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); |
136 } | |
137 | |
7289 | 138 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign) |
139 | |
5164 | 140 void |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
141 install_m_sm_ops (octave::type_info& ti) |
5164 | 142 { |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
143 INSTALL_BINOP_TI (ti, op_add, octave_matrix, octave_sparse_matrix, add); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
144 INSTALL_BINOP_TI (ti, op_sub, octave_matrix, octave_sparse_matrix, sub); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
145 INSTALL_BINOP_TI (ti, op_mul, octave_matrix, octave_sparse_matrix, mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
146 INSTALL_BINOP_TI (ti, op_div, octave_matrix, octave_sparse_matrix, div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
147 INSTALL_BINOP_TI (ti, op_pow, octave_matrix, octave_sparse_matrix, pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
148 INSTALL_BINOP_TI (ti, op_ldiv, octave_matrix, octave_sparse_matrix, ldiv); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
149 INSTALL_BINOP_TI (ti, op_mul_trans, octave_matrix, octave_sparse_matrix, mul_trans); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
150 INSTALL_BINOP_TI (ti, op_mul_herm, octave_matrix, octave_sparse_matrix, mul_trans); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
151 INSTALL_BINOP_TI (ti, op_lt, octave_matrix, octave_sparse_matrix, lt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
152 INSTALL_BINOP_TI (ti, op_le, octave_matrix, octave_sparse_matrix, le); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
153 INSTALL_BINOP_TI (ti, op_eq, octave_matrix, octave_sparse_matrix, eq); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
154 INSTALL_BINOP_TI (ti, op_ge, octave_matrix, octave_sparse_matrix, ge); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
155 INSTALL_BINOP_TI (ti, op_gt, octave_matrix, octave_sparse_matrix, gt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
156 INSTALL_BINOP_TI (ti, op_ne, octave_matrix, octave_sparse_matrix, ne); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
157 INSTALL_BINOP_TI (ti, op_el_mul, octave_matrix, octave_sparse_matrix, el_mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
158 INSTALL_BINOP_TI (ti, op_el_div, octave_matrix, octave_sparse_matrix, el_div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
159 INSTALL_BINOP_TI (ti, op_el_pow, octave_matrix, octave_sparse_matrix, el_pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
160 INSTALL_BINOP_TI (ti, op_el_ldiv, octave_matrix, octave_sparse_matrix, el_ldiv); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
161 INSTALL_BINOP_TI (ti, op_el_and, octave_matrix, octave_sparse_matrix, el_and); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
162 INSTALL_BINOP_TI (ti, op_el_or, octave_matrix, octave_sparse_matrix, el_or); |
5164 | 163 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
164 INSTALL_CATOP_TI (ti, octave_matrix, octave_sparse_matrix, m_sm); |
5164 | 165 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
166 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_matrix, octave_sparse_matrix, assign) |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
167 INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_sparse_matrix, octave_matrix) |
5164 | 168 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
169 INSTALL_WIDENOP_TI (ti, octave_matrix, octave_sparse_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
170 sparse_matrix_conv); |
5164 | 171 } |