Mercurial > octave
annotate libinterp/operators/op-s-sm.cc @ 27919:1891570abac8
update Octave Project Developers copyright for the new year
In files that have the "Octave Project Developers" copyright notice,
update for 2020.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 Jan 2020 22:29:51 -0500 |
parents | b442ec6dda5c |
children | bd51beb6205e |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
27919
1891570abac8
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27918
diff
changeset
|
3 Copyright (C) 1998-2020 The Octave Project Developers |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26596
diff
changeset
|
4 |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26596
diff
changeset
|
5 See the file COPYRIGHT.md in the top-level directory of this distribution |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26596
diff
changeset
|
6 or <https://octave.org/COPYRIGHT.html/>. |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
26596
diff
changeset
|
7 |
7016 | 8 |
9 This file is part of Octave. | |
5164 | 10 |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
11 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
|
12 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
|
13 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
|
14 (at your option) any later version. |
5164 | 15 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
16 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
|
17 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
19 GNU General Public License for more details. |
5164 | 20 |
21 You should have received a copy of the GNU General Public License | |
7016 | 22 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
|
23 <https://www.gnu.org/licenses/>. |
5164 | 24 |
25 */ | |
26 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
27 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
28 # include "config.h" |
5164 | 29 #endif |
30 | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
31 #include "ovl.h" |
5164 | 32 #include "ov.h" |
33 #include "ov-typeinfo.h" | |
34 #include "ov-scalar.h" | |
35 #include "ops.h" | |
36 #include "xpow.h" | |
37 | |
38 #include "sparse-xpow.h" | |
39 #include "sparse-xdiv.h" | |
40 #include "ov-re-sparse.h" | |
41 | |
42 // scalar by sparse matrix ops. | |
43 | |
44 DEFBINOP_OP (add, scalar, sparse_matrix, +) | |
45 DEFBINOP_OP (sub, scalar, sparse_matrix, -) | |
46 DEFBINOP_OP (mul, scalar, sparse_matrix, *) | |
47 | |
48 DEFBINOP (div, scalar, sparse_matrix) | |
49 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
50 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
51 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5164 | 52 |
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
|
53 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
|
54 return octave_value (SparseMatrix (1, 1, v1.scalar_value () / v2.scalar_value ())); |
6221 | 55 else |
56 { | |
57 MatrixType typ = v2.matrix_type (); | |
58 Matrix m1 = Matrix (1, 1, v1.double_value ()); | |
59 SparseMatrix m2 = v2.sparse_matrix_value (); | |
60 Matrix ret = xdiv (m1, m2, typ); | |
61 v2.matrix_type (typ); | |
62 return ret; | |
63 } | |
5164 | 64 } |
65 | |
66 DEFBINOP (pow, scalar, sparse_matrix) | |
67 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
68 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
69 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5164 | 70 return xpow (v1.scalar_value (), v2.matrix_value ()); |
71 } | |
72 | |
73 DEFBINOP (ldiv, scalar, sparse_matrix) | |
74 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
75 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
76 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5164 | 77 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
78 return octave_value (v2.sparse_matrix_value () / v1.double_value ()); |
5164 | 79 } |
80 | |
81 DEFBINOP_FN (lt, scalar, sparse_matrix, mx_el_lt) | |
82 DEFBINOP_FN (le, scalar, sparse_matrix, mx_el_le) | |
83 DEFBINOP_FN (eq, scalar, sparse_matrix, mx_el_eq) | |
84 DEFBINOP_FN (ge, scalar, sparse_matrix, mx_el_ge) | |
85 DEFBINOP_FN (gt, scalar, sparse_matrix, mx_el_gt) | |
86 DEFBINOP_FN (ne, scalar, sparse_matrix, mx_el_ne) | |
87 | |
88 DEFBINOP_OP (el_mul, scalar, sparse_matrix, *) | |
89 DEFBINOP_FN (el_div, scalar, sparse_matrix, x_el_div) | |
90 DEFBINOP_FN (el_pow, scalar, sparse_matrix, elem_xpow) | |
91 | |
92 DEFBINOP (el_ldiv, scalar, sparse_matrix) | |
93 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
94 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
95 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5164 | 96 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
97 return octave_value (v2.sparse_matrix_value () / v1.double_value ()); |
5164 | 98 } |
99 | |
100 DEFBINOP_FN (el_and, scalar, sparse_matrix, mx_el_and) | |
101 DEFBINOP_FN (el_or, scalar, sparse_matrix, mx_el_or) | |
102 | |
103 DEFCATOP (s_sm, scalar, sparse_matrix) | |
104 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
105 octave_scalar& v1 = dynamic_cast<octave_scalar&> (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); |
5164 | 107 SparseMatrix tmp (1, 1, v1.scalar_value ()); |
5533 | 108 return octave_value (tmp.concat (v2.sparse_matrix_value (), ra_idx)); |
5164 | 109 } |
110 | |
111 DEFCONV (sparse_matrix_conv, scalar, sparse_matrix) | |
112 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
113 const octave_scalar& v = dynamic_cast<const octave_scalar&> (a); |
5164 | 114 |
115 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); | |
116 } | |
117 | |
118 void | |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
119 install_s_sm_ops (octave::type_info& ti) |
5164 | 120 { |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
121 INSTALL_BINOP_TI (ti, op_add, octave_scalar, octave_sparse_matrix, add); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
122 INSTALL_BINOP_TI (ti, op_sub, octave_scalar, octave_sparse_matrix, sub); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
123 INSTALL_BINOP_TI (ti, op_mul, octave_scalar, octave_sparse_matrix, mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
124 INSTALL_BINOP_TI (ti, op_div, octave_scalar, octave_sparse_matrix, div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
125 INSTALL_BINOP_TI (ti, op_pow, octave_scalar, octave_sparse_matrix, pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
126 INSTALL_BINOP_TI (ti, op_ldiv, octave_scalar, octave_sparse_matrix, ldiv); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
127 INSTALL_BINOP_TI (ti, op_lt, octave_scalar, octave_sparse_matrix, lt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
128 INSTALL_BINOP_TI (ti, op_le, octave_scalar, octave_sparse_matrix, le); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
129 INSTALL_BINOP_TI (ti, op_eq, octave_scalar, octave_sparse_matrix, eq); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
130 INSTALL_BINOP_TI (ti, op_ge, octave_scalar, octave_sparse_matrix, ge); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
131 INSTALL_BINOP_TI (ti, op_gt, octave_scalar, octave_sparse_matrix, gt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
132 INSTALL_BINOP_TI (ti, op_ne, octave_scalar, octave_sparse_matrix, ne); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
133 INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_sparse_matrix, el_mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
134 INSTALL_BINOP_TI (ti, op_el_div, octave_scalar, octave_sparse_matrix, el_div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
135 INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_sparse_matrix, el_pow); |
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_el_ldiv, octave_scalar, octave_sparse_matrix, el_ldiv); |
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_el_and, octave_scalar, octave_sparse_matrix, el_and); |
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_el_or, octave_scalar, octave_sparse_matrix, el_or); |
5164 | 139 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
140 INSTALL_CATOP_TI (ti, octave_scalar, octave_sparse_matrix, s_sm); |
5164 | 141 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
142 INSTALL_ASSIGNCONV_TI (ti, octave_scalar, octave_sparse_matrix, octave_matrix); |
5164 | 143 |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
144 INSTALL_WIDENOP_TI (ti, octave_scalar, octave_sparse_matrix, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
145 sparse_matrix_conv); |
5164 | 146 } |