using Integer more

Author: fchapoton

src/sage/combinat/affine_permutation.py

@@ -22,7 +22,7 @@
 from sage.misc.lazy_import import lazy_import
 from sage.misc.misc_c import prod
 from sage.misc.prandom import randint
-from sage.rings.integer_ring import ZZ
+from sage.rings.integer import Integer
 from sage.structure.list_clone import ClonableArray
 from sage.structure.parent import Parent
 from sage.structure.unique_representation import UniqueRepresentation
@@ -75,8 +75,8 @@ def __init__(self, parent, lst, check=True):
             Type A affine permutation with window [1, 2, 3, 4]
         """
         if check:
-            lst = [ZZ(val) for val in lst]
-        self.k = ZZ(parent.k)
+            lst = [Integer(val) for val in lst]
+        self.k = parent.k
         self.n = self.k + 1
         # This N doesn't matter for type A, but comes up in all other types.
         if parent.cartan_type()[0] == 'A':
@@ -2014,7 +2014,7 @@ def __init__(self, cartan_type):
         """
         Parent.__init__(self, category=AffineWeylGroups())
         ct = CartanType(cartan_type)
-        self.k = ZZ(ct.n)
+        self.k = Integer(ct.n)
         self.n = ct.rank()
         # This N doesn't matter for type A, but comes up in all other types.
         if ct.letter == 'A':

src/sage/combinat/baxter_permutations.py

@@ -2,6 +2,7 @@
 Baxter permutations
 """
 from sage.combinat.permutation import Permutations
+from sage.rings.integer import Integer
 from sage.rings.integer_ring import ZZ
 from sage.sets.disjoint_union_enumerated_sets import DisjointUnionEnumeratedSets
 from sage.structure.parent import Parent
@@ -77,11 +78,11 @@ def __init__(self, n):
             Baxter permutations of size 5
         """
         self.element_class = Permutations(n).element_class
-        self._n = ZZ(n)
+        self._n = Integer(n)
         from sage.categories.finite_enumerated_sets import FiniteEnumeratedSets
         super().__init__(category=FiniteEnumeratedSets())
 
-    def _repr_(self):
+    def _repr_(self) -> str:
         """
         Return a string representation of ``self``.
 
@@ -91,9 +92,9 @@ def _repr_(self):
             sage: BaxterPermutations_size(5)
             Baxter permutations of size 5
         """
-        return "Baxter permutations of size %s" % self._n
+        return f"Baxter permutations of size {self._n}"
 
-    def __contains__(self, x):
+    def __contains__(self, x) -> bool:
         r"""
         Return ``True`` if and only if ``x`` is a Baxter permutation of
         size ``self._n``.

src/sage/combinat/blob_algebra.py

@@ -25,7 +25,7 @@
 from sage.combinat.free_module import CombinatorialFreeModule
 from sage.combinat.subset import powerset
 from sage.misc.cachefunc import cached_method
-from sage.rings.integer_ring import ZZ
+from sage.rings.integer import Integer
 from sage.structure.element import Element, get_coercion_model
 from sage.structure.parent import Parent
 from sage.structure.richcmp import richcmp
@@ -164,7 +164,7 @@ def __init__(self, n):
             sage: BD4 = BlobDiagrams(4)
             sage: TestSuite(BD4).run()
         """
-        self._n = ZZ(n)
+        self._n = Integer(n)
         self._TL_diagrams = TemperleyLiebDiagrams(n)
         Parent.__init__(self, category=FiniteEnumeratedSets())
 

src/sage/combinat/dyck_word.py

@@ -90,7 +90,7 @@
 from sage.categories.infinite_enumerated_sets import InfiniteEnumeratedSets
 from sage.categories.posets import Posets
 
-from sage.rings.integer_ring import ZZ
+from sage.rings.integer import Integer
 from sage.rings.rational_field import QQ
 from sage.combinat.permutation import Permutation, Permutations
 from sage.combinat.words.word import Word
@@ -3286,14 +3286,14 @@ def __classcall_private__(cls, k1=None, k2=None, complete=True):
                     return CompleteDyckWords_all()
                 return DyckWords_all()
 
-            k1 = ZZ(k1)
+            k1 = Integer(k1)
             if k1 < 0:
                 raise ValueError("k1 (= %s) must be nonnegative" % k1)
             return CompleteDyckWords_size(k1)
         else:
-            k1 = ZZ(k1)
+            k1 = Integer(k1)
 
-        k2 = ZZ(k2)
+        k2 = Integer(k2)
         if k1 < 0 or (k2 is not None and k2 < 0):
             raise ValueError("k1 (= %s) and k2 (= %s) must be nonnegative, with k1 >= k2" % (k1, k2))
         if k1 < k2:
@@ -3638,8 +3638,8 @@ def __init__(self, k1, k2):
         # Dyck paths, not words; having k1 opening parens and k2 closing
         # parens corresponds to paths of length k1 + k2 ending at height
         # k1 - k2.
-        k1 = ZZ(k1)
-        k2 = ZZ(k2)
+        k1 = Integer(k1)
+        k2 = Integer(k2)
         self.n = k1 + k2
         self.endht = k1 - k2
 
@@ -3697,8 +3697,8 @@ def __init__(self, k1, k2):
             Integer Ring
             sage: TestSuite(DyckWords(4,2)).run()
         """
-        self.k1 = ZZ(k1)
-        self.k2 = ZZ(k2)
+        self.k1 = Integer(k1)
+        self.k2 = Integer(k2)
         DyckWords.__init__(self, category=FiniteEnumeratedSets())
 
     def _repr_(self) -> str:

src/sage/combinat/posets/posets.py

@@ -7167,12 +7167,12 @@ def order_polytope(self):
             True
         """
         from sage.geometry.polyhedron.constructor import Polyhedron
-        ineqs = [[0] + [ZZ(j == v) - ZZ(j == u) for j in self]
+        ineqs = [[0] + [Integer(j == v) - Integer(j == u) for j in self]
                  for u, v in self.hasse_diagram().edges(sort=False, labels=False)]
         for i in self.maximal_elements():
-            ineqs += [[1] + [-ZZ(j == i) for j in self]]
+            ineqs += [[1] + [-Integer(j == i) for j in self]]
         for i in self.minimal_elements():
-            ineqs += [[0] + [ZZ(j == i) for j in self]]
+            ineqs += [[0] + [Integer(j == i) for j in self]]
         return Polyhedron(ieqs=ineqs, base_ring=ZZ)
 
     def chain_polytope(self):
@@ -7206,10 +7206,10 @@ def chain_polytope(self):
             A 5-dimensional polyhedron in ZZ^5 defined as the convex hull of 8 vertices
         """
         from sage.geometry.polyhedron.constructor import Polyhedron
-        ineqs = [[1] + [-ZZ(j in chain) for j in self]
+        ineqs = [[1] + [-Integer(j in chain) for j in self]
                  for chain in self.maximal_chains_iterator()]
         for i in self:
-            ineqs += [[0] + [ZZ(j == i) for j in self]]
+            ineqs += [[0] + [Integer(j == i) for j in self]]
         return Polyhedron(ieqs=ineqs, base_ring=ZZ)
 
     def zeta_polynomial(self):