Merge pull request #341 from Maegereg/dasm/hash

Add hash function and re-enable hash tests

Author: oscarbenjamin

src/flint/test/test_arb.py

@@ -110,37 +110,35 @@ def test_contains():
     ]:
         assert (x in y) == expected
 
-# TODO: Re-enable this if we ever add the ability to hash arbs.
-# def test_hash():
-#     """`x` and `y` hash to the same value if they have the same midpoint and radius.
-
-#     Args:
-#         x: An arb.
-#         y: An arb.
-#         expected: Whether `x` and `y` should hash to the same value.
-#     """
-#     def arb_pi(prec):
-#         """Helper to calculate arb to a given precision."""
-#         with ctx.workprec(prec):
-#             return arb.pi()
-#     for x, y, expected in [
-#         (arb(10), arb(10), True),
-#         (arb(10), arb(11), False),
-#         (arb(10.0), arb(10), True),
-#         (
-#             arb(mid=10, rad=2),
-#             arb(mid=10, rad=2),
-#             True,
-#         ),
-#         (
-#             arb(mid=10, rad=2),
-#             arb(mid=10, rad=3),
-#             False,
-#         ),
-#         (arb_pi(100), arb_pi(100), True),
-#         (arb_pi(100), arb_pi(1000), False),
-#     ]:
-#         assert (hash(x) == hash(y)) == expected
+def test_hash():
+    """`x` and `y` hash to the same value if they have the same midpoint and radius.
+
+    Args:
+        x: An arb.
+        y: An arb.
+        expected: Whether `x` and `y` should hash to the same value.
+    """
+    def arb_pi(prec):
+        """Helper to calculate arb to a given precision."""
+        with ctx.workprec(prec):
+            return arb.pi()
+    for x, y, expected in [
+        (arb(10), arb(10), True),
+        (arb(10), arb(11), False),
+        (arb(10.0), arb(10), True),
+    ]:
+        assert (hash(x) == hash(y)) == expected
+
+    for x in [
+        arb(mid=10, rad=2),
+        arb_pi(100),
+    ]:
+        try:
+            hash(x)
+        except ValueError:
+            pass
+        else:
+            assert False, f"Expected {x} to raise an error if hashed, but succeeded."
 
 
 
@@ -338,8 +336,7 @@ def test_no_tests_missing():
     test_lower,
     test_upper,
     test_contains,
-    # TODO: Re-enable this if we ever add the ability to hash arbs.
-    # test_hash,
+    test_hash,
     test_arb_sub,
     test_arb_add,
     test_arb_mul,

src/flint/types/arb.pyx

@@ -527,6 +527,12 @@ cdef class arb(flint_scalar):
             arb_clear(tval)
         return res
 
+    def __hash__(self):
+        """Hash."""
+        if self.is_exact():
+            return hash((self.mid().man_exp(), self.rad().man_exp()))
+        raise ValueError(f"Cannot hash non-exact arb: {self}. See pull/341 for details.")
+
     def __contains__(self, other):
         other = any_as_arb(other)
         return arb_contains(self.val, (<arb>other).val)