Changeset 5498:dd7f96fc2561

Timestamp:

07/24/07 11:21:37 (6 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Children:

5499:66c89ee30e12, 5858:90c27feeca40

Message:

fix obscure pyrex errors

Location:

sage

Files:

• modules/free_module_element.pyx (modified) (1 diff)
• schemes/generic/morphism.py (modified) (4 diffs)
• structure/coerce.pxi (modified) (1 diff)

sage/modules/free_module_element.pyx

@@ -489 +489 @@
     
     cdef ModuleElement _rmul_nonscalar_c_impl(left, right):
-         raise TypeError
+        raise TypeError
 
     def degree(self):

sage/schemes/generic/morphism.py

@@ -14 +14 @@
 #*****************************************************************************
 
-from sage.structure.element   import AdditiveGroupElement, RingElement
+from sage.structure.element   import AdditiveGroupElement, RingElement, Element
 from sage.structure.sequence  import Sequence
 
 from sage.categories.morphism import Morphism
+from sage.categories.homset   import Homset
 
 from sage.rings.all           import is_RingHomomorphism, is_CommutativeRing, Integer
@@ -31 +32 @@
     return isinstance(f, (SchemeMorphism, EllipticCurvePoint_field));
 
-class SchemeMorphism(Morphism):
+
+class PyMorphism(Element):
+    # Double inheritance from both Morphism and AdditiveGroupElement seems to mess up the ModuleElement pyrex vtab, which is really bad!
+    def __init__(self, parent):
+        if not isinstance(parent, Homset):
+            raise TypeError, "parent (=%s) must be a Homspace"%parent
+        Element.__init__(self, parent)
+        self._domain = parent.domain()
+        self._codomain = parent.codomain()
+
+    def _repr_type(self):
+        return "Generic"
+
+    def _repr_defn(self):
+        return ""
+
+    def _repr_(self):
+        if self.is_endomorphism():
+            s = "%s endomorphism of %s"%(self._repr_type(), self.domain())
+        else:
+            s = "%s morphism:"%self._repr_type()
+            s += "\n  From: %s"%self.domain()
+            s += "\n  To:   %s"%self.codomain()
+        d = self._repr_defn()
+        if d != '':
+            s += "\n  Defn: %s"%('\n        '.join(self._repr_defn().split('\n')))
+        return s
+        
+    def domain(self):
+        return self._domain
+        
+    def codomain(self):
+        return self.parent().codomain()
+
+    def category(self):
+        return self.parent().category()
+
+    def is_endomorphism(self):
+        return self.parent().is_endomorphism_set()
+
+    def _composition_(self, right, homset):
+        return FormalCompositeMorphism(homset, right, self)
+
+    def __pow__(self, n, dummy):
+        if not self.is_endomorphism():
+            raise TypeError, "self must be an endomorphism."
+        # todo -- what about the case n=0 -- need to specify the identity map somehow.
+        import sage.rings.arith as arith
+        return arith.generic_power(self, n)
+
+
+
+class SchemeMorphism(PyMorphism):
     """
     A scheme morphism
     """
     def __init__(self, parent):
-        Morphism.__init__(self, parent)
+        PyMorphism.__init__(self, parent)
 
     def _repr_type(self):
@@ -149 +202 @@
     """
     def __init__(self, parent, phi, check=True):
-        Morphism.__init__(self, parent)
+        SchemeMorphism.__init__(self, parent)
         if check:
             if not is_RingHomomorphism(phi):
@@ -159 +212 @@
                 raise TypeError, "phi (=%s) must have codomain %s"%(phi,
                                                  parent.domain().coordinate_ring())
-        self.__ring_homomorphism = phi
+        self.__ring_homomorphism = phi
 
     def __call__(self, P):

sage/structure/coerce.pxi

@@ -38 +38 @@
     if PY_TYPE_CHECK(x,Element):
         return (<Element>x)._parent
-    try:
-        # TODO: should the _parent attribute be moved up the tree?
+    elif hasattr(x, 'parent'):
         return x.parent()
-    except AttributeError:
+    else:
         return <object>PY_TYPE(x)