Fix is_close tolerance in tests

Author: oscarbenjamin

src/flint/test/helpers.py

@@ -29,7 +29,7 @@ def is_close_arb(
         isinstance(x, arb)
         and x.rad() < max_width_arb
         and y.rad() < max_width_arb
-        and abs(x - y) <= tol_arb + rel_tol_arb * max(abs(x), abs(y))
+        and abs(x - y) <= tol_arb + rel_tol_arb * abs(y)
     )
 
 
@@ -42,10 +42,14 @@ def is_close_acb(
     max_width: int | float | str | arb = 1e-10,
 ) -> bool:
     y = acb(y)
+    tol_arb = arb(tol)
+    rel_tol_arb = arb(rel_tol)
+    max_width_arb = arb(max_width)
     return (
         isinstance(x, acb)
-        and is_close_arb(x.real, y.real, tol=tol, rel_tol=rel_tol, max_width=max_width)
-        and is_close_arb(x.imag, y.imag, tol=tol, rel_tol=rel_tol, max_width=max_width)
+        and x.rad() < max_width_arb
+        and y.rad() < max_width_arb
+        and abs(x - y) <= tol_arb + rel_tol_arb * abs(y)
     )
 
 

src/flint/test/test_acb_poly.py

@@ -237,8 +237,8 @@ def test_acb_poly_roots_and_complex_roots() -> None:
     p = x**2 + 1
     rs0 = p.roots()
     assert len(rs0) == 2
-    assert any(is_close_acb(r, 1j, tol=1e-5) for r in rs0)
-    assert any(is_close_acb(r, -1j, tol=1e-5) for r in rs0)
+    assert any(is_close_acb(r, 1j, tol=1e-5, max_width=1e-5) for r in rs0)
+    assert any(is_close_acb(r, -1j, tol=1e-5, max_width=1e-5) for r in rs0)
 
     rs = p.roots(tol=1e-30, maxprec=128)
     assert len(rs) == 2

src/flint/test/test_arb_poly.py

@@ -59,8 +59,8 @@ def test_arb_poly_from_roots_and_complex_roots() -> None:
 
     roots = arb_poly([1, 0, 1]).complex_roots()
     assert len(roots) == 2
-    assert any(is_close_acb(r, acb(0, 1), tol=1e-5) for r in roots)
-    assert any(is_close_acb(r, acb(0, -1), tol=1e-5) for r in roots)
+    assert any(is_close_acb(r, acb(0, 1), tol=1e-5, max_width=1e-5) for r in roots)
+    assert any(is_close_acb(r, acb(0, -1), tol=1e-5, max_width=1e-5) for r in roots)
 
 
 def test_arb_poly_evaluate() -> None: