Ticket #13441: trac_13441.patch

doc/en/thematic_tutorials/tutorial-objects-and-classes.rst

@@ -296 +296 @@
         sage: type(e)
         <type 'sage.rings.integer.Integer'>
         sage: e.__dict__
-        dict_proxy({'__module__': 'sage.categories.euclidean_domains', 
-        '_reduction': (<built-in function getattr>, (Category of
-        euclidean domains, 'element_class')), '__doc__': None,
-        '_sage_src_lines_': <staticmethod object at 0x...>})
+        dict_proxy({'__module__': 'sage.categories.euclidean_domains',
+        '__doc__': None, '_reduction': (<built-in function getattr>, (Category
+        of euclidean domains, 'element_class')), 'gcd':
+        <sage.structure.element.NamedBinopMethod object at 0x...>,
+        '_sage_src_lines_': <staticmethod object at 0x...>})
         sage: e.__dict__.keys()
-        ['__module__', '_reduction', '__doc__', '_sage_src_lines_']
+        ['__module__', '__doc__', '_reduction', 'gcd', '_sage_src_lines_']
 
         sage: id4 = SymmetricGroup(4).one()
         sage: type(id4)

sage/categories/euclidean_domains.py

@@ -12 +12 @@
 from sage.categories.category_singleton import Category_singleton
 from sage.categories.principal_ideal_domains import PrincipalIdealDomains
 from sage.misc.cachefunc import cached_method
+from sage.structure.element import coerce_binop
 
 class EuclideanDomains(Category_singleton):
     """
@@ -54 +55 @@
             return True
 
     class ElementMethods:
-        pass
+        @coerce_binop
+        def gcd(self, other):
+            """
+            Return the greatest common divisor of this element and ``other``.
+
+            INPUT:
+
+                - ``other`` -- an element in the same ring as ``self``
+
+            ALGORITHM:
+
+            Algorithm 3.2.1 in [Coh1996].
+
+            REFERENCES:
+
+            .. [Coh1996] Henri Cohen. A Course in Computational Algebraic Number Theory. Springer, 1996.
+
+            EXAMPLES::
+
+                sage: EuclideanDomains().ElementMethods().gcd(6,4)
+                2
+
+            """
+            A = self
+            B = other
+            while not B.is_zero():
+                Q, R = A.quo_rem(B)
+                A = B
+                B = R
+            return A

sage/categories/quotient_fields.py

@@ -107 +107 @@
                 sage: gcd(R.1/1,0)
                 1
                 sage: gcd(R.zero(),0)
-                0            
+                0
 
             """
             try:

sage/rings/polynomial/polynomial_element_generic.py

@@ -620 +620 @@
             R = R[:R.degree()] - (aaa*B[:B.degree()]).shift(diff_deg)
         return (Q, R)
 
-    def _gcd(self, other):
+    @coerce_binop
+    def gcd(self, other):
         """
-        Return the GCD of self and other, as a monic polynomial.
+        Return the greatest common divisor of this polynomial and ``other``, as
+        a monic polynomial.
+
+        INPUT:
+
+            - ``other`` -- a polynomial defined over the same ring as ``self``
+
+        EXAMPLES::
+
+            sage: R.<x> = QQbar[]
+            sage: (2*x).gcd(2*x^2)
+            x
+
         """
-        g = EuclideanDomainElement._gcd(self, other)
+        from sage.categories.euclidean_domains import EuclideanDomains
+        g = EuclideanDomains().ElementMethods().gcd(self, other)
         c = g.leading_coefficient()
         if c.is_unit():
             return (1/c)*g

sage/rings/polynomial/polynomial_modn_dense_ntl.pyx

@@ -1765 +1765 @@
 
 cdef class Polynomial_dense_mod_p(Polynomial_dense_mod_n):
     """
-    A dense polynomial over the integers modulo p, where p is prime. 
+    A dense polynomial over the integers modulo p, where p is prime.
     """
 
     @coerce_binop
     def gcd(self, right):
-        return self._gcd(right)
-    
-    def _gcd(self, right):
         """
-        Return the GCD of self and other, as a monic polynomial.
+        Return the greatest common divisor of this polynomial and ``other``, as
+        a monic polynomial.
+
+        INPUT:
+
+            - ``other`` -- a polynomial defined over the same ring as ``self``
+
+        EXAMPLES::
+
+            sage: R.<x> = PolynomialRing(GF(3),implementation="NTL")
+            sage: f,g = x + 2, x^2 - 1
+            sage: f.gcd(g)
+            x + 2
+
         """
-        if not isinstance(right, Polynomial_dense_mod_p):
-            right = self.parent()(right)
-        elif self.parent() != right.parent():
-            raise TypeError
         g = self.ntl_ZZ_pX().gcd(right.ntl_ZZ_pX())
         return self.parent()(g, construct=True)
 

sage/rings/rational.pyx

@@ -63 +63 @@
 from integer_ring import ZZ
 
 from sage.structure.element cimport Element, RingElement, ModuleElement
-from sage.structure.element import bin_op
+from sage.structure.element import bin_op, coerce_binop
 from sage.categories.morphism cimport Morphism
 from sage.categories.map cimport Map
 
@@ -893 +893 @@
         from sage.rings.arith import gcd, lcm
         return gcd(nums) / lcm(denoms)
         
-#    def gcd_rational(self, other, **kwds):
-#        """
-#        Return a gcd of the rational numbers self and other.
-#
-#        If self = other = 0, this is by convention 0.  In all other
-#        cases it can (mathematically) be any nonzero rational number,
-#        but for simplicity we choose to always return 1.
-#        
-#        EXAMPLES::
-#
-#            sage: (1/3).gcd_rational(2/1)
-#            1
-#            sage: (1/1).gcd_rational(0/1)
-#            1
-#            sage: (0/1).gcd_rational(0/1)
-#            0
-#        """
-#        if self == 0 and other == 0:
-#            return Rational(0)
-#        else:
-#            return Rational(1)
-
     def valuation(self, p):
         r"""
         Return the power of ``p`` in the factorization of self.
@@ -2994 +2972 @@
                mpz_cmp_si(mpq_numref(other.value), 0) == 0:
             return Rational(0)
         return Rational(1)
-        
-    def _gcd(self, Rational other):
-        """
-        Returns the least common multiple, in the rational numbers, of self
-        and other. This function returns either 0 or 1 (as a rational
-        number).
-        
-        INPUT:
-        
-        
-        -  ``other`` - Rational
-        
-        
-        OUTPUT:
-        
-        
-        -  ``Rational`` - 0 or 1
-        
-        
-        EXAMPLES::
-        
-            sage: (2/3)._gcd(3/5)
-            1
-            sage: (0/1)._gcd(0/1)
-            0
-        """
-        if mpz_cmp_si(mpq_numref(self.value), 0) == 0 and \
-               mpz_cmp_si(mpq_numref(other.value), 0) == 0:
-            return Rational(0)
-        return Rational(1)
-        
 
     def additive_order(self):
         """

sage/structure/element.pyx

@@ -2785 +2785 @@
             return coercion_model.bin_op(self, right, lcm)
         return self._lcm(right)
 
-    def gcd(self, right):
-        """
-        Returns the gcd of self and right, or 0 if both are 0.
-        """
-        if not PY_TYPE_CHECK(right, Element) or not ((<Element>right)._parent is self._parent):
-            return coercion_model.bin_op(self, right, gcd)
-        return self._gcd(right)
-
     def xgcd(self, right):
         r"""
         Return the extended gcd of self and other, i.e., elements `r, s, t` such that
@@ -2827 +2819 @@
     def degree(self):
         raise NotImplementedError
 
-    def _gcd(self, other):
-        """
-        Return the greatest common divisor of self and other.
-
-        Algorithm 3.2.1 in Cohen, GTM 138.
-        """
-        A = self
-        B = other
-        while not B.is_zero():
-            Q, R = A.quo_rem(B)
-            A = B
-            B = R
-        return A
-
     def leading_coefficient(self):
         raise NotImplementedError
 
@@ -2924 +2902 @@
             True
         """
         return not not self
-    
-    def _gcd(self, FieldElement other):
-        """
-        Return the greatest common divisor of self and other.
-        """
-        if self.is_zero() and other.is_zero():
-            return self
-        else:
-            return self._parent(1)
 
     def _lcm(self, FieldElement other):
         """