Add rounding methods for fmpz and tests

Author: oscarbenjamin

src/flint/fmpq.pyx

@@ -130,10 +130,7 @@ cdef class fmpq(flint_scalar):
             return "%s/%s" % (self.p.str(**kwargs), self.q.str(**kwargs))
 
     def __int__(self):
-        if self.p >= 0:
-            return int(self.p // self.q)
-        else:
-            return - int((-self.p) // self.q)
+        return int(self.trunc())
 
     def __floor__(self):
         return self.floor()

src/flint/fmpz.pyx

@@ -115,6 +115,21 @@ cdef class fmpz(flint_scalar):
     def __float__(self):
         return float(fmpz_get_intlong(self.val))
 
+    def __floor__(self):
+        return self
+
+    def __ceil__(self):
+        return self
+
+    def __trunc__(self):
+        return self
+
+    def __round__(self, ndigits=None):
+        if ndigits is None:
+            return self
+        else:
+            return fmpz(round(int(self), ndigits))
+
     def __richcmp__(s, t, int op):
         cdef bint res = 0
         cdef long tl

test/test.py

@@ -161,6 +161,18 @@ def test_fmpz():
     assert type(operator.index(f)) is int
     assert float(f) == 2.0
     assert type(float(f)) is float
+    assert round(f) == 2
+    assert type(round(f)) is flint.fmpz
+    assert round(f, 1) == 2
+    assert type(round(f, 1)) is flint.fmpz
+    assert round(f, -1) == 0
+    assert type(round(f, -1)) is flint.fmpz
+    assert math.trunc(f) == 2
+    assert type(math.trunc(f)) is flint.fmpz
+    assert math.floor(f) == 2
+    assert type(math.floor(f)) is flint.fmpz
+    assert math.ceil(f) == 2
+    assert type(math.ceil(f)) is flint.fmpz
 
     assert flint.fmpz(2) != []
     assert +flint.fmpz(0) == 0
@@ -811,21 +823,27 @@ def test_fmpq():
     assert Q(5,3).ceil() == flint.fmpz(2)
     assert Q(-5,3).ceil() == flint.fmpz(-1)
 
-    assert int(Q(5,3)) == flint.fmpz(1)
+    assert type(int(Q(5,3))) is int
+    assert type(math.floor(Q(5,3))) is flint.fmpz
+    assert type(math.ceil(Q(5,3))) is flint.fmpz
+    assert type(math.trunc(Q(5,3))) is flint.fmpz
+    assert type(round(Q(5,3))) is flint.fmpz
+    assert type(round(Q(5,3))) is flint.fmpz
+    assert type(round(Q(5,3), 0)) is flint.fmpq
+    assert type(round(Q(5,3), 1)) is flint.fmpq
+
+    assert int(Q(5,3)) == 1
     assert math.floor(Q(5,3)) == flint.fmpz(1)
     assert math.ceil(Q(5,3)) == flint.fmpz(2)
     assert math.trunc(Q(5,3)) == flint.fmpz(1)
-    assert round(Q(5,3)) == 2
+    assert round(Q(5,3)) == flint.fmpz(2)
 
     assert int(Q(-5,3)) == flint.fmpz(-1)
     assert math.floor(Q(-5,3)) == flint.fmpz(-2)
     assert math.ceil(Q(-5,3)) == flint.fmpz(-1)
     assert math.trunc(Q(-5,3)) == flint.fmpz(-1)
     assert round(Q(-5,3)) == -2
 
-    assert type(round(Q(5,3))) is flint.fmpz
-    assert type(round(Q(5,3), 0)) is flint.fmpq
-    assert type(round(Q(5,3), 1)) is flint.fmpq
     assert round(Q(100,3), 2) == Q(3333,100)
     assert round(Q(100,3), 0) == Q(33,1)
     assert round(Q(100,3), -1) == Q(30,1)