test: add tests for fmpz and fmpz_mat

Author: oscarbenjamin

.coveragerc

@@ -1,2 +1,6 @@
 [run]
 plugins = coverage_plugin
+
+[report]
+exclude_lines =
+    assert False

src/flint/test/test_all.py

@@ -21,6 +21,11 @@ def raises(f, exception):
     return False
 
 
+def test_raises():
+    assert raises(lambda: 1/0, ZeroDivisionError) is True
+    assert raises(lambda: 1/1, ZeroDivisionError) is False
+
+
 _default_ctx_string = """\
 pretty = True      # pretty-print repr() output
 unicode = False    # use unicode characters in output
@@ -153,8 +158,9 @@ def test_fmpz():
         # https://github.com/flintlib/python-flint/issues/74
         if not PYPY:
             assert pow(a, flint.fmpz(b), c) == ab_mod_c
-            assert pow(a, b, flint.fmpz(c)) == ab_mod_c
             assert pow(a, flint.fmpz(b), flint.fmpz(c)) == ab_mod_c
+            assert pow(a, b, flint.fmpz(c)) == ab_mod_c
+            assert raises(lambda: pow([], flint.fmpz(2), 2), TypeError)
 
     assert raises(lambda: pow(flint.fmpz(2), 2, 0), ValueError)
     # XXX: Handle negative modulus like int?
@@ -602,7 +608,8 @@ def set_bad(i,j):
     assert raises(lambda: M([[1,1],[1,1]]).solve(b), ZeroDivisionError)
     assert raises(lambda: M([[1,2],[3,4],[5,6]]).solve(b), ValueError)
     assert M([[1,0],[1,2]]).solve(b) == flint.fmpq_mat([[3],[2]])
-    assert raises(lambda: M([[1,0],[1,2]]).solve(b, integer=True), ValueError)
+    assert raises(lambda: M([[1,0],[1,0]]).solve(b, integer=True), ZeroDivisionError)
+    assert raises(lambda: M([[1,0],[1,2]]).solve(b, integer=True), DomainError)
     assert raises(lambda: M([[1,2,3],[4,5,6]]).inv(), ValueError)
     assert raises(lambda: M([[1,1],[1,1]]).inv(), ZeroDivisionError)
     assert raises(lambda: M([[1,0],[1,2]]).inv(integer=True), ValueError)
@@ -632,6 +639,7 @@ def set_bad(i,j):
     for gram in "approx", "exact":
         assert M4.lll(rep=rep, gram=gram) == L4
         assert M4.lll(rep=rep, gram=gram, transform=True) == (L4, T4)
+    assert raises(lambda: M4.lll(rep="gram"), AssertionError)
     assert raises(lambda: M4.lll(rep="bad"), ValueError)
     assert raises(lambda: M4.lll(gram="bad"), ValueError)
     M5 = M([[1,2,3],[4,5,6]])
@@ -4505,6 +4513,7 @@ def test_all_tests():
 
 all_tests = [
 
+    test_raises,
     test_pyflint,
     test_showgood,
 

src/flint/types/fmpz.pyx

@@ -378,18 +378,15 @@ cdef class fmpz(flint_scalar):
         return u
 
     def __pow__(s, t, m):
-        cdef fmpz_struct sval[1]
-        cdef fmpz_struct tval[1]
-        cdef fmpz_struct mval[1]
-        cdef int stype = FMPZ_UNKNOWN
+        cdef fmpz_t tval
+        cdef fmpz_t mval
         cdef int ttype = FMPZ_UNKNOWN
         cdef int mtype = FMPZ_UNKNOWN
         cdef int success
         u = NotImplemented
 
         try:
-            stype = fmpz_set_any_ref(sval, s)
-            if stype == FMPZ_UNKNOWN:
+            if not typecheck(s, fmpz):
                 return NotImplemented
             ttype = fmpz_set_any_ref(tval, t)
             if ttype == FMPZ_UNKNOWN:
@@ -423,11 +420,10 @@ cdef class fmpz(flint_scalar):
                     raise ValueError("pow(): negative modulus not supported")
 
                 u = fmpz.__new__(fmpz)
-                fmpz_powm((<fmpz>u).val, sval, tval, mval)
+                fmpz_powm((<fmpz>u).val, s.val, tval, mval)
 
                 return u
         finally:
-            if stype == FMPZ_TMP: fmpz_clear(sval)
             if ttype == FMPZ_TMP: fmpz_clear(tval)
             if mtype == FMPZ_TMP: fmpz_clear(mval)
 

src/flint/types/fmpz_mat.pyx

@@ -302,17 +302,16 @@ cdef class fmpz_mat(flint_mat):
     def __pow__(self, e, m):
         cdef fmpz_mat t
         cdef ulong ee
-        if not typecheck(self, fmpz_mat):
-            return NotImplemented
-        if not fmpz_mat_is_square((<fmpz_mat>self).val):
+        if not fmpz_mat_is_square(self.val):
             raise ValueError("matrix must be square")
         if m is not None:
             raise NotImplementedError("modular matrix exponentiation")
         if e < 0:
+            # Allow unimodular?
             raise DomainError("negative power of integer matrix: M**%i" % e)
         ee = e
         t = fmpz_mat.__new__(fmpz_mat)
-        fmpz_mat_init_set(t.val, (<fmpz_mat>self).val)
+        fmpz_mat_init_set(t.val, self.val)
         fmpz_mat_pow(t.val, t.val, ee)
         return t
 
@@ -520,7 +519,7 @@ cdef class fmpz_mat(flint_mat):
             >>> A.solve(B, integer=True)
             Traceback (most recent call last):
               ...
-            ValueError: matrix is not invertible over the integers
+            flint.utils.flint_exceptions.DomainError: matrix is not invertible over the integers
             >>> fmpz_mat([[1,2], [3,5]]).solve(B, integer=True)
             [ 6,  3, 0]
             [-3, -1, 1]
@@ -556,11 +555,11 @@ cdef class fmpz_mat(flint_mat):
                 fmpz_mat_ncols((<fmpz_mat>t).val))
             d = fmpz.__new__(fmpz)
             result = fmpz_mat_solve(u.val, d.val, self.val, (<fmpz_mat>t).val)
-            if not fmpz_is_pm1(d.val):
-                raise ValueError("matrix is not invertible over the integers")
-            u *= d
             if not result:
                 raise ZeroDivisionError("singular matrix in solve()")
+            if not fmpz_is_pm1(d.val):
+                raise DomainError("matrix is not invertible over the integers")
+            u *= d
             return u
 
     def rref(self, inplace=False):
@@ -642,7 +641,10 @@ cdef class fmpz_mat(flint_mat):
         if rep == "zbasis":
             rt = 1
         elif rep == "gram":
-            rt = 0
+            # rt = 0
+            # XXX: This consumes all memory and crashes. Maybe the parameters
+            # need to be different or something? Best to disable this for now.
+            assert False, "rep = 'gram' does not work currently."
         else:
             raise ValueError("rep must be 'zbasis' or 'gram'")
         if gram == "approx":