Ticket #12173: compose_eval.patch

sage/libs/flint/fmpz.pxi

@@ -2 +2 @@
 
 cdef extern from "flint/fmpz.h":
 
-    ctypedef long fmpz    
+    ctypedef long fmpz
     ctypedef long * fmpz_t
     ctypedef void * mpz_t
 
@@ -10 +10 @@
 
     void fmpz_set_ui(fmpz_t res, unsigned long x)
     void fmpz_set_si(fmpz_t res, long x)
-    
+
     void fmpz_clear(fmpz_t f)
     void fmpz_print(fmpz_t f)
     int fmpz_is_one(fmpz_t f)
-    
+
     void fmpz_get_mpz(mpz_t rop, fmpz_t op)
     void fmpz_set_mpz(fmpz_t rop, mpz_t op)
 
     void fmpz_add_ui(fmpz_t f, fmpz_t g, unsigned long c)
-
-    void mpz_to_fmpz(fmpz_t rop, mpz_t op)
-

sage/libs/flint/fmpz_poly.pxi

@@ -108 +108 @@
 
     void fmpz_poly_invmod(fmpz_t d, fmpz_poly_t H, fmpz_poly_t poly1, fmpz_poly_t poly2)
     void fmpz_poly_derivative(fmpz_poly_t der, fmpz_poly_t poly)
-    void fmpz_poly_evaluate(fmpz_t output, fmpz_poly_t poly, fmpz_t val)
+    void fmpz_poly_evaluate_fmpz(fmpz_t output, fmpz_poly_t poly, fmpz_t val)
     void fmpz_poly_compose(fmpz_poly_t output, fmpz_poly_t f, fmpz_poly_t g)
     void fmpz_poly_scalar_div_ui(fmpz_poly_t output, fmpz_poly_t poly, unsigned long x)
 

sage/rings/polynomial/polynomial_integer_dense_flint.pyx

@@ -260 +260 @@
 
     def __call__(self, *x, **kwds):
         """
-        Calls this polynomial with the given parameters, which can be 
-        interpreted as polynomial composition or evaluation by this 
+        Calls this polynomial with the given parameters, which can be
+        interpreted as polynomial composition or evaluation by this
         method.
 
-        If the argument is not simply an integer (``int``, ``long`` or 
-        ``Integer``) or a polynomial (of the same type as ``self``), 
-        the call is passed on to the generic implementation in the 
+        If the argument is not simply an integer (``int``, ``long`` or
+        ``Integer``) or a polynomial (of the same type as ``self``),
+        the call is passed on to the generic implementation in the
         ``Polynomial`` class.
 
         EXAMPLES:
 
         The first example illustrates polynomial composition::
-        
+
             sage: R.<t> = ZZ[]
             sage: f = t^2 - 1
             sage: g = t + 1
             sage: f(g)          # indirect doctest
             t^2 + 2*t
-                
-        Now we illustrate how a polynomial can be evaluated at an 
+
+        Now we illustrate how a polynomial can be evaluated at an
         integer::
-        
+
             sage: f(2)          # indirect doctest
             3
         """
@@ -291 +291 @@
         cdef unsigned long limbs
         cdef fmpz_t a_fmpz
         cdef fmpz_t z_fmpz
-        
-        if len(x) == 1: 
+
+        if len(x) == 1:
             x0 = x[0]
             if isinstance(x, Polynomial_integer_dense_flint):
                 f = self._new()
@@ -311 +311 @@
                 if mpz_sgn(a.value) == 0:
                     return self[0]
 
-                # As of FLINT1.5, memory management for the fmpz_t type 
-                # has to be done manually.  Without inspection of all 
-                # coefficients, we can only naively bound the size of 
-                # the answer by the very large value of "limbs" below.  
-                # If this number is too large, we move on to the generic 
-                # polynomial evaluation code, which might either happen 
-                # to work (in special cases) or simply run out of memory.
-                # 
-                # It is expected that this workaround is unnecessary 
-                # with FLINT2.
-                if fmpz_poly_length(self.__poly) <= ((1 << 25) / fmpz_poly_length(self.__poly) - fmpz_poly_limbs(self.__poly)) / mpz_size(a.value):
+                z = PY_NEW(Integer)
 
-                    z = PY_NEW(Integer)
+                _sig_on
+                fmpz_init(a_fmpz)
+                fmpz_init(z_fmpz)
+                fmpz_set_mpz(a_fmpz, a.value)
+                fmpz_poly_evaluate_fmpz(z_fmpz, self.__poly, a_fmpz)
+                fmpz_get_mpz(z.value, z_fmpz)
+                fmpz_clear(a_fmpz)
+                fmpz_clear(z_fmpz)
+                _sig_off
 
-                    _sig_on
-                    limbs = fmpz_poly_length(self.__poly) * (fmpz_poly_limbs(self.__poly) + fmpz_poly_length(self.__poly) * mpz_size(a.value))
-                    a_fmpz = fmpz_init(mpz_size(a.value))
-                    z_fmpz = fmpz_init(limbs)
-                    mpz_to_fmpz(a_fmpz, a.value)
+                return z
 
-                    fmpz_poly_evaluate(z_fmpz, self.__poly, a_fmpz)
-
-                    fmpz_to_mpz(z.value, z_fmpz)
-                    fmpz_clear(a_fmpz)
-                    fmpz_clear(z_fmpz)
-                    _sig_off
-
-                    return z
-
-        return Polynomial.__call__(self, *x, **kwds) 
+        return Polynomial.__call__(self, *x, **kwds)
 
     cpdef Integer content(self):
         r"""
         Return the greatest common divisor of the coefficients of this
-        polynomial. 
+        polynomial.
 
         EXAMPLES::