align new types with testing

Author: GiacomoPope

src/flint/flintlib/fq_default_poly_factor.pxd

@@ -1,11 +1,11 @@
 from flint.flintlib.fq_default cimport fq_default_t, fq_default_ctx_t
-from flint.flintlib.flint cimport slong
+from flint.flintlib.flint cimport ulong, slong
 from flint.flintlib.fq_default_poly cimport fq_default_poly_t
 from flint.flintlib.fq_poly_factor cimport fq_poly_factor_t
 from flint.flintlib.fq_nmod_poly_factor cimport fq_nmod_poly_factor_t
 from flint.flintlib.fq_zech_poly_factor cimport fq_zech_poly_factor_t
-from flintlib.nmod_poly_factor cimport nmod_poly_factor_t
-from flintlib.fmpz_mod_poly_factor cimport fmpz_mod_poly_factor_t
+from flint.flintlib.nmod_poly_factor cimport nmod_poly_factor_t
+from flint.flintlib.fmpz_mod_poly_factor cimport fmpz_mod_poly_factor_t
 
 cdef extern from "flint/fq_default_poly_factor.h":
     # Type definitions **********************************************/

src/flint/flintlib/fq_nmod_poly_factor.pxd

@@ -1,6 +1,6 @@
-from flint.flintlib.flint cimport slong, flint_rand_t
+from flint.flintlib.flint cimport ulong, slong, flint_rand_t
 from flint.flintlib.fq_nmod cimport fq_nmod_ctx_t, fq_nmod_t, fq_nmod_struct
-from flint.flintlib.fq_nmod_poly cimport fq_nmod_poly_t
+from flint.flintlib.fq_nmod cimport fq_nmod_poly_struct, fq_nmod_poly_t
 
 cdef extern from "flint/fq_nmod_poly_factor.h":
     # Type definitions **********************************************/

src/flint/flintlib/fq_poly_factor.pxd

@@ -1,7 +1,6 @@
-from flint.flintlib.flint cimport slong, flint_rand_t
+from flint.flintlib.flint cimport ulong, slong, flint_rand_t
 from flint.flintlib.fq cimport fq_t, fq_struct, fq_ctx_t
-from flint.flintlib.fq_poly cimport fq_poly_t
-
+from flint.flintlib.fq cimport fq_poly_struct, fq_poly_t
 
 
 cdef extern from "flint/fq_poly_factor.h":

src/flint/flintlib/fq_zech_poly_factor.pxd

@@ -1,6 +1,6 @@
-from flint.flintlib.flint cimport flint_rand_t, slong
+from flint.flintlib.flint cimport flint_rand_t, slong, ulong
 from flint.flintlib.fq_zech cimport fq_zech_ctx_t, fq_zech_t, fq_zech_struct
-from flint.flintlib.fq_zech_poly cimport fq_zech_poly_t
+from flint.flintlib.fq_zech cimport fq_zech_poly_struct, fq_zech_poly_t
 
 cdef extern from "flint/fq_zech_poly_factor.h":
     # Type definitions **********************************************/

src/flint/test/__main__.py

@@ -74,7 +74,7 @@ def run_doctests(verbose=None):
                flint.types.fq_default,
                flint.types.fq_default_poly,
                flint.types.arf,
-            #    flint.types.arb,
+               flint.types.arb,
                flint.types.arb_poly,
                flint.types.arb_mat,
                flint.types.arb_series,

src/flint/test/test_all.py

@@ -2466,12 +2466,29 @@ def _all_polys():
         (lambda *a: flint.fmpz_mod_poly(*a, flint.fmpz_mod_poly_ctx(2**255 - 19)),
          lambda x: flint.fmpz_mod(x, flint.fmpz_mod_ctx(2**255 - 19)),
          True),
+        (lambda *a: flint.fq_default_poly(*a, flint.fq_default_poly_ctx(2**127 - 1)),
+         lambda x: flint.fq_default(x, flint.fq_default_ctx(2**127 - 1)),
+         True),
+        (lambda *a: flint.fq_default_poly(*a, flint.fq_default_poly_ctx(2**127 - 1, 2)),
+         lambda x: flint.fq_default(x, flint.fq_default_ctx(2**127 - 1, 2)),
+         True),
+        (lambda *a: flint.fq_default_poly(*a, flint.fq_default_poly_ctx(65537)),
+         lambda x: flint.fq_default(x, flint.fq_default_ctx(65537)),
+         True),
+        (lambda *a: flint.fq_default_poly(*a, flint.fq_default_poly_ctx(65537, 5)),
+         lambda x: flint.fq_default(x, flint.fq_default_ctx(65537, 5)),
+         True),
+        (lambda *a: flint.fq_default_poly(*a, flint.fq_default_poly_ctx(11)),
+         lambda x: flint.fq_default(x, flint.fq_default_ctx(11)),
+         True),
+        (lambda *a: flint.fq_default_poly(*a, flint.fq_default_poly_ctx(11, 5)),
+         lambda x: flint.fq_default(x, flint.fq_default_ctx(11, 5)),
+         True),
     ]
 
 
 def test_polys():
     for P, S, is_field in _all_polys():
-
         assert P([S(1)]) == P([1]) == P(P([1])) == P(1)
 
         assert raises(lambda: P([None]), TypeError)
@@ -2560,6 +2577,8 @@ def setbad(obj, i, val):
                 assert P(v).repr() == f'nmod_poly({v!r}, 17)'
             elif type(p) == flint.fmpz_mod_poly:
                 pass # fmpz_mod_poly does not have .repr() ...
+            elif type(p) == flint.fq_default_poly:
+                pass # fq_default_poly does not have .repr() ...
             else:
                 assert False
 
@@ -2599,7 +2618,7 @@ def setbad(obj, i, val):
 
         for T in [int, S, flint.fmpz]:
             assert P([1, 2, 3]) - T(1) == P([0, 2, 3])
-            assert T(1) - P([1, 2, 3]) == P([0, -2, -3])
+            assert T(1) - P([1, 2, 3]) == P([0, -2, -3]), f"{P([0, -2, -3]) = }, {T(1) - P([1, 2, 3]) = }"
 
         assert raises(lambda: P([1, 2, 3]) - None, TypeError)
         assert raises(lambda: None - P([1, 2, 3]), TypeError)
@@ -2666,7 +2685,7 @@ def setbad(obj, i, val):
         # XXX: Not sure what this should do in general:
         p = P([1, 1])
         mod = P([1, 1])
-        if type(p) not in [flint.fmpz_mod_poly, flint.nmod_poly]:
+        if type(p) not in [flint.fmpz_mod_poly, flint.nmod_poly, flint.fq_default_poly]:
             assert raises(lambda: pow(p, 2, mod), NotImplementedError)
         else:
             assert p * p % mod == pow(p, 2, mod)
@@ -2696,8 +2715,11 @@ def setbad(obj, i, val):
 
         assert P([1, 2, 1]).derivative() == P([2, 2])
 
-        if is_field:
-            assert P([1, 2, 1]).integral() == P([0, 1, 1, S(1)/3])
+        p = P([1, 2, 1])
+        if is_field and type(p) != flint.fq_default_poly:
+            assert p.integral() == P([0, 1, 1, S(1)/3])
+        if type(p) == flint.fq_default_poly:
+            assert raises(lambda: p.integral(), NotImplementedError)
 
 def _all_mpolys():
     return [

src/flint/types/fmpz_mod_poly.pyx

@@ -1734,4 +1734,4 @@ cdef class fmpz_mod_poly(flint_poly):
         This method is not implemented for polynomials in
         :math:`(\mathbb{Z}/N\mathbb{Z})[X]`
         """
-        raise DomainError("Cannot compute compex roots for polynomials over integers modulo N")
+        raise DomainError("Cannot compute complex roots for polynomials over integers modulo N")

src/flint/types/fq_default.pyx

@@ -572,10 +572,10 @@ cdef class fq_default(flint_scalar):
 
                 # Conversion failed, element was not a compatible scalar
                 if check is NotImplemented:
-                    res = False
-                else:
-                    # We now have an fq_default element with the same context, so compare value only
-                    res = fq_default_equal(self.val, (<fq_default>cmp).val, self.ctx.val)
+                    return NotImplemented
+
+                # We now have an fq_default element with the same context, so compare value only
+                res = fq_default_equal(self.val, (<fq_default>cmp).val, self.ctx.val)
 
             # Flip the result of res if we're doing not equals
             if op == 2:

src/flint/types/fq_default_poly.pxd

@@ -1,4 +1,6 @@
 from flint.flintlib.fq_default_poly cimport *
+from flint.flintlib.fq_default_poly_factor cimport *
+from flint.flintlib.fq_default cimport fq_default_neg
 
 from flint.flint_base.flint_base cimport flint_poly
 from flint.types.fq_default cimport fq_default_ctx