Ticket #900: 6951.patch

c_lib/include/ntl_wrap.h

@@ -123 +123 @@
 //         e -- point to list of e longs (the exponents)
 //         n -- length of above two lists
 //  The lists v and e are mallocd, and must be freed by the calling code.
-EXTERN void ZZX_square_free_decomposition(struct ZZX*** v, long** e, long* n, struct ZZX* x);
+EXTERN void ZZX_squarefree_decomposition(struct ZZX*** v, long** e, long* n, struct ZZX* x);
 
 
 //////// ZZ_pX //////////

c_lib/src/ntl_wrap.cpp

@@ -452 +452 @@
 }
 */
 
-void ZZX_square_free_decomposition(struct ZZX*** v, long** e, long* n, struct ZZX* x)
+void ZZX_squarefree_decomposition(struct ZZX*** v, long** e, long* n, struct ZZX* x)
 {
   vec_pair_ZZX_long factors;
   SquareFreeDecomp(factors, *x);

sage/libs/ntl/decl.pxi

@@ -133 +133 @@
     void ZZX_XGCD "XGCD"(ZZ_c r, ZZX_c s, ZZX_c t, ZZX_c a, ZZX_c b, long deterministic)
     void ZZX_content "content"(ZZ_c d, ZZX_c f)
 
-    void ZZX_square_free_decomposition(ZZX_c*** v, long** e, long* n, ZZX_c* x)
+    void ZZX_squarefree_decomposition(ZZX_c*** v, long** e, long* n, ZZX_c* x)
 
     char* ZZX_repr(ZZX_c* x)
     ZZX_c* ZZX_copy(ZZX_c* x)

sage/libs/ntl/ntl_ZZX.pyx

@@ -1077 +1077 @@
         ZZX_preallocate_space(&self.x, n)
         _sig_off
 
-    def square_free_decomposition(self):
+    def squarefree_decomposition(self):
         """
         Returns the square-free decomposition of self (a partial
         factorization into square-free, relatively prime polynomials)
@@ -1087 +1087 @@
 
         EXAMPLES:
             sage: f = ntl.ZZX([0, 1, 2, 1])
-            sage: f.square_free_decomposition()
+            sage: f.squarefree_decomposition()
             [([0 1], 1), ([1 1], 2)]
         """
         cdef ZZX_c** v
         cdef long* e
         cdef long i, n
         _sig_on
-        ZZX_square_free_decomposition(&v, &e, &n, &self.x)
+        ZZX_squarefree_decomposition(&v, &e, &n, &self.x)
         _sig_off
         F = []
         for i from 0 <= i < n:

sage/rings/polynomial/polynomial_integer_dense_ntl.pyx

@@ -646 +646 @@
         return pari(self.list()).Polrev(variable)
 
 
-    def square_free_decomposition(self):
+    def squarefree_decomposition(self):
         """
         Return the square-free decomposition of self.  This is
         a partial factorization of self into square-free, relatively
@@ -657 +657 @@
         EXAMPLES:
             sage: R.<x> = PolynomialRing(ZZ)
             sage: p = 37 * (x-1)^2 * (x-2)^2 * (x-3)^3 * (x-4)
-            sage: p.square_free_decomposition()
+            sage: p.squarefree_decomposition()
             (37) * (x - 4) * (x^2 - 3*x + 2)^2 * (x - 3)^3
         """
 
@@ -670 +670 @@
         cdef long* e
         cdef long i, n
         cdef Polynomial_integer_dense_ntl z
-        ZZX_square_free_decomposition(&v, &e, &n, &p.__poly)
+        ZZX_squarefree_decomposition(&v, &e, &n, &p.__poly)
         F = []
         for i from 0 <= i < n:
             z = self._new()