rename __subset -> _subset_internal

Author: infmagic2047

src/sage/matroids/linear_matroid.pyx

@@ -605,7 +605,7 @@ cdef class LinearMatroid(BasisExchangeMatroid):
                     self._representation = self._basic_representation(B)
                 A = self._representation
             else:
-                B = self.__subset(B)
+                B = self._subset_internal(B)
                 A = self._basic_representation(B)
             A = A.matrix_from_rows_and_columns(range(A.nrows()), order_idx)
             if lift_map is None:
@@ -622,7 +622,7 @@ cdef class LinearMatroid(BasisExchangeMatroid):
             if B is None:
                 B = frozenset(self.basis())
             else:
-                B = self.__subset(B)
+                B = self._subset_internal(B)
             A = self._reduced_representation(B)
             R, C = self._current_rows_cols()
             Ri = []

src/sage/matroids/matroid.pxd

@@ -36,7 +36,7 @@ cdef class Matroid(SageObject):
     cpdef _line_length(self, F)
     cpdef _extension(self, element, hyperplanes)
 
-    cdef inline __subset(self, X):
+    cdef inline _subset_internal(self, X):
         """
         Convert ``X`` to a ``frozenset`` and check that it is a subset
         of the groundset.

src/sage/matroids/matroid.pyx

@@ -1307,7 +1307,7 @@ cdef class Matroid(SageObject):
             TypeError: 'sage.rings.integer.Integer' object is not iterable
         """
         # Call corresponding Cython method
-        return self.__subset(X)
+        return self._subset_internal(X)
 
     def _subset_all(self, X):
         """
@@ -1374,7 +1374,7 @@ cdef class Matroid(SageObject):
         """
         if X is None:
             return self.full_rank()
-        return self._rank(self.__subset(X))
+        return self._rank(self._subset_internal(X))
 
     cpdef full_rank(self):
         r"""
@@ -1453,7 +1453,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: ['x'] is not a subset of the groundset
         """
-        return self._max_independent(self.__subset(X))
+        return self._max_independent(self._subset_internal(X))
 
     cpdef circuit(self, X=None):
         """
@@ -1558,7 +1558,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: ['x'] is not a subset of the groundset
         """
-        return self._closure(self.__subset(X))
+        return self._closure(self._subset_internal(X))
 
     cpdef k_closure(self, X, k):
         r"""
@@ -1597,7 +1597,7 @@ cdef class Matroid(SageObject):
             sage: sorted(M.k_closure({0,1}, 4))
             [0, 1, 4]
         """
-        X = self.__subset(X)
+        X = self._subset_internal(X)
         cdef int cur
         cdef frozenset S, cl
         cur = 0
@@ -1644,7 +1644,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: ['x'] is not a subset of the groundset
         """
-        X = self.__subset(X)
+        X = self._subset_internal(X)
         Y = self.__subset_all(Y)
         return self._augment(X, Y.difference(X))
 
@@ -1781,7 +1781,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: ['x'] is not a subset of the groundset
         """
-        return self._max_coindependent(self.__subset(X))
+        return self._max_coindependent(self._subset_internal(X))
 
     cpdef coclosure(self, X):
         """
@@ -1813,7 +1813,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: ['x'] is not a subset of the groundset
         """
-        return self._coclosure(self.__subset(X))
+        return self._coclosure(self._subset_internal(X))
 
     cpdef cocircuit(self, X=None):
         """
@@ -1947,7 +1947,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return self._is_independent(self.__subset(X))
+        return self._is_independent(self._subset_internal(X))
 
     cpdef is_dependent(self, X):
         r"""
@@ -1973,7 +1973,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return not self._is_independent(self.__subset(X))
+        return not self._is_independent(self._subset_internal(X))
 
     cpdef is_basis(self, X):
         r"""
@@ -1999,7 +1999,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        X = self.__subset(X)
+        X = self._subset_internal(X)
         if len(X) != self.full_rank():
             return False
         return self._is_basis(X)
@@ -2035,7 +2035,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return self._is_closed(self.__subset(X))
+        return self._is_closed(self._subset_internal(X))
 
     cpdef is_subset_k_closed(self, X, int k):
         r"""
@@ -2118,7 +2118,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return self._is_circuit(self.__subset(X))
+        return self._is_circuit(self._subset_internal(X))
 
     cpdef coloops(self):
         r"""
@@ -2178,7 +2178,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return self._is_coindependent(self.__subset(X))
+        return self._is_coindependent(self._subset_internal(X))
 
     cpdef is_codependent(self, X):
         r"""
@@ -2211,7 +2211,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return not self._is_coindependent(self.__subset(X))
+        return not self._is_coindependent(self._subset_internal(X))
 
     cpdef is_cobasis(self, X):
         r"""
@@ -2245,7 +2245,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        X = self.__subset(X)
+        X = self._subset_internal(X)
         if len(X) != self.full_corank():
             return False
         return self._is_cobasis(X)
@@ -2282,7 +2282,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return self._is_cocircuit(self.__subset(X))
+        return self._is_cocircuit(self._subset_internal(X))
 
     cpdef is_coclosed(self, X):
         r"""
@@ -2315,7 +2315,7 @@ cdef class Matroid(SageObject):
             ...
             ValueError: 'abcx' is not a subset of the groundset
         """
-        return self._is_coclosed(self.__subset(X))
+        return self._is_coclosed(self._subset_internal(X))
 
     # verification
 
@@ -4868,10 +4868,10 @@ cdef class Matroid(SageObject):
             sage: M.connectivity('ab', 'cd')
             2
         """
-        S = self.__subset(S)
+        S = self._subset_internal(S)
         if T is None:
             return self._rank(S) + self._rank(self.groundset()-S) - self.full_rank()
-        T = self.__subset(T)
+        T = self._subset_internal(T)
         if S.intersection(T):
             raise ValueError("S and T are not disjoint")
         return len(self._link(S, T)[0]) - self.full_rank() + self._rank(S) + self._rank(T)
@@ -4956,8 +4956,8 @@ cdef class Matroid(SageObject):
             sage: N.connectivity(S)
             2
         """
-        S = self.__subset(S)
-        T = self.__subset(T)
+        S = self._subset_internal(S)
+        T = self._subset_internal(T)
         if not S.isdisjoint(T):
             raise ValueError("S and T are not disjoint")
         return self._link(S, T)