Skip to content

Commit 592f65f

Browse files
Few coverage nitpicks for the cmath module (#102067)
- partial tests for cosh/sinh overflows (L535 and L771). I doubt both ||-ed conditions could be tested. - removed inaccessible case in sqrt (L832): ax=ay=0 is handled above (L823) because fabs() is exact. Also added test (checked with mpmath and gmpy2) for second condition on that line. - some trivial tests for isclose (cover all conditions on L1217-1218) - add comment for uncovered L1018 Co-authored-by: Mark Dickinson <dickinsm@gmail.com>
1 parent 7c106a4 commit 592f65f

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

Lib/test/cmath_testcases.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1536,6 +1536,7 @@ sqrt0141 sqrt -1.797e+308 -9.9999999999999999e+306 -> 3.7284476432057307e+152 -1
15361536
sqrt0150 sqrt 1.7976931348623157e+308 0.0 -> 1.3407807929942596355e+154 0.0
15371537
sqrt0151 sqrt 2.2250738585072014e-308 0.0 -> 1.4916681462400413487e-154 0.0
15381538
sqrt0152 sqrt 5e-324 0.0 -> 2.2227587494850774834e-162 0.0
1539+
sqrt0153 sqrt 5e-324 1.0 -> 0.7071067811865476 0.7071067811865476
15391540

15401541
-- special values
15411542
sqrt1000 sqrt 0.0 0.0 -> 0.0 0.0
@@ -1744,6 +1745,7 @@ cosh0023 cosh 2.218885944363501 2.0015727395883687 -> -1.94294321081968 4.129026
17441745
-- large real part
17451746
cosh0030 cosh 710.5 2.3519999999999999 -> -1.2967465239355998e+308 1.3076707908857333e+308
17461747
cosh0031 cosh -710.5 0.69999999999999996 -> 1.4085466381392499e+308 -1.1864024666450239e+308
1748+
cosh0032 cosh 720.0 0.0 -> inf 0.0 overflow
17471749

17481750
-- Additional real values (mpmath)
17491751
cosh0050 cosh 1e-150 0.0 -> 1.0 0.0
@@ -1853,6 +1855,7 @@ sinh0023 sinh 0.043713693678420068 0.22512549887532657 -> 0.042624198673416713 0
18531855
-- large real part
18541856
sinh0030 sinh 710.5 -2.3999999999999999 -> -1.3579970564885919e+308 -1.24394470907798e+308
18551857
sinh0031 sinh -710.5 0.80000000000000004 -> -1.2830671601735164e+308 1.3210954193997678e+308
1858+
sinh0032 sinh 720.0 0.0 -> inf 0.0 overflow
18561859

18571860
-- Additional real values (mpmath)
18581861
sinh0050 sinh 1e-100 0.0 -> 1.00000000000000002e-100 0.0

Lib/test/test_cmath.py

+8
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,14 @@ def test_complex_near_zero(self):
607607
self.assertIsClose(0.001-0.001j, 0.001+0.001j, abs_tol=2e-03)
608608
self.assertIsNotClose(0.001-0.001j, 0.001+0.001j, abs_tol=1e-03)
609609

610+
def test_complex_special(self):
611+
self.assertIsNotClose(INF, INF*1j)
612+
self.assertIsNotClose(INF*1j, INF)
613+
self.assertIsNotClose(INF, -INF)
614+
self.assertIsNotClose(-INF, INF)
615+
self.assertIsNotClose(0, INF)
616+
self.assertIsNotClose(0, INF*1j)
617+
610618

611619
if __name__ == "__main__":
612620
unittest.main()

Modules/cmathmodule.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ cmath_sqrt_impl(PyObject *module, Py_complex z)
829829
ax = fabs(z.real);
830830
ay = fabs(z.imag);
831831

832-
if (ax < DBL_MIN && ay < DBL_MIN && (ax > 0. || ay > 0.)) {
832+
if (ax < DBL_MIN && ay < DBL_MIN) {
833833
/* here we catch cases where hypot(ax, ay) is subnormal */
834834
ax = ldexp(ax, CM_SCALE_UP);
835835
s = ldexp(sqrt(ax + hypot(ax, ldexp(ay, CM_SCALE_UP))),
@@ -1013,7 +1013,7 @@ cmath_phase_impl(PyObject *module, Py_complex z)
10131013
double phi;
10141014

10151015
errno = 0;
1016-
phi = c_atan2(z);
1016+
phi = c_atan2(z); /* should not cause any exception */
10171017
if (errno != 0)
10181018
return math_error();
10191019
else

0 commit comments

Comments
 (0)