Merge branch 'public/combinat/13987-mary-trees' in 7.3.b6

sagemath · Jul 8, 2016 · 21ea566 · 21ea566
2 parents d091c43 + 0334ad2
commit 21ea566
Show file tree

Hide file tree

Showing 2 changed files with 952 additions and 1 deletion.
diff --git a/src/sage/combinat/all.py b/src/sage/combinat/all.py
@@ -113,8 +113,12 @@
 from sage.misc.lazy_import import lazy_import
 from .ordered_tree import (OrderedTree, OrderedTrees,
                           LabelledOrderedTree, LabelledOrderedTrees)
+
+from .mary_tree import (MAryTree, MAryTrees, 
+                        LabelledMAryTree, LabelledMAryTrees)
+
 from .binary_tree import (BinaryTree, BinaryTrees,
-                         LabelledBinaryTree, LabelledBinaryTrees)
+                          LabelledBinaryTree, LabelledBinaryTrees)
 
 lazy_import('sage.combinat.interval_posets', ['TamariIntervalPoset', 'TamariIntervalPosets'])
 from .rooted_tree import (RootedTree, RootedTrees,