Mercurial > octave
annotate libinterp/operators/op-sm-m.cc @ 26596:cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
* libinterp/corefcn/errwarn.h (warn_divide_by_zero),
libinterp/corefcn/errwarn.cc (warn_divide_by_zero): Deprecate function
"warn_divide_by_zero", and leave implementation empty for a few releases.
* libinterp/corefcn/error.cc: Use different id for test.
* examples/code/make_int.cc: No longer advertise "warn_divide_by_zero" in the
examples.
* libinterp/operators/op-*-*.cc: Remove unused header "errwarn.h". Remove check
for scalar zero divisor including the warning.
* libinterp/operators/op-dms-template.cc (gripe_if_zero): Remove function.
* scripts/general/quadgk.m, scripts/general/quadv.m,
scripts/statistics/kurtosis.m, scripts/statistics/mean.m,
scripts/statistics/skewness.m: No longer need to turn off unused warning.
* scripts/help/warning_ids.m: Remove documentation of "Octave:divide-by-zero".
* test/jit.tst, test/mk-sparse-tst.sh, test/prefer.tst: Remove warning
"Octave:divide-by-zero".
author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
---|---|
date | Tue, 22 Jan 2019 14:34:08 +0100 |
parents | 00f796120a6d |
children | b442ec6dda5c |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
26376
00f796120a6d
maint: Update copyright dates in all source files.
John W. Eaton <jwe@octave.org>
parents:
25103
diff
changeset
|
3 Copyright (C) 2004-2019 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 | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20893
diff
changeset
|
28 #include "ovl.h" |
5164 | 29 #include "ov.h" |
30 #include "ov-typeinfo.h" | |
31 #include "ov-re-mat.h" | |
32 #include "ops.h" | |
33 #include "xdiv.h" | |
34 | |
35 #include "sparse-xpow.h" | |
36 #include "sparse-xdiv.h" | |
37 #include "smx-sm-m.h" | |
38 #include "smx-m-sm.h" | |
39 #include "ov-re-sparse.h" | |
40 | |
41 // sparse matrix by matrix ops. | |
42 | |
43 DEFBINOP_OP (add, sparse_matrix, matrix, +) | |
44 DEFBINOP_OP (sub, sparse_matrix, matrix, -) | |
45 | |
5429 | 46 DEFBINOP_OP (mul, sparse_matrix, matrix, *) |
5164 | 47 |
48 DEFBINOP (div, sparse_matrix, matrix) | |
49 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
50 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
|
51 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
5785 | 52 MatrixType typ = v2.matrix_type (); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
53 |
5785 | 54 Matrix ret = xdiv (v1.matrix_value (), v2.matrix_value (), typ); |
55 | |
56 v2.matrix_type (typ); | |
57 return ret; | |
5164 | 58 } |
59 | |
60 DEFBINOPX (pow, sparse_matrix, matrix) | |
61 { | |
62 error ("can't do A ^ B for A and B both matrices"); | |
63 } | |
64 | |
65 DEFBINOP (ldiv, sparse_matrix, matrix) | |
66 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
67 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
|
68 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
6221 | 69 |
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
|
70 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
|
71 return octave_value (v2.array_value () / v1.scalar_value ()); |
6221 | 72 else |
73 { | |
74 MatrixType typ = v1.matrix_type (); | |
5322 | 75 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
76 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
|
77 v2.matrix_value (), typ); |
6221 | 78 |
79 v1.matrix_type (typ); | |
80 return ret; | |
81 } | |
5164 | 82 } |
83 | |
7802
1a446f28ce68
implement optimized sparse-dense transposed multiplication
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
84 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
|
85 |
5164 | 86 DEFBINOP_FN (lt, sparse_matrix, matrix, mx_el_lt) |
87 DEFBINOP_FN (le, sparse_matrix, matrix, mx_el_le) | |
88 DEFBINOP_FN (eq, sparse_matrix, matrix, mx_el_eq) | |
89 DEFBINOP_FN (ge, sparse_matrix, matrix, mx_el_ge) | |
90 DEFBINOP_FN (gt, sparse_matrix, matrix, mx_el_gt) | |
91 DEFBINOP_FN (ne, sparse_matrix, matrix, mx_el_ne) | |
92 | |
93 DEFBINOP_FN (el_mul, sparse_matrix, matrix, product) | |
94 DEFBINOP_FN (el_div, sparse_matrix, matrix, quotient) | |
95 | |
96 DEFBINOP (el_pow, sparse_matrix, matrix) | |
97 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
98 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
|
99 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
|
100 |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
101 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
|
102 SparseMatrix (v2.matrix_value ()))); |
5164 | 103 } |
104 | |
105 DEFBINOP (el_ldiv, sparse_matrix, matrix) | |
106 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
107 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
|
108 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
|
109 |
5164 | 110 return octave_value |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
111 (quotient (v2.matrix_value (), v1.sparse_matrix_value ())); |
5164 | 112 } |
113 | |
114 DEFBINOP_FN (el_and, sparse_matrix, matrix, mx_el_and) | |
115 DEFBINOP_FN (el_or, sparse_matrix, matrix, mx_el_or) | |
116 | |
117 DEFCATOP (sm_m, sparse_matrix, matrix) | |
118 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
119 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
|
120 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
5164 | 121 SparseMatrix tmp (v2.matrix_value ()); |
122 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
123 } | |
124 | |
125 DEFASSIGNOP (assign, sparse_matrix, matrix) | |
126 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
127 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
|
128 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2); |
5164 | 129 |
130 SparseMatrix tmp (v2.matrix_value ()); | |
131 v1.assign (idx, tmp); | |
132 return octave_value (); | |
133 } | |
134 | |
135 void | |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
136 install_sm_m_ops (octave::type_info& ti) |
5164 | 137 { |
24540
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_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
|
139 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
|
140 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
|
141 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
|
142 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
|
143 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
|
144 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
|
145 trans_mul); |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
146 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
|
147 trans_mul); |
24540
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_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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 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
|
156 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
|
157 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
|
158 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
|
159 INSTALL_BINOP_TI (ti, op_el_or, octave_sparse_matrix, octave_matrix, el_or); |
5164 | 160 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
161 INSTALL_CATOP_TI (ti, octave_sparse_matrix, octave_matrix, sm_m); |
5164 | 162 |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
163 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
|
164 assign); |
5164 | 165 } |