changed the name of unrank(helper) function and removed unnecessary else statements

Author: amanmoon

src/sage/combinat/integer_vector.py

@@ -780,7 +780,7 @@ def __contains__(self, x):
                 return False
         return True
 
-    def unrank(self, x, rtn):
+    def _unrank_helper(self, x, rtn):
         ptr = 0
         while True:
             current_rank = self.rank(rtn)
@@ -855,8 +855,7 @@ def __init__(self, n):
         self.n = n
         if self.n == 0:
             IntegerVectors.__init__(self, category=EnumeratedSets())
-        else:
-            IntegerVectors.__init__(self, category=InfiniteEnumeratedSets())
+        IntegerVectors.__init__(self, category=InfiniteEnumeratedSets())
 
     def _repr_(self):
         """
@@ -964,7 +963,7 @@ def unrank(self, x):
             rtn.append(0)
         rtn.pop()
 
-        return IntegerVectors.unrank(self, x, rtn)
+        return IntegerVectors._unrank_helper(self, x, rtn)
 
     def cardinality(self):
         """
@@ -979,8 +978,7 @@ def cardinality(self):
         """
         if self.n == 0:
             return Integer(1)
-        else:
-            return PlusInfinity()
+        return PlusInfinity()
 
 
 class IntegerVectors_k(UniqueRepresentation, IntegerVectors):
@@ -998,8 +996,7 @@ def __init__(self, k):
         self.k = k
         if self.k == 0:
             IntegerVectors.__init__(self, category=EnumeratedSets())
-        else:
-            IntegerVectors.__init__(self, category=InfiniteEnumeratedSets())
+        IntegerVectors.__init__(self, category=InfiniteEnumeratedSets())
 
     def _repr_(self):
         """
@@ -1101,15 +1098,14 @@ def unrank(self, x):
         """
         if self.k == 0 and x != 0:
             raise IndexError(f"Index {x} is out of range for the IntegerVector.")
-        else:
-            n = 0
-            rtn = [0]*self.k
-            while self.rank(rtn) <= x:
-                n += 1
-                rtn[0] = n
-            rtn[0] -= 1
+        n = 0
+        rtn = [0]*self.k
+        while self.rank(rtn) <= x:
+            n += 1
+            rtn[0] = n
+        rtn[0] -= 1
 
-            return IntegerVectors.unrank(self, x, rtn)
+        return IntegerVectors._unrank_helper(self, x, rtn)
 
     def cardinality(self):
         """
@@ -1124,8 +1120,7 @@ def cardinality(self):
         """
         if self.k == 0:
             return Integer(1)
-        else:
-            return PlusInfinity()
+        return PlusInfinity()
 
 
 class IntegerVectors_nk(UniqueRepresentation, IntegerVectors):
@@ -1340,10 +1335,9 @@ def unrank(self, x):
         """
         if x >= self.cardinality():
             raise IndexError(f"Index {x} is out of range for the IntegerVector.")
-        else:
-            rtn = [0]*self.k
-            rtn[0] = self.n
-            return IntegerVectors.unrank(self, x, rtn)
+        rtn = [0]*self.k
+        rtn[0] = self.n
+        return IntegerVectors._unrank_helper(self, x, rtn)
 
     def cardinality(self):
         """