Mercurial > octave
annotate libinterp/operators/op-m-sm.cc @ 33658:b1d6e40ac737 stable tip
NEWS.9.md: Fix typo and minor formatting changes.
* etc/NEWS.9.md: Fix typo. Adjust whitespace. Use markdown syntax for code
snippets.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Wed, 05 Jun 2024 11:27:35 +0200 |
parents | 2e484f9f1f18 |
children |
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 // |
32632
2e484f9f1f18
maint: update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
31867
diff
changeset
|
3 // Copyright (C) 1998-2024 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" | |
34 #include "ops.h" | |
35 #include "xdiv.h" | |
36 | |
37 #include "sparse-xpow.h" | |
38 #include "sparse-xdiv.h" | |
39 #include "smx-sm-m.h" | |
40 #include "smx-m-sm.h" | |
41 #include "ov-re-sparse.h" | |
42 | |
31605
e88a07dec498
maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents:
30564
diff
changeset
|
43 OCTAVE_BEGIN_NAMESPACE(octave) |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
44 |
5164 | 45 // matrix by sparse matrix ops. |
46 | |
47 DEFBINOP_OP (add, matrix, sparse_matrix, +) | |
48 DEFBINOP_OP (sub, matrix, sparse_matrix, -) | |
49 | |
5429 | 50 DEFBINOP_OP (mul, matrix, sparse_matrix, *) |
5164 | 51 |
52 DEFBINOP (div, matrix, sparse_matrix) | |
53 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
54 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
55 OCTAVE_CAST_BASE_VALUE (const octave_sparse_matrix&, v2, a2); |
6221 | 56 |
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
|
57 if (v2.rows () == 1 && v2.columns () == 1) |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
58 return octave_value (v1.array_value () / v2.scalar_value ()); |
6221 | 59 else |
60 { | |
61 MatrixType typ = v2.matrix_type (); | |
5322 | 62 |
6221 | 63 Matrix ret = xdiv (v1.matrix_value (), v2.sparse_matrix_value (), typ); |
64 | |
65 v2.matrix_type (typ); | |
66 return ret; | |
67 } | |
5164 | 68 } |
69 | |
70 DEFBINOPX (pow, matrix, sparse_matrix) | |
71 { | |
72 error ("can't do A ^ B for A and B both matrices"); | |
73 } | |
74 | |
75 DEFBINOP (ldiv, matrix, sparse_matrix) | |
76 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
77 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
78 OCTAVE_CAST_BASE_VALUE (const octave_sparse_matrix&, v2, a2); |
5785 | 79 MatrixType typ = v1.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
80 |
5785 | 81 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); |
82 | |
83 v1.matrix_type (typ); | |
84 return ret; | |
5164 | 85 } |
86 | |
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7289
diff
changeset
|
87 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
|
88 |
5164 | 89 DEFBINOP_FN (lt, matrix, sparse_matrix, mx_el_lt) |
90 DEFBINOP_FN (le, matrix, sparse_matrix, mx_el_le) | |
91 DEFBINOP_FN (eq, matrix, sparse_matrix, mx_el_eq) | |
92 DEFBINOP_FN (ge, matrix, sparse_matrix, mx_el_ge) | |
93 DEFBINOP_FN (gt, matrix, sparse_matrix, mx_el_gt) | |
94 DEFBINOP_FN (ne, matrix, sparse_matrix, mx_el_ne) | |
95 | |
96 DEFBINOP_FN (el_mul, matrix, sparse_matrix, product) | |
97 DEFBINOP_FN (el_div, matrix, sparse_matrix, quotient) | |
98 | |
99 DEFBINOP (el_pow, matrix, sparse_matrix) | |
100 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
101 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
102 OCTAVE_CAST_BASE_VALUE (const octave_sparse_matrix&, v2, a2); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
103 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
104 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
|
105 v2.sparse_matrix_value ())); |
5164 | 106 } |
107 | |
108 DEFBINOP (el_ldiv, matrix, sparse_matrix) | |
109 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
110 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
111 OCTAVE_CAST_BASE_VALUE (const octave_sparse_matrix&, v2, a2); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
112 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
113 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
114 (quotient (v2.sparse_matrix_value (), v1.matrix_value ())); |
5164 | 115 } |
116 | |
117 DEFBINOP_FN (el_and, matrix, sparse_matrix, mx_el_and) | |
118 DEFBINOP_FN (el_or, matrix, sparse_matrix, mx_el_or) | |
119 | |
120 DEFCATOP (m_sm, matrix, sparse_matrix) | |
121 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
122 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v1, a1); |
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
123 OCTAVE_CAST_BASE_VALUE (const octave_sparse_matrix&, v2, a2); |
5164 | 124 SparseMatrix tmp (v1.matrix_value ()); |
125 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
126 } | |
127 | |
128 DEFCONV (sparse_matrix_conv, matrix, sparse_matrix) | |
129 { | |
31867
a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
John W. Eaton <jwe@octave.org>
parents:
31866
diff
changeset
|
130 OCTAVE_CAST_BASE_VALUE (const octave_matrix&, v, a); |
5164 | 131 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); |
132 } | |
133 | |
7289 | 134 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign) |
135 | |
5164 | 136 void |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
137 install_m_sm_ops (octave::type_info& ti) |
5164 | 138 { |
24540
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_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
|
140 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
|
141 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
|
142 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
|
143 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
|
144 INSTALL_BINOP_TI (ti, op_ldiv, octave_matrix, octave_sparse_matrix, ldiv); |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
145 INSTALL_BINOP_TI (ti, op_mul_trans, octave_matrix, octave_sparse_matrix, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
146 mul_trans); |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
147 INSTALL_BINOP_TI (ti, op_mul_herm, octave_matrix, octave_sparse_matrix, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
148 mul_trans); |
24540
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_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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 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
|
156 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
|
157 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
|
158 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
|
159 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
|
160 INSTALL_BINOP_TI (ti, op_el_or, octave_matrix, octave_sparse_matrix, el_or); |
5164 | 161 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
162 INSTALL_CATOP_TI (ti, octave_matrix, octave_sparse_matrix, m_sm); |
5164 | 163 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
164 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
|
165 INSTALL_ASSIGNCONV_TI (ti, octave_matrix, octave_sparse_matrix, octave_matrix) |
5164 | 166 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
167 INSTALL_WIDENOP_TI (ti, octave_matrix, octave_sparse_matrix, |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
168 sparse_matrix_conv); |
5164 | 169 } |
29989
b260322f6730
move xdiv, xnorm, and xpow inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29359
diff
changeset
|
170 |
31605
e88a07dec498
maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents:
30564
diff
changeset
|
171 OCTAVE_END_NAMESPACE(octave) |