Merge branch 'master' into mod_experiment

MANIFEST.in

@@ -1,10 +1,7 @@
 include LICENSE
 include CHANGES
-include README
-include src/flint/*.pxd
-include src/flint/*.pyx
-include src/flint/*.py
-include test/*.py
+include README.md
+recursive-include src/flint *.pxd *.pyx *.py
 include doc/source/*.py
 include doc/source/*.rst
 include doc/Makefile

bin/build_mingw64_wheel.sh

@@ -44,7 +44,7 @@ fi
 PYTHON=$PYTHONDIR/python
 VER="${PYTHONVER//./}"
 
-WHEELNAME=python_flint-0.4.2-cp$VER-cp$VER-win_amd64.whl
+WHEELNAME=python_flint-0.4.4-cp$VER-cp$VER-win_amd64.whl
 
 $PYTHON -c 'print("hello world")'
 
@@ -90,7 +90,7 @@ wheel pack python_flint-*
 cd ..
 
 # Make the wheel relocatable
-delvewheel repair dist/python_flint-0.4.2-cp$VER-cp$VER-win_amd64.whl \
+delvewheel repair dist/python_flint-0.4.4-cp$VER-cp$VER-win_amd64.whl \
         --add-path .local/bin:.local/lib/
 
 # Make a virtual enironment to test the wheel

doc/source/conf.py

@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.2'
+version = '0.4.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.2'
+release = '0.4.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -63,6 +63,17 @@
     compiler_directives['linetrace'] = True
 
 
+packages=[
+    'flint',
+    'flint.flintlib',
+    'flint.flint_base',
+    'flint.types',
+    'flint.functions',
+    'flint.utils',
+    'flint.test',
+]
+
+
 ext_files = [
     # ("flint._flint", ["src/flint/_flint.pxd"]), # Main Module
     ("flint.pyflint", ["src/flint/pyflint.pyx"]), # Main Module
@@ -92,6 +103,8 @@
     ("flint.types.dirichlet", ["src/flint/types/dirichlet.pyx"]),
     ("flint.flint_base.flint_base", ["src/flint/flint_base/flint_base.pyx"]),
     ("flint.flint_base.flint_context", ["src/flint/flint_base/flint_context.pyx"]),
+    # Helper for unittests
+    ("flint.functions.showgood", ["src/flint/functions/showgood.pyx"]),
 
 ]
 
@@ -115,12 +128,12 @@
     cmdclass={'build_ext': build_ext},
     ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives),
     #ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives, annotate=True),
-    packages=['flint', 'flint.test'],
+    packages=packages,
     package_dir={'': 'src'},
     description='Bindings for FLINT and Arb',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',
-    version='0.4.2',
+    version='0.4.4',
     url='https://github.com/flintlib/python-flint',
     author='Fredrik Johansson',
     author_email='fredrik.johansson@gmail.com',

src/flint/__init__.py

@@ -21,4 +21,6 @@
 from .types.acb_mat import *
 from .types.acb_series import *
 from .types.fmpz_mpoly import *
-__version__ = '0.4.2'
+from .functions.showgood import showgood
+
+__version__ = '0.4.4'

src/flint/flint_base/flint_base.pyx

@@ -66,14 +66,38 @@ cdef class flint_poly(flint_elem):
 
     def roots(self):
         """
-        Deprecated function.
-        
-        To recover roots of a polynomial, first convert to acb:
-
-        acb_poly(input_poly).roots()
+        Computes all the roots in the base ring of the polynomial.
+        Returns a list of all pairs (*v*, *m*) where *v* is the 
+        integer root and *m* is the multiplicity of the root.
+
+        To compute complex roots of a polynomial, instead use
+        the `.complex_roots()` method, which is available on
+        certain polynomial rings.
+
+            >>> from flint import fmpz_poly
+            >>> fmpz_poly([1, 2]).roots()
+            []
+            >>> fmpz_poly([2, 1]).roots()
+            [(-2, 1)]
+            >>> fmpz_poly([12, 7, 1]).roots()
+            [(-3, 1), (-4, 1)]
+            >>> (fmpz_poly([-5,1]) * fmpz_poly([-5,1]) * fmpz_poly([-3,1])).roots()
+            [(3, 1), (5, 2)]
         """
-        raise NotImplementedError('This method is no longer supported. To recover the complex roots first convert to acb_poly')
-
+        factor_fn = getattr(self, "factor", None)
+        if not callable(factor_fn):
+            raise NotImplementedError("Polynomial has no factor method, roots cannot be determined")
+
+        roots = []
+        factors = self.factor()
+        for fac, m in factors[1]:
+            if fac.degree() == fac[1] == 1:
+                v = - fac[0]
+                roots.append((v, m))
+        return roots
+
+    def complex_roots(self):
+        raise AttributeError("Complex roots are not supported for this polynomial")
 
 
 cdef class flint_mpoly(flint_elem):

src/flint/functions.pyx → src/flint/functions/showgood.pyx

@@ -1,4 +1,5 @@
-from .utils.conversion cimport dps_to_prec
+from flint.flint_base.flint_context cimport thectx
+from flint.utils.conversion cimport dps_to_prec
 from flint.types.arb_mat cimport arb_mat
 from flint.types.acb_mat cimport acb_mat
 from flint.types.arb_poly cimport arb_poly
@@ -10,6 +11,7 @@ from flint.types.acb_series cimport acb_series
 from flint.flintlib.arb cimport *
 from flint.flintlib.acb cimport *
 
+ctx = thectx
 
 # xxx: this doesn't work when changed to a cdef function. why?
 def __goodness(x, bint parts=True, metric=None):

src/flint/pyflint.pyx

@@ -12,5 +12,3 @@ cdef flint_rand_t global_random_state
 flint_randinit(global_random_state)
 
 ctx = thectx
-
-include "functions.pyx"

src/flint/test/test.py

@@ -30,7 +30,7 @@ def raises(f, exception):
 
 def test_pyflint():
 
-    assert flint.__version__ == "0.4.2"
+    assert flint.__version__ == "0.4.4"
 
     ctx = flint.ctx
     assert str(ctx) == repr(ctx) == _default_ctx_string
@@ -438,11 +438,17 @@ def test_fmpz_poly():
     assert Z([1,2,2]).sqrt() is None
     assert Z([1,0,2,0,3]).deflation() == (Z([1,2,3]), 2)
     assert Z([1,1]).deflation() == (Z([1,1]), 1)
-    [(r,m)] = Z([1,1]).roots()
+    [(r,m)] = Z([1,1]).complex_roots()
     assert m == 1
     assert r.overlaps(-1)
+    assert Z([]).complex_roots() == []
+    assert Z([1]).complex_roots() == []
+    [(r,m)] = Z([1,1]).roots()
+    assert m == 1
+    assert r == -1
     assert Z([]).roots() == []
     assert Z([1]).roots() == []
+    assert Z([1, 2]).roots() == []
 
 def test_fmpz_poly_factor():
     Z = flint.fmpz_poly
@@ -985,11 +991,13 @@ def set_bad():
     assert Q.bernoulli_poly(3) == Q([0,1,-3,2],2)
     assert Q.euler_poly(3) == Q([1,0,-6,4],4)
     assert Q.legendre_p(3) == Q([0,-3,0,5],2)
-    assert Q([]).roots() == []
-    assert Q([1]).roots() == []
-    [(r,m)] = Q([1,1]).roots()
+    assert Q([]).complex_roots() == []
+    assert Q([1]).complex_roots() == []
+    [(r,m)] = Q([1,1]).complex_roots()
     assert m == 1
     assert r.overlaps(-1)
+    assert str(Q([1,2]).roots()) == "[(-1/2, 1)]"
+    assert Q([2,1]).roots() == [(-2, 1)]
 
 def test_fmpq_mat():
     Q = flint.fmpq_mat
@@ -1411,6 +1419,9 @@ def set_bad2():
     for alg in [None, 'berlekamp', 'cantor-zassenhaus']:
         assert p3.factor(alg) == f3
         assert p3.factor(algorithm=alg) == f3
+    assert P([1], 11).roots() == []
+    assert P([1, 2, 3], 11).roots() == [(8, 1), (6, 1)]
+    assert P([1, 6, 1, 8], 11).roots() == [(5, 3)]
 
 def test_nmod_mat():
     M = flint.nmod_mat

src/flint/types/acb_poly.pyx

@@ -412,6 +412,8 @@ cdef class acb_poly(flint_poly):
 
         return pyroots
 
+    complex_roots = roots
+
     def root_bound(self):
         """Returns an upper bound for the absolute value of
         the roots of self."""

src/flint/types/arb_poly.pyx

@@ -113,6 +113,13 @@ cdef class arb_poly(flint_poly):
         libc.stdlib.free(xs)
         return u
 
+    def complex_roots(self, **kwargs):
+        """
+        Compute the complex roots of the polynomial by converting 
+        from arb_poly to acb_poly
+        """
+        return acb_poly(self).roots(**kwargs)
+
     def evaluate(self, xs, algorithm='fast'):
         """
         Multipoint evaluation: evaluates *self* at the list of

src/flint/types/fmpq_poly.pyx

@@ -384,16 +384,16 @@ cdef class fmpq_poly(flint_poly):
             fac[i] = (base, exp)
         return c / self.denom(), fac
 
-    def roots(self, **kwargs):
+    def complex_roots(self, **kwargs):
         """
         Computes the complex roots of this polynomial. See
         :meth:`.fmpz_poly.roots`.
 
             >>> from flint import fmpq
-            >>> fmpq_poly([fmpq(2,3),1]).roots()
+            >>> fmpq_poly([fmpq(2,3),1]).complex_roots()
             [([-0.666666666666667 +/- 3.34e-16], 1)]
         """
-        return self.numer().roots(**kwargs)
+        return self.numer().complex_roots(**kwargs)
 
     @staticmethod
     def bernoulli_poly(n):

src/flint/types/fmpz_poly.pyx

@@ -343,19 +343,19 @@ cdef class fmpz_poly(flint_poly):
         fmpz_poly_factor_clear(fac)
         return c, res
 
-    def roots(self, bint verbose=False):
+    def complex_roots(self, bint verbose=False):
         """
         Computes all the complex roots of this polynomial.
         Returns a list of pairs (*c*, *m*) where *c* is the root
         as an *acb* and *m* is the multiplicity of the root.
 
-            >>> fmpz_poly([]).roots()
+            >>> fmpz_poly([]).complex_roots()
             []
-            >>> fmpz_poly([1]).roots()
+            >>> fmpz_poly([1]).complex_roots()
             []
-            >>> fmpz_poly([2,0,1]).roots()
+            >>> fmpz_poly([2,0,1]).complex_roots()
             [([1.41421356237310 +/- 4.96e-15]j, 1), ([-1.41421356237310 +/- 4.96e-15]j, 1)]
-            >>> for c, m in (fmpz_poly([2,3,4]) * fmpz_poly([5,6,7,11])**3).roots():
+            >>> for c, m in (fmpz_poly([2,3,4]) * fmpz_poly([5,6,7,11])**3).complex_roots():
             ...     print((c,m))
             ...
             ([-0.375000000000000 +/- 1.0e-19] + [0.599478940414090 +/- 5.75e-17]j, 1)

src/flint/types/nmod.pyx

@@ -81,6 +81,12 @@ cdef class nmod(flint_scalar):
                 return res
             else:
                 return not res
+        elif typecheck(s, nmod) and typecheck(t, int):
+            res = s.val == (t % s.mod.n)
+            if op == 2:
+                return res
+            else:
+                return not res
         return NotImplemented
 
     def __nonzero__(self):