Mercurial > octave
annotate libinterp/operators/op-sm-cs.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-complex.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 #include "ov-cx-sparse.h" | |
42 #include "smx-sm-cs.h" | |
43 #include "smx-cs-sm.h" | |
44 | |
45 // sparse matrix by scalar ops. | |
46 | |
47 DEFBINOP_OP (add, sparse_matrix, complex, +) | |
48 DEFBINOP_OP (sub, sparse_matrix, complex, -) | |
49 DEFBINOP_OP (mul, sparse_matrix, complex, *) | |
50 | |
51 DEFBINOP (div, sparse_matrix, complex) | |
52 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
53 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
|
54 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
5164 | 55 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
56 return octave_value (v1.sparse_matrix_value () / v2.complex_value ()); |
5164 | 57 } |
58 | |
59 DEFBINOP (pow, sparse_matrix, complex) | |
60 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
61 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
|
62 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
5164 | 63 return xpow (v1.matrix_value (), v2.complex_value ()); |
64 } | |
65 | |
66 DEFBINOP (ldiv, sparse_matrix, complex) | |
67 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
68 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
|
69 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
5164 | 70 |
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
|
71 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
|
72 return octave_value (SparseComplexMatrix (1, 1, v2.complex_value () |
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
73 / v1.scalar_value ())); |
6221 | 74 else |
75 { | |
76 MatrixType typ = v1.matrix_type (); | |
77 SparseMatrix m1 = v1.sparse_matrix_value (); | |
78 ComplexMatrix m2 = ComplexMatrix (1, 1, v2.complex_value ()); | |
79 ComplexMatrix ret = xleftdiv (m1, m2, typ); | |
80 v1.matrix_type (typ); | |
81 return ret; | |
82 } | |
5164 | 83 } |
84 | |
85 DEFBINOP_FN (lt, sparse_matrix, complex, mx_el_lt) | |
86 DEFBINOP_FN (le, sparse_matrix, complex, mx_el_le) | |
87 DEFBINOP_FN (eq, sparse_matrix, complex, mx_el_eq) | |
88 DEFBINOP_FN (ge, sparse_matrix, complex, mx_el_ge) | |
89 DEFBINOP_FN (gt, sparse_matrix, complex, mx_el_gt) | |
90 DEFBINOP_FN (ne, sparse_matrix, complex, mx_el_ne) | |
91 | |
92 DEFBINOP_OP (el_mul, sparse_matrix, complex, *) | |
93 | |
94 DEFBINOP (el_div, sparse_matrix, complex) | |
95 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
96 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
|
97 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
5164 | 98 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
99 return octave_value (v1.sparse_matrix_value () / v2.complex_value ()); |
5164 | 100 } |
101 | |
102 DEFBINOP_FN (el_pow, sparse_matrix, complex, elem_xpow) | |
103 | |
104 DEFBINOP (el_ldiv, sparse_matrix, complex) | |
105 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
106 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
|
107 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
5164 | 108 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
109 return octave_value (x_el_div (v2.complex_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
110 v1.sparse_matrix_value ())); |
5164 | 111 } |
112 | |
113 DEFBINOP_FN (el_and, sparse_matrix, complex, mx_el_and) | |
114 DEFBINOP_FN (el_or, sparse_matrix, complex, mx_el_or) | |
115 | |
116 DEFCATOP (sm_cs, sparse_matrix, complex) | |
117 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
118 octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
119 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2); |
5164 | 120 SparseComplexMatrix tmp (1, 1, v2.complex_value ()); |
121 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
122 } | |
123 | |
124 void | |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
125 install_sm_cs_ops (octave::type_info& ti) |
5164 | 126 { |
24540
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_add, octave_sparse_matrix, octave_complex, add); |
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_sub, octave_sparse_matrix, octave_complex, sub); |
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_mul, octave_sparse_matrix, octave_complex, mul); |
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_div, octave_sparse_matrix, octave_complex, div); |
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_pow, octave_sparse_matrix, octave_complex, pow); |
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_ldiv, octave_sparse_matrix, octave_complex, ldiv); |
5164 | 133 |
24540
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_lt, octave_sparse_matrix, octave_complex, lt); |
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_le, octave_sparse_matrix, octave_complex, le); |
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_eq, octave_sparse_matrix, octave_complex, eq); |
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_ge, octave_sparse_matrix, octave_complex, ge); |
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_gt, octave_sparse_matrix, octave_complex, gt); |
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_ne, octave_sparse_matrix, octave_complex, ne); |
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_el_mul, octave_sparse_matrix, octave_complex, el_mul); |
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_el_div, octave_sparse_matrix, octave_complex, el_div); |
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_el_pow, octave_sparse_matrix, octave_complex, el_pow); |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
143 INSTALL_BINOP_TI (ti, op_el_ldiv, octave_sparse_matrix, octave_complex, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
144 el_ldiv); |
24540
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_el_and, octave_sparse_matrix, octave_complex, el_and); |
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_el_or, octave_sparse_matrix, octave_complex, el_or); |
5164 | 147 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
148 INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_complex, sm_cs); |
5164 | 149 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
150 INSTALL_ASSIGNCONV_TI (ti, octave_sparse_matrix, octave_complex, |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
151 octave_sparse_complex_matrix); |
5164 | 152 } |