fixing the doctests

Author: fchapoton

src/sage/combinat/chas/wqsym.py

@@ -574,7 +574,7 @@ class Monomial(WQSymBasis_abstract):
             sage: M = WQSym.M(); M
             Word Quasi-symmetric functions over Rational Field in the Monomial basis
             sage: sorted(M.basis(2))
-            [M[{1, 2}], M[{2}, {1}], M[{1}, {2}]]
+            [M[{1}, {2}], M[{2}, {1}], M[{1, 2}]]
         """
         _prefix = "M"
         _basis_name = "Monomial"
@@ -625,6 +625,7 @@ def product_on_basis(self, x, y):
 
             def union(X, Y):
                 return X.union(Y)
+
             return self.sum_of_monomials(ShuffleProduct_overlapping(x, yshift,
                                                                     K, union))
 
@@ -975,12 +976,15 @@ def _C_to_X(self, P):
                         temp = temp[:j]
                         break
 
+            def union(X, Y):
+                return X.union(Y)
+
             # Perform the quasi-shuffle product
             cur = {data[0]: 1}
             for B in data[1:]:
                 ret = {}
                 for A in cur:
-                    for C in ShuffleProduct_overlapping(A, B, element_constructor=OSP):
+                    for C in ShuffleProduct_overlapping(A, B, element_constructor=OSP, add=union):
                         if C in ret:
                             ret[C] += cur[A]
                         else:
@@ -2220,7 +2224,7 @@ def algebraic_complement(self):
                 sage: M[[1,4],[2,5],[3,6]].algebraic_complement()
                 M[{3, 6}, {2, 5}, {1, 4}]
                 sage: (3*M[[1]] - 4*M[[]] + 5*M[[1],[2]]).algebraic_complement()
-                -4*M[] + 3*M[{1}] + 5*M[{2}, {1}]
+                3*M[{1}] - 4*M[] + 5*M[{2}, {1}]
                 sage: X = WQSym.X()
                 sage: X[[1,3],[2]].algebraic_complement()
                 X[{2}, {1, 3}]
@@ -2385,7 +2389,7 @@ def coalgebraic_complement(self):
                 sage: M[[1,4],[2,5],[3,6]].coalgebraic_complement()
                 M[{3, 6}, {2, 5}, {1, 4}]
                 sage: (3*M[[1]] - 4*M[[]] + 5*M[[1],[2]]).coalgebraic_complement()
-                -4*M[] + 3*M[{1}] + 5*M[{2}, {1}]
+                3*M[{1}] - 4*M[] + 5*M[{2}, {1}]
                 sage: X = WQSym.X()
                 sage: X[[1,3],[2]].coalgebraic_complement()
                 X[{1, 3}, {2}]
@@ -2496,7 +2500,7 @@ def star_involution(self):
                 sage: M[[1,4],[2,5],[3,6]].star_involution()
                 M[{1, 4}, {2, 5}, {3, 6}]
                 sage: (3*M[[1]] - 4*M[[]] + 5*M[[1],[2]]).star_involution()
-                -4*M[] + 3*M[{1}] + 5*M[{1}, {2}]
+                3*M[{1}] - 4*M[] + 5*M[{1}, {2}]
                 sage: X = WQSym.X()
                 sage: X[[1,3],[2]].star_involution()
                 X[{2}, {1, 3}]

src/sage/combinat/set_partition_ordered.py

@@ -568,10 +568,10 @@ def fatter(self):
             sage: C.cardinality()
             4
             sage: sorted(C)
-            [[{1, 2, 3, 4, 5}],
-             [{1, 2, 5}, {3, 4}],
+            [[{2, 5}, {1}, {3, 4}],
              [{2, 5}, {1, 3, 4}],
-             [{2, 5}, {1}, {3, 4}]]
+             [{1, 2, 5}, {3, 4}],
+             [{1, 2, 3, 4, 5}]]
 
             sage: OrderedSetPartition([[4, 9], [-1, 2]]).fatter().list()
             [[{4, 9}, {-1, 2}], [{-1, 2, 4, 9}]]
@@ -583,14 +583,14 @@ def fatter(self):
             sage: list(Composition([]).fatter())
             [[]]
             sage: sorted(OrderedSetPartition([[1], [2], [3], [4]]).fatter())
-            [[{1, 2, 3, 4}],
-             [{1, 2, 3}, {4}],
-             [{1, 2}, {3, 4}],
-             [{1, 2}, {3}, {4}],
-             [{1}, {2, 3, 4}],
-             [{1}, {2, 3}, {4}],
+            [[{1}, {2}, {3}, {4}],
              [{1}, {2}, {3, 4}],
-             [{1}, {2}, {3}, {4}]]
+             [{1}, {2, 3}, {4}],
+             [{1}, {2, 3, 4}],
+             [{1, 2}, {3}, {4}],
+             [{1, 2}, {3, 4}],
+             [{1, 2, 3}, {4}],
+             [{1, 2, 3, 4}]]
         """
         return Compositions(len(self)).map(self.fatten)
 
@@ -742,8 +742,7 @@ def strongly_fatter(self):
             sage: C.cardinality()
             2
             sage: sorted(C)
-            [[{2, 5}, {1, 3, 4}],
-             [{2, 5}, {1}, {3, 4}]]
+            [[{2, 5}, {1}, {3, 4}], [{2, 5}, {1, 3, 4}]]
 
             sage: OrderedSetPartition([[4, 9], [-1, 2]]).strongly_fatter().list()
             [[{4, 9}, {-1, 2}]]
@@ -755,21 +754,21 @@ def strongly_fatter(self):
             sage: list(OrderedSetPartition([]).strongly_fatter())
             [[]]
             sage: sorted(OrderedSetPartition([[1], [2], [3], [4]]).strongly_fatter())
-            [[{1, 2, 3, 4}],
-             [{1, 2, 3}, {4}],
-             [{1, 2}, {3, 4}],
-             [{1, 2}, {3}, {4}],
-             [{1}, {2, 3, 4}],
-             [{1}, {2, 3}, {4}],
+            [[{1}, {2}, {3}, {4}],
              [{1}, {2}, {3, 4}],
-             [{1}, {2}, {3}, {4}]]
+             [{1}, {2, 3}, {4}],
+             [{1}, {2, 3, 4}],
+             [{1, 2}, {3}, {4}],
+             [{1, 2}, {3, 4}],
+             [{1, 2, 3}, {4}],
+             [{1, 2, 3, 4}]]
             sage: sorted(OrderedSetPartition([[1], [3], [2], [4]]).strongly_fatter())
-            [[{1, 3}, {2, 4}],
-             [{1, 3}, {2}, {4}],
+            [[{1}, {3}, {2}, {4}],
              [{1}, {3}, {2, 4}],
-             [{1}, {3}, {2}, {4}]]
+             [{1, 3}, {2}, {4}],
+             [{1, 3}, {2, 4}]]
             sage: sorted(OrderedSetPartition([[4], [1], [5], [3]]).strongly_fatter())
-            [[{4}, {1, 5}, {3}], [{4}, {1}, {5}, {3}]]
+            [[{4}, {1}, {5}, {3}], [{4}, {1, 5}, {3}]]
         """
         c = [sorted(X) for X in self]
         l = len(c) - 1