Ticket #9541: trac_9451-part2-flint.patch

module_list.py

@@ -1206 +1206 @@
               sources = ['sage/rings/number_field/number_field_element_generic.pyx']),
     
     Extension('sage.rings.number_field.number_field_element_flint',
-              sources = ['sage/rings/number_field/number_field_element_flint.pyx'],
-              libraries=['flint']),
+              sources = ['sage/rings/number_field/number_field_element_flint.pyx', "sage/libs/flint/fmpq_poly.c"],
+              include_dirs = [SAGE_ROOT+'/local/include/FLINT/', SAGE_ROOT+'/devel/sage/sage/libs/flint'],
+              extra_compile_args=["-std=c99", "-D_XPG6"],
+              libraries=['flint'],
+              depends = [SAGE_ROOT + "/local/include/FLINT/flint.h"]),
 
     Extension('sage.rings.number_field.number_field_element_libsingular',
               sources = ['sage/rings/number_field/number_field_element_libsingular.pyx']),

sage/libs/flint/fmpq_poly.pxd

@@ -1 +1 @@
 #include "fmpz_poly.pxi"
 #include "fmpz.pxi"
 
+cdef extern from "gmp.h":
+    ctypedef void * mpq_t
+
 cdef extern from "fmpq_poly.h":
-    ctypedef void* fmpz_t
-    ctypedef void* fmpz_poly_p
+    ctypedef void * fmpz_t
+    ctypedef void * fmpz_poly_p
     struct fmpq_poly:
         fmpz_poly_p num
         fmpz_t den
@@ -12 +15 @@
     ctypedef fmpq_poly_struct fmpq_poly_t[1]
 
     void fmpq_poly_init(fmpq_poly_t)
+    void fmpq_poly_clear(fmpq_poly_t)
+    
+    long fmpq_poly_degree(fmpq_poly_t)
+    unsigned long fmpq_poly_length(fmpq_poly_t)
+    
+    void fmpq_poly_set(fmpq_poly_t, fmpq_poly_t)
+    void fmpq_poly_set_si(fmpq_poly_t, long)
+    void fmpq_poly_neg(fmpq_poly_t, fmpq_poly_t)
+    
     void fmpq_poly_from_string(fmpq_poly_t, char*)
-    char* fmpq_poly_to_string_pretty(fmpq_poly_t, char*)
+    char * fmpq_poly_to_string_pretty(fmpq_poly_t, char*)
+    
+    int fmpq_poly_equal(fmpq_poly_t, fmpq_poly_t)
+    int fmpq_poly_cmp(fmpq_poly_t, fmpq_poly_t)
+    int fmpq_poly_is_zero(fmpq_poly_t)
+    
+    void fmpq_poly_get_coeff_mpq(mpq_t, fmpq_poly_t, unsigned long)
+    void fmpq_poly_set_coeff_si(fmpq_poly_t, unsigned long, long)
+    
+    void fmpq_poly_add(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    void fmpq_poly_sub(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    
     void fmpq_poly_mul(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
-    void fmpq_poly_clear(fmpq_poly_t)
+    void fmpq_poly_power(fmpq_poly_t, fmpq_poly_t, unsigned long)
+    
+    void fmpq_poly_divrem(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    void fmpq_poly_floordiv(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    void fmpq_poly_mod(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    
+    void fmpq_poly_gcd(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    void fmpq_poly_xgcd(fmpq_poly_t, fmpq_poly_t, fmpq_poly_t, fmpq_poly_t, fmpq_poly_t)
+    
+    void fmpq_poly_getslice(fmpq_poly_t, fmpq_poly_t, long, long)
+

sage/rings/number_field/number_field.py

@@ -4738 +4738 @@
         """
         Function to initialize an absolute number field.
         """
+        import number_field_element_flint
         NumberField_generic.__init__(self, polynomial, name, latex_name, check, embedding)
-        self._element_class = number_field_element_generic.NumberFieldElement_generic
+        self._element_class = number_field_element_flint.NumberFieldElement_flint
         self._zero_element = self(0)
         self._one_element =  self(1)
 

new file sage/rings/number_field/number_field_element_flint.pxd

@@ +1 @@
+###############################################################################
+#       Copyright (C) 2004, 2007, 2010 William Stein <wstein@gmail.com>
+#
+#  Distributed under the terms of the GNU General Public License (GPL)
+#
+#    This code is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    General Public License for more details.
+#
+#  The full text of the GPL is available at:
+#
+#                  http://www.gnu.org/licenses/
+###############################################################################
+
+include "../../ext/stdsage.pxi"
+include "../../libs/flint/fmpq_poly.pxd"
+
+from sage.libs.all import pari_gen
+from sage.rings.fraction_field_element import FractionFieldElement
+from sage.rings.integer cimport Integer
+from sage.rings.rational cimport Rational
+from sage.rings.polynomial.polynomial_element cimport Polynomial
+from sage.structure.element cimport RingElement, ModuleElement, Element
+
+from number_field_element_base cimport NumberFieldElement_absolute
+
+cdef class NumberFieldElement_flint(NumberFieldElement_absolute):
+
+    cdef fmpq_poly_t _f
+    cdef fmpq_poly_t _m
+

sage/rings/number_field/number_field_element_flint.pyx

@@ -1 @@
-###############################################################################
+##############################################################################
 #       Copyright (C) 2004, 2007, 2010 William Stein <wstein@gmail.com>
 #
 #  Distributed under the terms of the GNU General Public License (GPL)
@@ -13 +13 @@
 #                  http://www.gnu.org/licenses/
 ###############################################################################
 
+cdef inline fmpq_poly_pow(fmpq_poly_t f, fmpq_poly_t g, unsigned long n):
+    fmpq_poly_power(f, g, n)
+
+cdef class NumberFieldElement_flint(NumberFieldElement_absolute):
+
+    def __init__(self, parent, f): # FIXME
+        self._parent = parent
+        g = parent.defining_polynomial()
+        f = g.parent()(f)
+        s = str(f.degree()+1)+ '  ' + ' '.join([str(x) for x in f.list()])
+        t = str(g.degree()+1)+ '  ' + ' '.join([str(x) for x in g.list()])
+        fmpq_poly_init(self._f)
+        fmpq_poly_from_string(self._f, s)
+        fmpq_poly_init(self._m)
+        fmpq_poly_from_string(self._m, t)
+        #self._m = <fmpq_poly_struct *> self._parent.__fmpq_polynomial
+
+    cdef _new(self): # FIXME
+        cdef NumberFieldElement_flint res = PY_NEW(NumberFieldElement_flint)
+        res._parent = self._parent
+        fmpq_poly_init(res._f)
+        fmpq_poly_init(res._m)
+        fmpq_poly_set(res._m, self._m)
+        #res._m = self._m
+        return res
+
+    def __dealloc__(self):
+        fmpq_poly_clear(self._f)
+        fmpq_poly_clear(self._m) # FIXME
+
+    cdef void _randomize(self, num_bound, den_bound, distribution):
+        # TODO
+        pass
+
+    def __getitem__(self, long n):
+        cdef Rational res = PY_NEW(Rational)
+        if 0 <= n and n < fmpq_poly_length(self._f):
+            fmpq_poly_get_coeff_mpq(res.value, self._f, n)
+        return res
+
+    def __getslice__(self, long i, long j):
+        cdef NumberFieldElement_flint res = self._new()
+        fmpq_poly_getslice(res._f, self._f, i, j)
+        return res
+
+    def polynomial(self): # FIXME
+        from sage.rings.rational_field import QQ
+        from sage.rings.polynomial.polynomial_ring import polygen
+        t = polygen(QQ)
+        cdef unsigned long i
+        cdef unsigned long n = fmpq_poly_length(self._f)
+        res = self[0]
+        for i in xrange(1, n):
+            res = res + self[i] * t**i
+        return res
+
+    cpdef RingElement _mul_(left, RingElement right):
+        pass
+        cdef NumberFieldElement_flint res = left._new()
+        fmpq_poly_mul(res._f, left._f, (<NumberFieldElement_flint> right)._f)
+        fmpq_poly_mod(res._f, res._f, left._m)
+        return res
+
+    cpdef ModuleElement _add_(left, ModuleElement right):
+        cdef NumberFieldElement_flint res = left._new()
+        fmpq_poly_add(res._f, left._f, (<NumberFieldElement_flint> right)._f)
+        return res
+
+    cpdef ModuleElement _sub_(left, ModuleElement right):
+        cdef NumberFieldElement_flint res = left._new()
+        fmpq_poly_sub(res._f, left._f, (<NumberFieldElement_flint> right)._f)
+        return res
+
+    cpdef RingElement _div_(left, RingElement right):
+        return left * (~right) # FIXME
+
+    def __invert__(self):
+        cdef NumberFieldElement_flint u
+        cdef fmpq_poly_t d, v
+        if fmpq_poly_is_zero(self._f):
+            raise ValueError, "cannot invert zero"
+        u = self._new()
+        fmpq_poly_init(d)
+        fmpq_poly_init(v)
+        fmpq_poly_xgcd(d, u._f, v, self._f, self._m)
+        fmpq_poly_mod(u._f, u._f, self._m)
+        fmpq_poly_clear(d)
+        fmpq_poly_clear(v)
+        return u
+
+    def __richcmp__(left, right, int op):
+        return (<Element>left)._richcmp(right, op)
+
+    cdef int _cmp_c_impl(left, Element right) except -2:
+        return fmpq_poly_cmp(left._f, (<NumberFieldElement_flint> right)._f)
+
+    def _integer_(self, Z=None):
+        return Z(self)
+
+    def _rational_(self):
+        cdef Rational res
+        cdef unsigned long len = fmpq_poly_length(self._f)
+        if len == 0:
+            res = PY_NEW(Rational)
+            return res
+        elif len == 1:
+            res = PY_NEW(Rational)
+            fmpq_poly_get_coeff_mpq(<mpq_t>res.value, self._f, 0)
+            return res
+        else:
+            raise TypeError, "cannot coerce nonconstant polynomial"
+