Mercurial > octave
annotate libinterp/operators/op-sm-m.cc @ 31706:597f3ee61a48 stable
update Octave Project Developers copyright for the new year
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 06 Jan 2023 13:11:27 -0500 |
parents | e88a07dec498 |
children | 3722c5b1a8c8 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
31706
597f3ee61a48
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
31605
diff
changeset
|
3 // Copyright (C) 1998-2023 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
5164 | 25 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
27 # include "config.h" |
5164 | 28 #endif |
29 | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
30 #include "ovl.h" |
5164 | 31 #include "ov.h" |
32 #include "ov-typeinfo.h" | |
33 #include "ov-re-mat.h" | |
29845
2ef9080ca017
allow more mixed-type assignments to work for sparse matrices (bug #60859)
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
34 #include "ov-flt-re-mat.h" |
5164 | 35 #include "ops.h" |
36 #include "xdiv.h" | |
37 | |
38 #include "sparse-xpow.h" | |
39 #include "sparse-xdiv.h" | |
40 #include "smx-sm-m.h" | |
41 #include "smx-m-sm.h" | |
42 #include "ov-re-sparse.h" | |
43 | |
31605
e88a07dec498
maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents:
30564
diff
changeset
|
44 OCTAVE_BEGIN_NAMESPACE(octave) |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29845
diff
changeset
|
45 |
5164 | 46 // sparse matrix by matrix ops. |
47 | |
48 DEFBINOP_OP (add, sparse_matrix, matrix, +) | |
49 DEFBINOP_OP (sub, sparse_matrix, matrix, -) | |
50 | |
5429 | 51 DEFBINOP_OP (mul, sparse_matrix, matrix, *) |
5164 | 52 |
53 DEFBINOP (div, sparse_matrix, matrix) | |
54 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
55 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
56 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
5785 | 57 MatrixType typ = v2.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
58 |
5785 | 59 Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); |
60 | |
61 v2.matrix_type (typ); | |
62 return ret; | |
5164 | 63 } |
64 | |
65 DEFBINOPX (pow, sparse_matrix, matrix) | |
66 { | |
67 error ("can't do A ^ B for A and B both matrices"); | |
68 } | |
69 | |
70 DEFBINOP (ldiv, sparse_matrix, matrix) | |
71 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
72 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
73 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
6221 | 74 |
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
|
75 if (v1.rows () == 1 && v1.columns () == 1) |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
76 return octave_value (v2.array_value () / v1.scalar_value ()); |
6221 | 77 else |
78 { | |
79 MatrixType typ = v1.matrix_type (); | |
5322 | 80 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
81 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
|
82 v2.matrix_value (), typ); |
6221 | 83 |
84 v1.matrix_type (typ); | |
85 return ret; | |
86 } | |
5164 | 87 } |
88 | |
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
89 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
|
90 |
5164 | 91 DEFBINOP_FN (lt, sparse_matrix, matrix, mx_el_lt) |
92 DEFBINOP_FN (le, sparse_matrix, matrix, mx_el_le) | |
93 DEFBINOP_FN (eq, sparse_matrix, matrix, mx_el_eq) | |
94 DEFBINOP_FN (ge, sparse_matrix, matrix, mx_el_ge) | |
95 DEFBINOP_FN (gt, sparse_matrix, matrix, mx_el_gt) | |
96 DEFBINOP_FN (ne, sparse_matrix, matrix, mx_el_ne) | |
97 | |
98 DEFBINOP_FN (el_mul, sparse_matrix, matrix, product) | |
99 DEFBINOP_FN (el_div, sparse_matrix, matrix, quotient) | |
100 | |
101 DEFBINOP (el_pow, sparse_matrix, matrix) | |
102 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
103 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
104 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
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 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
112 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
113 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
114 |
5164 | 115 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
116 (quotient (v2.matrix_value (), v1.sparse_matrix_value ())); |
5164 | 117 } |
118 | |
119 DEFBINOP_FN (el_and, sparse_matrix, matrix, mx_el_and) | |
120 DEFBINOP_FN (el_or, sparse_matrix, matrix, mx_el_or) | |
121 | |
122 DEFCATOP (sm_m, sparse_matrix, matrix) | |
123 { | |
28630
35f974bab4c8
fix constness of cat op args
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
124 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1); |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
125 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
5164 | 126 SparseMatrix tmp (v2.matrix_value ()); |
127 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
128 } | |
129 | |
29845
2ef9080ca017
allow more mixed-type assignments to work for sparse matrices (bug #60859)
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
130 DEFNDASSIGNOP_FN (assign, sparse_matrix, matrix, matrix, assign); |
2ef9080ca017
allow more mixed-type assignments to work for sparse matrices (bug #60859)
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
131 DEFNDASSIGNOP_FN (sgl_assign, sparse_matrix, float_matrix, matrix, assign); |
5164 | 132 |
133 void | |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
134 install_sm_m_ops (octave::type_info& ti) |
5164 | 135 { |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
136 INSTALL_BINOP_TI (ti, op_add, octave_sparse_matrix, octave_matrix, add); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
137 INSTALL_BINOP_TI (ti, op_sub, octave_sparse_matrix, octave_matrix, sub); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
138 INSTALL_BINOP_TI (ti, op_mul, octave_sparse_matrix, octave_matrix, mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
139 INSTALL_BINOP_TI (ti, op_div, octave_sparse_matrix, octave_matrix, div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
140 INSTALL_BINOP_TI (ti, op_pow, octave_sparse_matrix, octave_matrix, pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
141 INSTALL_BINOP_TI (ti, op_ldiv, octave_sparse_matrix, octave_matrix, ldiv); |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
142 INSTALL_BINOP_TI (ti, op_trans_mul, octave_sparse_matrix, octave_matrix, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
143 trans_mul); |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
144 INSTALL_BINOP_TI (ti, op_herm_mul, octave_sparse_matrix, octave_matrix, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
145 trans_mul); |
24540
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_lt, octave_sparse_matrix, octave_matrix, lt); |
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_le, octave_sparse_matrix, octave_matrix, le); |
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_eq, octave_sparse_matrix, octave_matrix, eq); |
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_ge, octave_sparse_matrix, octave_matrix, ge); |
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_gt, octave_sparse_matrix, octave_matrix, gt); |
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_ne, octave_sparse_matrix, octave_matrix, ne); |
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_el_mul, octave_sparse_matrix, octave_matrix, el_mul); |
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_el_div, octave_sparse_matrix, octave_matrix, el_div); |
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_el_pow, octave_sparse_matrix, octave_matrix, el_pow); |
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_el_ldiv, octave_sparse_matrix, octave_matrix, el_ldiv); |
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_el_and, octave_sparse_matrix, octave_matrix, el_and); |
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_or, octave_sparse_matrix, octave_matrix, el_or); |
5164 | 158 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
159 INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_matrix, sm_m); |
5164 | 160 |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
161 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_matrix, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
162 assign); |
29845
2ef9080ca017
allow more mixed-type assignments to work for sparse matrices (bug #60859)
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
163 INSTALL_ASSIGNOP_TI (ti, op_asn_eq, octave_sparse_matrix, octave_float_matrix, |
2ef9080ca017
allow more mixed-type assignments to work for sparse matrices (bug #60859)
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
164 sgl_assign); |
5164 | 165 } |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29845
diff
changeset
|
166 |
31605
e88a07dec498
maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents:
30564
diff
changeset
|
167 OCTAVE_END_NAMESPACE(octave) |