Mercurial > octave
annotate libinterp/operators/op-cs-s.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 |
---|---|
2928 | 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) 1996-2019 John W. Eaton |
2928 | 4 |
5 This file is part of Octave. | |
6 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
7 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
|
8 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
|
9 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
|
10 (at your option) any later version. |
2928 | 11 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
12 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
|
13 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
15 GNU General Public License for more details. |
2928 | 16 |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 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
|
19 <https://www.gnu.org/licenses/>. |
2928 | 20 |
21 */ | |
22 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
23 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
24 # include "config.h" |
2928 | 25 #endif |
26 | |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
27 #include "ovl.h" |
2928 | 28 #include "ov.h" |
29 #include "ov-complex.h" | |
30 #include "ov-cx-mat.h" | |
31 #include "ov-scalar.h" | |
32 #include "ov-typeinfo.h" | |
33 #include "ops.h" | |
34 #include "xdiv.h" | |
35 #include "xpow.h" | |
36 | |
37 // complex scalar by scalar ops. | |
38 | |
39 DEFBINOP_OP (add, complex, scalar, +) | |
40 DEFBINOP_OP (sub, complex, scalar, -) | |
41 DEFBINOP_OP (mul, complex, scalar, *) | |
42 | |
43 DEFBINOP (div, complex, scalar) | |
44 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
45 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
46 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 47 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
48 return octave_value (v1.complex_value () / v2.double_value ()); |
2928 | 49 } |
50 | |
51 DEFBINOP_FN (pow, complex, scalar, xpow) | |
52 | |
53 DEFBINOP (ldiv, complex, scalar) | |
54 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
55 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
56 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 57 |
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 (v2.double_value () / v1.complex_value ()); |
2928 | 59 } |
60 | |
9621
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
61 DEFCMPLXCMPOP_OP (lt, complex, scalar, <) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
62 DEFCMPLXCMPOP_OP (le, complex, scalar, <=) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
63 DEFCMPLXCMPOP_OP (eq, complex, scalar, ==) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
64 DEFCMPLXCMPOP_OP (ge, complex, scalar, >=) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
65 DEFCMPLXCMPOP_OP (gt, complex, scalar, >) |
3ee9029931b3
fix scalar complex-real comparisons
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
66 DEFCMPLXCMPOP_OP (ne, complex, scalar, !=) |
2928 | 67 |
68 DEFBINOP_OP (el_mul, complex, scalar, *) | |
69 | |
70 DEFBINOP (el_div, complex, scalar) | |
71 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
72 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
73 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 74 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
75 return octave_value (v1.complex_value () / v2.double_value ()); |
2928 | 76 } |
77 | |
78 DEFBINOP_FN (el_pow, complex, scalar, xpow) | |
79 | |
80 DEFBINOP (el_ldiv, complex, scalar) | |
81 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
82 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
83 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 84 |
26596
cc0d942d0e20
Remove inconsistent warning "Octave:divide-by-zero" (bug #46650).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
26376
diff
changeset
|
85 return octave_value (v2.double_value () / v1.complex_value ()); |
2928 | 86 } |
87 | |
88 DEFBINOP (el_and, complex, scalar) | |
89 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
90 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
91 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 92 |
93 return v1.complex_value () != 0.0 && v2.double_value (); | |
94 } | |
95 | |
96 DEFBINOP (el_or, complex, scalar) | |
97 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
98 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
99 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); |
2928 | 100 |
101 return v1.complex_value () != 0.0 || v2.double_value (); | |
102 } | |
103 | |
4915 | 104 DEFNDCATOP_FN (cs_s, complex, scalar, complex_array, array, concat) |
105 | |
2928 | 106 void |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
107 install_cs_s_ops (octave::type_info& ti) |
2928 | 108 { |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
109 INSTALL_BINOP_TI (ti, op_add, octave_complex, octave_scalar, add); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
110 INSTALL_BINOP_TI (ti, op_sub, octave_complex, octave_scalar, sub); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
111 INSTALL_BINOP_TI (ti, op_mul, octave_complex, octave_scalar, mul); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
112 INSTALL_BINOP_TI (ti, op_div, octave_complex, octave_scalar, div); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
113 INSTALL_BINOP_TI (ti, op_pow, octave_complex, octave_scalar, pow); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
114 INSTALL_BINOP_TI (ti, op_ldiv, octave_complex, octave_scalar, ldiv); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
115 INSTALL_BINOP_TI (ti, op_lt, octave_complex, octave_scalar, lt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
116 INSTALL_BINOP_TI (ti, op_le, octave_complex, octave_scalar, le); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
117 INSTALL_BINOP_TI (ti, op_eq, octave_complex, octave_scalar, eq); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
118 INSTALL_BINOP_TI (ti, op_ge, octave_complex, octave_scalar, ge); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
119 INSTALL_BINOP_TI (ti, op_gt, octave_complex, octave_scalar, gt); |
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
120 INSTALL_BINOP_TI (ti, op_ne, octave_complex, octave_scalar, ne); |
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_el_mul, octave_complex, octave_scalar, el_mul); |
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_el_div, octave_complex, octave_scalar, el_div); |
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_el_pow, octave_complex, octave_scalar, el_pow); |
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_el_ldiv, octave_complex, octave_scalar, el_ldiv); |
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_el_and, octave_complex, octave_scalar, el_and); |
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_el_or, octave_complex, octave_scalar, el_or); |
2928 | 127 |
24540
46440078d73b
don't use singleton for octave_value_typeinfo
John W. Eaton <jwe@octave.org>
parents:
24534
diff
changeset
|
128 INSTALL_CATOP_TI (ti, octave_complex, octave_scalar, cs_s); |
4915 | 129 |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
130 INSTALL_ASSIGNCONV_TI (ti, octave_complex, octave_scalar, |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
131 octave_complex_matrix); |
2928 | 132 } |