Ticket #3662: trac_3662-2.patch

a/sage/combinat/combinatorial_algebra.py

@@ -62 +62 @@
-from sage.algebras.algebra_element import AlgebraElement
-from sage.matrix.all import MatrixSpace
-from sage.combinat.free_module import CombinatorialFreeModuleElement, CombinatorialFreeModule, CombinatorialFreeModuleInterface
+from sage.misc.misc import repr_lincomb
-
-class CombinatorialAlgebraElement(AlgebraElement, CombinatorialFreeModuleElement):
-    def __init__(self, A, x):
@@ -225 +226 @@
-        """
-        return self._matrix_()
-
+
+    def __repr__(self):
+        """
+        EXAMPLES:
+            sage: QS3 = SymmetricGroupAlgebra(QQ,3)
+            sage: a = 2 + QS3([2,1,3])
+            sage: print a.__repr__()
+            2*[1, 2, 3] + [2, 1, 3]
+        """
+        v = self._monomial_coefficients.items()
+        v.sort()
+        prefix = self.parent().prefix()
+        mons = [ prefix + repr(m) for (m, _) in v ]
+        cffs = [ x for (_, x) in v ]
+        x = repr_lincomb(mons, cffs).replace("*1 "," ")
+        if x[len(x)-2:] == "*1":
+            return x[:len(x)-2]
+        else:
+            return x
+
-    
-class CombinatorialAlgebra(CombinatorialFreeModuleInterface, Algebra):
-    def __init__(self, R, element_class = None):
@@ -256 +277 @@
-            self._element_class = element_class
-
-        CombinatorialFreeModuleInterface.__init__(self, R, self._element_class)
+
+    def __call__(self, x):
+        try:
+            return CombinatorialFreeModuleInterface.__call__(self, x)
+        except TypeError:
+            pass
+
+        R = self.base_ring()
+        eclass = self._element_class
+        #Coerce elements of the base ring
+        if not hasattr(x, 'parent'):
+            x = R(x)
+        if x.parent() == R:
+            if x == R(0):
+                return eclass(self, {})
+            else:
+                return eclass(self, {self._one:x})
+        #Coerce things that coerce into the base ring
+        elif R.has_coerce_map_from(x.parent()):
+            rx = R(x)
+            if rx == R(0):
+                return eclass(self, {})
+            else:
+                return eclass(self, {self._one:R(x)})
+
+        raise TypeError, "do not know how to make x (= %s) an element of self (=%s)"%(x,self)
+
+    def _an_element_impl(self):
+        """
+        Returns an element of self, namely the unit element.
+
+        EXAMPLES:
+            sage: s = SFASchur(QQ)
+            sage: s._an_element_impl()
+            s[]
+            sage: _.parent() is s
+            True
+        """
+        return self._element_class(self, {self._one:self.base_ring()(1)})
+
-            
-    def multiply(self,left,right):
-        """

a/sage/combinat/finite_class.py

@@ -48 +48 @@
-        """
-        self.l = l
-
+    def object_class(self, x):
+        """
+        EXAMPLES:
+            sage: F = FiniteCombinatorialClass([1,2,3])
+            sage: F.object_class(1)
+            1
+        """
+        return x
+
-    def __repr__(self):
-        """
-        TESTS:

a/sage/combinat/free_module.py

@@ -19 +19 @@
-from sage.rings.all import Ring, Integer
-import sage.structure.parent_base
-from sage.combinat.family import Family
+from sage.combinat.finite_class import FiniteCombinatorialClass
+from sage.combinat.combinat import CombinatorialClass
-
-# TODO:
-# Rewrite all tests in a more self contained way
@@ -82 +84 @@
-    def __repr__(self):
-        """
-        EXAMPLES:
-
-
-
-
+
+
+
+
+
-        """
-        v = self._monomial_coefficients.items()
-        v.sort()
-        prefix = self.parent().prefix()
-repr(m)
+"(" + repr(m) + ")"
-        cffs = [ x for (_, x) in v ]
-        x = repr_lincomb(mons, cffs).replace("*1 "," ")
-        if x[len(x)-2:] == "*1":
@@ -409 +412 @@
-            sage: a.map_coefficients(lambda x: x*2)
-            2*s[2, 1] + 4*s[3, 2]
-        """
-        res = self.parent()(0)
-        z_elt = {}
-        for m,c in self.monomial_coefficients().iteritems():
-            z_elt[m] = f(c)
-s._monomial_coefficients = z_elt
-
+turn self.parent()._from_dict(z_elt)
+
-
-    def map_basis(self, f):
-        """
@@ -437 +439 @@
-        res._monomial_coefficients = z_elt
-        return res
-
-_mc
+
-        """
-        Returns a new element of self.parent() obtained
-        by applying the function f to a monomial coefficient
@@ -457 +459 @@
-            new_m, new_c = f(m,c)
-            z_elt[new_m] = new_c
-        return self.parent()._from_dict(z_elt)
+
+    map_mc = map
+
+    def _l_action(self, x):
+        x = self.base_ring()(x)
+        return self.map_coefficients(lambda c: x*c)
+
+    def _r_action(self, x):
+        x = self.base_ring()(x)
+        return self.map_coefficients(lambda c: c*x)
+
-
-# NT: There is nothing combinatorial here
-# NT: It's really too bad that we can't have the ring as second optional argument
@@ -537 +550 @@
-            else:
-                return eclass(self, dict([ (e1,R(e2)) for e1,e2 in x._monomial_coefficients.items()]))
-        #x is an element of the basis combinatorial class
-
+self._combinatorial_class.object_class, type) and isinstance(
-            return eclass(self, {x:R(1)}) 
-        elif x in self._combinatorial_class:
-            return eclass(self, {self._combinatorial_class.object_class(x):R(1)})
-        #Coerce elements of the base ring
-        elif hasattr(x, 'parent') and x.parent() is R:
-            if x == R(0):
-                return eclass(self, {})
-            else:
-                return eclass(self, {self._one:x})
-        #Coerce things that coerce into the base ring
-        elif R.has_coerce_map_from(x.parent()):
-            rx = R(x)
-            if rx == R(0):
-                return eclass(self, {})
-            else:
-                return eclass(self, {self._one:R(x)})
-        else:
-            if hasattr(self, '_coerce_end'):
-                try:
-start
+end
-                except TypeError:
-                    pass
-            raise TypeError, "do not know how to make x (= %s) an element of self (=%s)"%(x,self)
@@ -567 +567 @@
-        Returns an element of self, namely the unit element.
-
-        EXAMPLES:
-s = SFASchur(QQ
-s
-s[]
-s
+F = CombinatorialFreeModule(QQ, ['a', 'b', 'c']
+F
+0
+F
-            True
-        """
-self._one:self.base_ring()(1)
+
-
-    def __repr__(self):
-        """
@@ -581 +581 @@
-            sage: QS3 = SymmetricGroupAlgebra(QQ,3)
-            sage: print QS3.__repr__()
-            Symmetric group algebra of order 3 over Rational Field
-
-        """
-        return self._name + " over %s"%self.base_ring()
-
@@ -744 +743 @@
-        return self._from_dict(z_elt)
-
-    def term(self, i):
-
+
+
+
+
+
+
+
-    
-    def _from_dict(self, d, coerce=False):
-        """
@@ -773 +778 @@
-
-        return self._element_class(self, d)
-
+
-class CombinatorialFreeModule(CombinatorialFreeModuleInterface, Module):
-    r"""
-    EXAMPLES:
@@ -797 +803 @@
-            sage: 2*e['a']
-            2*B('a')
-            sage: e['a'] + 3*e['b']
-2*B('a') + 3*e['b']
+B('a') + 3*B('b')
-    """
-
-
-
-
-
+
+
+
+
+
+
+
+
-        CombinatorialFreeModuleInterface.__init__(self, R, CombinatorialFreeModuleElement)
-    pass