Merge branch 'u/gh-ChamanAgrawal/24894_superRSK' into u/gh-ChamanAgra…

…wal/28222_shiftedKnuth
sagemath · Jul 23, 2019 · 483b20c · 483b20c
2 parents b70aa65 + 5b622eb
commit 483b20c
Show file tree

Hide file tree

Showing 4 changed files with 570 additions and 563 deletions.
diff --git a/src/sage/combinat/all.py b/src/sage/combinat/all.py
@@ -105,6 +105,9 @@
 lazy_import('sage.combinat.shifted_primed_tableau', ['ShiftedPrimedTableaux',
                                                      'ShiftedPrimedTableau'])
 
+#SuperTableaux
+from .super_tableau import *
+
 #Words
 from .words.all import *
 

diff --git a/src/sage/combinat/rsk.py b/src/sage/combinat/rsk.py
@@ -1947,7 +1947,7 @@ class RuleSuperRSK(RuleRSK):
         sage: RSK(["1p", "2p", 2, 2, "3p", "3p", 3, 3], 
         ....:    ["1p", 1, "2p", 2, "3p", "3p", "3p", 3], insertion='superRSK')
         [[[1', 2, 3', 3], [1, 3'], [2'], [3']], [[1', 2, 3', 3], [2', 3'], [2], [3]]]
-        sage: from sage.combinat.tableau import SemistandardSuperTableau
+        sage: from sage.combinat.super_tableau import SemistandardSuperTableau
         sage: P = SemistandardSuperTableau([[1, '3p', 3], ['2p']])
         sage: Q = SemistandardSuperTableau([['1p', 1, '2p'], [2]])
         sage: RSK_inverse(P, Q, insertion=RSK.rules.superRSK)
@@ -1988,7 +1988,7 @@ class RuleSuperRSK(RuleRSK):
         sage: t2 = Tableau([[1, 2, 3], [4], [5]])
         sage: RSK_inverse(t1, t2, insertion=RSK.rules.RSK)
         [[1, 2, 3, 4, 5], [1, 4, 5, 3, 2]]
-        sage: from sage.combinat.tableau import SemistandardSuperTableau
+        sage: from sage.combinat.super_tableau import SemistandardSuperTableau
         sage: t1 = SemistandardSuperTableau([[1, 2, 5], [3], [4]])
         sage: t2 = SemistandardSuperTableau([[1, 2, 3], [4], [5]])
         sage: RSK_inverse(t1, t2, insertion=RSK.rules.superRSK)
@@ -2209,7 +2209,7 @@ def forward_rule(self, obj1, obj2, check_standard=False, check=True):
         EXAMPLES::
 
             sage: from sage.combinat.rsk import RuleSuperRSK
-            sage: from sage.combinat.tableau import SemistandardSuperTableau
+            sage: from sage.combinat.super_tableau import SemistandardSuperTableau
             sage: p, q = RuleSuperRSK().forward_rule([1, 2], [1, 3]); p
             [[1, 3]]
             sage: q
@@ -2324,7 +2324,7 @@ def _forward_format_output(self, p, q, check_standard):
         EXAMPLES::
 
             sage: from sage.combinat.rsk import RuleSuperRSK
-            sage: from sage.combinat.tableau import SemistandardSuperTableau, StandardSuperTableau
+            sage: from sage.combinat.super_tableau import SemistandardSuperTableau, StandardSuperTableau
             sage: isinstance(RuleSuperRSK()._forward_format_output(
             ....:           [['1p', 1, '2p']], [['1p', '1', '2p']], True)[0], 
             ....:           StandardSuperTableau)
@@ -2338,7 +2338,8 @@ def _forward_format_output(self, p, q, check_standard):
             ....:                       SemistandardSuperTableau)
             True
         """
-        from sage.combinat.tableau import SemistandardSuperTableau, StandardTableau, StandardSuperTableau
+        from sage.combinat.tableau import StandardTableau
+        from sage.combinat.super_tableau import SemistandardSuperTableau, StandardSuperTableau
 
         if not p:
             return [StandardTableau([]), StandardTableau([])]
@@ -2375,7 +2376,7 @@ def backward_rule(self, p, q, output='array'):
         EXAMPLES::
 
             sage: from sage.combinat.rsk import RuleSuperRSK
-            sage: from sage.combinat.tableau import SemistandardSuperTableau
+            sage: from sage.combinat.super_tableau import SemistandardSuperTableau
             sage: t1 = SemistandardSuperTableau([['1p', '3p', '4p'], [2], [3]])
             sage: t2 = SemistandardSuperTableau([[1, 2, 4], [3], [5]])
             sage: RuleSuperRSK().backward_rule(t1, t2, 'array')