removed most instances of choose_nk and split_nk, choose_nk.from_rank…

… and choose_nk.rank seem to remain
sagemath · Jun 11, 2015 · 63df8b7 · 63df8b7
1 parent 336ae6c
commit 63df8b7
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 307 deletions.
diff --git a/src/doc/en/reference/combinat/module_list.rst b/src/doc/en/reference/combinat/module_list.rst
@@ -27,7 +27,6 @@ Comprehensive Module list
     sage/combinat/binary_tree
     sage/combinat/cartesian_product
     sage/combinat/catalog_partitions
-    sage/combinat/choose_nk
     sage/combinat/cluster_algebra_quiver/__init__
     sage/combinat/cluster_algebra_quiver/all
     sage/combinat/cluster_algebra_quiver/cluster_seed
@@ -299,7 +298,6 @@ Comprehensive Module list
     sage/combinat/species/structure
     sage/combinat/species/subset_species
     sage/combinat/species/sum_species
-    sage/combinat/split_nk
     sage/combinat/subset
     sage/combinat/subsets_hereditary
     sage/combinat/subsets_pairwise

diff --git a/src/sage/combinat/choose_nk.py b/src/sage/combinat/choose_nk.py
diff --git a/src/sage/combinat/combination.py b/src/sage/combinat/combination.py
@@ -27,7 +27,6 @@
 from sage.rings.all import ZZ, Integer
 from sage.rings.arith import binomial
 from combinat import CombinatorialClass
-from choose_nk import rank, from_rank
 from integer_vector import IntegerVectors
 from sage.misc.misc import uniq
 
@@ -465,27 +464,3 @@ def rank(self, x):
         x = [self.mset.index(_) for _ in x]
         return rank(x, len(self.mset))
 
-
-##########################################################
-# Deprecations
-
-class ChooseNK(Combinations_setk):
-    def __setstate__(self, state):
-        r"""
-        For unpickling old ``ChooseNK`` objects.
-
-        TESTS::
-
-            sage: loads("x\x9ck`J.NLO\xd5K\xce\xcfM\xca\xccK,\xd1K\xce\xc8\xcf"
-            ....:   "/N\x8d\xcf\xcb\xe6r\x06\xb3\xfc\xbc\xb9\n\x195\x1b\x0b"
-            ....:   "\x99j\x0b\x995B\x99\xe2\xf3\nY :\x8a2\xf3\xd2\x8b\xf52"
-            ....:   "\xf3JR\xd3S\x8b\xb8r\x13\xb3S\xe3a\x9cB\xd6PF\xd3\xd6\xa0"
-            ....:   "B6\xa0\xfa\xecB\xf6\x0c \xd7\x08\xc8\xe5(M\xd2\x03\x00{"
-            ....:   "\x82$\xd8")
-            Combinations of [0, 1, 2, 3, 4] of length 2
-        """
-        self.__class__ = Combinations_setk
-        Combinations_setk.__init__(self, range(state['_n']), state['_k'])
-
-from sage.structure.sage_object import register_unpickle_override
-register_unpickle_override("sage.combinat.choose_nk", "ChooseNK", ChooseNK)
diff --git a/src/sage/combinat/enumerated_sets.py b/src/sage/combinat/enumerated_sets.py
@@ -130,8 +130,6 @@
 -------------------------
 
 - :ref:`sage.combinat.permutation_nk`
-- :ref:`sage.combinat.split_nk`
-- :ref:`sage.combinat.choose_nk`
 - :ref:`sage.combinat.multichoose_nk`
 - :ref:`sage.combinat.gray_codes`
 

diff --git a/src/sage/combinat/set_partition_ordered.py b/src/sage/combinat/set_partition_ordered.py
@@ -585,30 +585,3 @@ def __iter__(self):
             yield self.element_class(self, [Set(res[dcomp[i]+1:dcomp[i+1]+1])
                                             for i in range(l)])
 
-##########################################################
-# Deprecations
-
-
-class SplitNK(OrderedSetPartitions_scomp):
-    def __setstate__(self, state):
-        r"""
-        For unpickling old ``SplitNK`` objects.
-
-        TESTS::
-
-            sage: loads("x\x9ck`J.NLO\xd5K\xce\xcfM\xca\xccK,\xd1+.\xc8\xc9,"
-            ....:   "\x89\xcf\xcb\xe6\n\x061\xfc\xbcA\xccBF\xcd\xc6B\xa6\xda"
-            ....:   "Bf\x8dP\xa6\xf8\xbcB\x16\x88\x96\xa2\xcc\xbc\xf4b\xbd\xcc"
-            ....:   "\xbc\x92\xd4\xf4\xd4\"\xae\xdc\xc4\xec\xd4x\x18\xa7\x905"
-            ....:   "\x94\xd1\xb45\xa8\x90\r\xa8>\xbb\x90=\x03\xc85\x02r9J\x93"
-            ....:   "\xf4\x00\xb4\xc6%f")
-            Ordered set partitions of {0, 1, 2, 3, 4} into parts of size [2, 3]
-        """
-        self.__class__ = OrderedSetPartitions_scomp
-        n = state['_n']
-        k = state['_k']
-        OrderedSetPartitions_scomp.__init__(self, range(state['_n']), (k,n-k))
-
-from sage.structure.sage_object import register_unpickle_override
-register_unpickle_override("sage.combinat.split_nk", "SplitNK_nk", SplitNK)
-
diff --git a/src/sage/combinat/split_nk.py b/src/sage/combinat/split_nk.py
diff --git a/src/sage/combinat/subset.py b/src/sage/combinat/subset.py
@@ -41,7 +41,6 @@
 from sage.rings.arith import binomial
 from sage.rings.integer_ring import ZZ
 from sage.rings.integer import Integer
-import choose_nk
 
 ZZ_0 = ZZ.zero()