passagemath-combinat 10.6.1__cp312-cp312-musllinux_1_2_aarch64.whl → 10.8.1a1__cp312-cp312-musllinux_1_2_aarch64.whl

sage/combinat/knutson_tao_puzzles.py

@@ -180,7 +180,7 @@ class PuzzlePiece:
             else:
                 edges = self.edges()
             P = Graphics()
-            for (i, edge) in enumerate(edges):
+            for i, edge in enumerate(edges):
                 P += line([coords[i], coords[(i + 1) % 3]],
                           color=self.edge_color(edge),
                           thickness=border_thickness)
@@ -1148,11 +1148,10 @@ class PuzzleFilling:
             sage: P.north_west_label_of_kink()
             '1'
         """
-        (i, j) = self.kink_coordinates()
+        i, j = self.kink_coordinates()
         if i == 1:
             return self._nw_labels[j - 1]
-        else:
-            return self._squares[i - 1, j]['south_east']
+        return self._squares[i - 1, j]['south_east']
 
     def north_east_label_of_kink(self):
         r"""
@@ -1165,13 +1164,12 @@ class PuzzleFilling:
             sage: P.north_east_label_of_kink()
             '0'
         """
-        (i, j) = self.kink_coordinates()
+        i, j = self.kink_coordinates()
         if j == self._n:
             return self._ne_labels[i - 1]
-        else:
-            return self._squares[i, j + 1]['south_west']
+        return self._squares[i, j + 1]['south_west']
 
-    def is_completed(self):
+    def is_completed(self) -> bool:
         r"""
         Whether partial puzzle is complete (completely filled) or not.
 
@@ -1191,7 +1189,7 @@ class PuzzleFilling:
         i, _ = self.kink_coordinates()
         return i == self._n + 1
 
-    def south_labels(self):
+    def south_labels(self) -> tuple:
         r"""
         Return south labels for completed puzzle.
 
@@ -1366,9 +1364,9 @@ class PuzzleFilling:
         """
         P = Graphics()
         coords = [(k, -d) for d in range(self._n) for k in range(-d, d + 1, 2)]
-        for ((k, d), piece) in zip(coords, self):
+        for (k, d), piece in zip(coords, self):
             if isinstance(piece, RhombusPiece):
-                for (i, triangle) in enumerate(piece):
+                for i, triangle in enumerate(piece):
                     P += triangle._plot_piece([(k, d - 2 * i), (k - 1, d - 1), (k + 1, d - 1)], style=style)
                 if labels:
                     P += piece._plot_label(piece['north_west'], (k - 0.5, d - 0.5), rotation=60)
@@ -1450,10 +1448,10 @@ class PuzzleFilling:
             s += ";\n"
             return s
 
-        for ((k, d), piece) in zip(coords, self):
+        for (k, d), piece in zip(coords, self):
             for tikzcmd in (tikztriangle_fill, tikztriangle_edges, tikzlabels):
                 if isinstance(piece, RhombusPiece):
-                    for (i, triangle) in enumerate([piece.north_piece(), piece.south_piece()]):
+                    for i, triangle in enumerate([piece.north_piece(), piece.south_piece()]):
                         if i == 0:
                             s += tikzcmd(triangle.color(), k, d, i, *triangle.border())
                         else:

sage/combinat/matrices/hadamard_matrix.py

@@ -1962,7 +1962,7 @@ def hadamard_matrix_www(url_file, comments=False):
         [ 1 -1 -1  1  1  1 -1 -1 -1  1  1 -1 -1 -1  1  1]
         [ 1 -1 -1  1 -1 -1  1  1 -1  1  1 -1  1  1 -1 -1]
     """
-    n = eval(url_file.split(".")[1])
+    n = int(url_file.split(".")[1])
     rws = []
     url = "http://neilsloane.com/hadamard/" + url_file
     with urlopen(url) as f:

sage/combinat/matrices/latin.py

@@ -76,8 +76,8 @@ EXAMPLES::
     sage: B.is_latin_square()
     False
 
-    sage: (a, b, c, G) = alternating_group_bitrade_generators(1)
-    sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+    sage: a, b, c, G = alternating_group_bitrade_generators(1)
+    sage: T1, T2 = bitrade_from_group(a, b, c, G)
     sage: T1
     [ 0 -1  3  1]
     [-1  1  0  2]
@@ -88,7 +88,7 @@ EXAMPLES::
     [-1  0  2  1]
     [ 2  1  3 -1]
     [ 0  3 -1  2]
-    sage: T1.nr_filled_cells()
+    sage: T1.n_filled_cells()
     12
     sage: genus(T1, T2)
     1
@@ -149,7 +149,7 @@ from functools import reduce
 
 
 class LatinSquare:
-    def __init__(self, *args):
+    def __init__(self, *args) -> None:
         """
         Latin squares.
 
@@ -204,7 +204,7 @@ class LatinSquare:
         from sage.misc.persist import dumps
         return dumps(self.square)
 
-    def __str__(self):
+    def __str__(self) -> str:
         """
         The string representation of a latin square is the same as the
         underlying matrix.
@@ -217,7 +217,7 @@ class LatinSquare:
         """
         return str(self.square)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         """
         The representation of a latin square is the same as the underlying
         matrix.
@@ -242,13 +242,9 @@ class LatinSquare:
             sage: B[1, 1]
             2
         """
+        return self.square[*rc]
 
-        r = rc[0]
-        c = rc[1]
-
-        return self.square[r, c]
-
-    def __setitem__(self, rc, val):
+    def __setitem__(self, rc, val) -> None:
         """
         If L is a LatinSquare then this method allows us to set L[r, c].
 
@@ -260,13 +256,9 @@ class LatinSquare:
             sage: B[1, 1]
             10
         """
+        self.square[*rc] = val
 
-        r = rc[0]
-        c = rc[1]
-
-        self.square[r, c] = val
-
-    def set_immutable(self):
+    def set_immutable(self) -> None:
         """
         A latin square is immutable if the underlying matrix is immutable.
 
@@ -278,10 +270,9 @@ class LatinSquare:
             {[0 1]
             [2 3]: 0}
         """
-
         self.square.set_immutable()
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         """
         The hash of a latin square is precisely the hash of the underlying
         matrix.
@@ -296,7 +287,7 @@ class LatinSquare:
         """
         return hash(self.square)
 
-    def __eq__(self, Q):
+    def __eq__(self, Q) -> bool:
         """
         Two latin squares are equal if the underlying matrices are equal.
 
@@ -310,7 +301,6 @@ class LatinSquare:
             sage: A == B
             True
         """
-
         return self.square == Q.square
 
     def __copy__(self):
@@ -330,7 +320,7 @@ class LatinSquare:
         C.square = copy(self.square)
         return C
 
-    def clear_cells(self):
+    def clear_cells(self) -> None:
         """
         Mark every cell in ``self`` as being empty.
 
@@ -392,7 +382,7 @@ class LatinSquare:
         """
         return self.square.column(x)
 
-    def list(self):
+    def list(self) -> list:
         """
         Convert the latin square into a list, in a row-wise manner.
 
@@ -404,7 +394,7 @@ class LatinSquare:
         """
         return self.square.list()
 
-    def nr_filled_cells(self):
+    def n_filled_cells(self) -> int:
         """
         Return the number of filled cells (i.e. cells with a positive
         value) in the partial latin square ``self``.
@@ -412,17 +402,15 @@ class LatinSquare:
         EXAMPLES::
 
             sage: from sage.combinat.matrices.latin import *
-            sage: LatinSquare(matrix([[0, -1], [-1, 0]])).nr_filled_cells()
+            sage: LatinSquare(matrix([[0, -1], [-1, 0]])).n_filled_cells()
             2
         """
-        s = 0
-        for r in range(self.nrows()):
-            for c in range(self.ncols()):
-                if self[r, c] >= 0:
-                    s += 1
-        return s
+        return sum(1 for r in range(self.nrows()) for c in range(self.ncols())
+                   if self[r, c] >= 0)
 
-    def actual_row_col_sym_sizes(self):
+    nr_filled_cells = n_filled_cells
+
+    def actual_row_col_sym_sizes(self) -> tuple:
         """
         Bitrades sometimes end up in partial latin squares with unused
         rows, columns, or symbols. This function works out the actual
@@ -449,7 +437,7 @@ class LatinSquare:
         """
         row_max = self.nrows()
         col_max = self.ncols()
-        sym_max = self.nr_distinct_symbols()
+        sym_max = self.n_distinct_symbols()
 
         while self.is_empty_row(row_max-1):
             row_max -= 1
@@ -458,7 +446,7 @@ class LatinSquare:
 
         return row_max, col_max, sym_max
 
-    def is_empty_column(self, c):
+    def is_empty_column(self, c) -> bool:
         """
         Check if column c of the partial latin square ``self`` is empty.
 
@@ -472,9 +460,9 @@ class LatinSquare:
             sage: L.is_empty_column(0)
             True
         """
-        return list(set(self.column(c))) == [-1]
+        return all(cf == -1 for cf in self.column(c))
 
-    def is_empty_row(self, r):
+    def is_empty_row(self, r) -> bool:
         """
         Check if row r of the partial latin square ``self`` is empty.
 
@@ -488,9 +476,9 @@ class LatinSquare:
             sage: L.is_empty_row(0)
             True
         """
-        return list(set(self.row(r))) == [-1]
+        return all(cf == -1 for cf in self.row(r))
 
-    def nr_distinct_symbols(self):
+    def n_distinct_symbols(self) -> int:
         """
         Return the number of distinct symbols in the partial latin square
         ``self``.
@@ -498,19 +486,21 @@ class LatinSquare:
         EXAMPLES::
 
             sage: from sage.combinat.matrices.latin import *
-            sage: back_circulant(5).nr_distinct_symbols()
+            sage: back_circulant(5).n_distinct_symbols()
             5
             sage: L = LatinSquare(10)
-            sage: L.nr_distinct_symbols()
+            sage: L.n_distinct_symbols()
             0
             sage: L[0, 0] = 0
             sage: L[0, 1] = 1
-            sage: L.nr_distinct_symbols()
+            sage: L.n_distinct_symbols()
             2
         """
         symbols = set(flatten([list(x) for x in list(self.square)]))
         return sum(1 for x in symbols if x >= 0)
 
+    nr_distinct_symbols = n_distinct_symbols
+
     def apply_isotopism(self, row_perm, col_perm, sym_perm):
         """
         An isotopism is a permutation of the rows, columns, and symbols of
@@ -571,8 +561,8 @@ class LatinSquare:
         EXAMPLES::
 
             sage: from sage.combinat.matrices.latin import *
-            sage: (a, b, c, G) = alternating_group_bitrade_generators(1)
-            sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+            sage: a, b, c, G = alternating_group_bitrade_generators(1)
+            sage: T1, T2 = bitrade_from_group(a, b, c, G)
             sage: D = T1.filled_cells_map()
             sage: {i: v for i,v in D.items() if i in ZZ}
             {1: (0, 0),
@@ -642,7 +632,7 @@ class LatinSquare:
 
         return None
 
-    def is_partial_latin_square(self):
+    def is_partial_latin_square(self) -> bool:
         """
         ``self`` is a partial latin square if it is an n by n matrix, and each
         symbol in [0, 1, ..., n-1] appears at most once in each row, and at
@@ -703,7 +693,7 @@ class LatinSquare:
 
         return True
 
-    def is_latin_square(self):
+    def is_latin_square(self) -> bool:
         """
         ``self`` is a latin square if it is an n by n matrix, and each symbol
         in [0, 1, ..., n-1] appears exactly once in each row, and exactly
@@ -729,10 +719,7 @@ class LatinSquare:
             return False
 
         # By necessity self must be a partial latin square:
-        if not self.is_partial_latin_square():
-            return False
-
-        return True
+        return self.is_partial_latin_square()
 
     def permissable_values(self, r, c):
         """
@@ -821,7 +808,7 @@ class LatinSquare:
 
         return [rc[0], rc[1]]
 
-    def is_uniquely_completable(self):
+    def is_uniquely_completable(self) -> bool:
         """
         Return ``True`` if the partial latin square ``self`` has exactly one
         completion to a latin square. This is just a wrapper for the
@@ -846,10 +833,9 @@ class LatinSquare:
             sage: G.is_uniquely_completable()
             False
         """
-
         return self.dlxcpp_has_unique_completion()
 
-    def is_completable(self):
+    def is_completable(self) -> bool:
         """
         Return ``True`` if the partial latin square can be completed to a
         latin square.
@@ -917,7 +903,6 @@ class LatinSquare:
             [ 6 -1  4 -1  2 -1  0 -1]
             [-1 -1 -1 -1 -1 -1 -1 -1]
         """
-
         n = self.nrows()
 
         from copy import copy
@@ -933,7 +918,7 @@ class LatinSquare:
 
         return G
 
-    def dlxcpp_has_unique_completion(self):
+    def dlxcpp_has_unique_completion(self) -> bool:
         """
         Check if the partial latin square ``self`` of order n can be embedded
         in precisely one latin square of order n.
@@ -952,7 +937,7 @@ class LatinSquare:
         """
         return len(dlxcpp_find_completions(self, nr_to_find=2)) == 1
 
-    def vals_in_row(self, r):
+    def vals_in_row(self, r) -> dict:
         """
         Return a dictionary with key e if and only if row r of ``self`` has
         the symbol e.
@@ -965,7 +950,6 @@ class LatinSquare:
             sage: back_circulant(3).vals_in_row(0)
             {0: True, 1: True, 2: True}
         """
-
         n = self.ncols()
         vals_in_row = {}
 
@@ -976,7 +960,7 @@ class LatinSquare:
 
         return vals_in_row
 
-    def vals_in_col(self, c):
+    def vals_in_col(self, c) -> dict:
         """
         Return a dictionary with key e if and only if column c of ``self`` has
         the symbol e.
@@ -999,7 +983,7 @@ class LatinSquare:
 
         return vals_in_col
 
-    def latex(self):
+    def latex(self) -> str:
         r"""
         Return LaTeX code for the latin square.
 
@@ -1167,7 +1151,6 @@ class LatinSquare:
               (15, 27, 43): (2, 3, 3),
               (15, 31, 47): (3, 3, 3)})
         """
-
         assert self.nrows() == self.ncols()
 
         n = self.nrows()
@@ -1258,10 +1241,10 @@ class LatinSquare:
 
         dlx_rows, cmap = self.disjoint_mate_dlxcpp_rows_and_map(allow_subtrade)
 
-        nr_found = 0
+        n_found = 0
 
         for x in DLXCPP(dlx_rows):
-            nr_found += 1
+            n_found += 1
 
             from copy import deepcopy
             Q = deepcopy(self)
@@ -1269,15 +1252,15 @@ class LatinSquare:
             for y in x:
                 if len(dlx_rows[y]) == 1:
                     continue  # dummy row
-                (r, c, e) = cmap[tuple(dlx_rows[y])]
+                r, c, e = cmap[tuple(dlx_rows[y])]
                 Q[r, c] = e
 
             yield Q
 
-            if nr_to_find is not None and nr_found >= nr_to_find:
+            if nr_to_find is not None and n_found >= nr_to_find:
                 return
 
-    def contained_in(self, Q):
+    def contained_in(self, Q) -> bool:
         r"""
         Return ``True`` if ``self`` is a subset of `Q`.
 
@@ -1318,17 +1301,17 @@ def genus(T1, T2):
     EXAMPLES::
 
         sage: from sage.combinat.matrices.latin import *
-        sage: (a, b, c, G) = alternating_group_bitrade_generators(1)
-        sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+        sage: a, b, c, G = alternating_group_bitrade_generators(1)
+        sage: T1, T2 = bitrade_from_group(a, b, c, G)
         sage: genus(T1, T2)
         1
-        sage: (a, b, c, G) = pq_group_bitrade_generators(3, 7)
-        sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+        sage: a, b, c, G = pq_group_bitrade_generators(3, 7)
+        sage: T1, T2 = bitrade_from_group(a, b, c, G)
         sage: genus(T1, T2)
         3
     """
     cells_map, t1, t2, t3 = tau123(T1, T2)
-    return (len(t1.to_cycles()) + len(t2.to_cycles()) + len(t3.to_cycles()) - T1.nr_filled_cells() - 2) // (-2)
+    return (len(t1.to_cycles()) + len(t2.to_cycles()) + len(t3.to_cycles()) - T1.n_filled_cells() - 2) // (-2)
 
 
 def tau123(T1, T2):
@@ -1348,8 +1331,8 @@ def tau123(T1, T2):
     EXAMPLES::
 
         sage: from sage.combinat.matrices.latin import *
-        sage: (a, b, c, G) = pq_group_bitrade_generators(3, 7)
-        sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+        sage: a, b, c, G = pq_group_bitrade_generators(3, 7)
+        sage: T1, T2 = bitrade_from_group(a, b, c, G)
         sage: T1
         [ 0  1  3 -1 -1 -1 -1]
         [ 1  2  4 -1 -1 -1 -1]
@@ -1366,7 +1349,7 @@ def tau123(T1, T2):
         [ 5  0  4 -1 -1 -1 -1]
         [ 6  1  5 -1 -1 -1 -1]
         [ 0  2  6 -1 -1 -1 -1]
-        sage: (cells_map, t1, t2, t3) = tau123(T1, T2)
+        sage: cells_map, t1, t2, t3 = tau123(T1, T2)
         sage: D = cells_map
         sage: {i: v for i,v in D.items() if i in ZZ}
         {1: (0, 0),
@@ -1438,7 +1421,7 @@ def tau123(T1, T2):
 
     The product t1\*t2\*t3 is the identity, i.e. it fixes every point::
 
-        sage: len((t1*t2*t3).fixed_points()) == T1.nr_filled_cells()
+        sage: len((t1*t2*t3).fixed_points()) == T1.n_filled_cells()
         True
     """
     assert is_bitrade(T1, T2)
@@ -1559,8 +1542,8 @@ def cells_map_as_square(cells_map, n):
     EXAMPLES::
 
         sage: from sage.combinat.matrices.latin import *
-        sage: (a, b, c, G) = alternating_group_bitrade_generators(1)
-        sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+        sage: a, b, c, G = alternating_group_bitrade_generators(1)
+        sage: T1, T2 = bitrade_from_group(a, b, c, G)
         sage: T1
         [ 0 -1  3  1]
         [-1  1  0  2]
@@ -1732,7 +1715,7 @@ def tau1(T1, T2, cells_map):
         sage: T2 = T1.apply_isotopism(x, y, z)
         sage: is_bitrade(T1, T2)
         True
-        sage: (cells_map, t1, t2, t3) = tau123(T1, T2)
+        sage: cells_map, t1, t2, t3 = tau123(T1, T2)
         sage: t1 = tau1(T1, T2, cells_map)
         sage: t1
         [2, 3, 4, 5, 1, 7, 8, 9, 10, 6, 12, 13, 14, 15, 11, 17, 18, 19, 20, 16, 22, 23, 24, 25, 21]
@@ -1752,8 +1735,8 @@ def tau1(T1, T2, cells_map):
             if e < 0:
                 continue
 
-            (r2, c2, e2) = beta2((r, c, e), T1, T2)
-            (r3, c3, e3) = beta3((r2, c2, e2), T2, T1)
+            r2, c2, e2 = beta2((r, c, e), T1, T2)
+            r3, c3, e3 = beta3((r2, c2, e2), T2, T1)
 
             x[cells_map[(r, c)]] = cells_map[(r3, c3)]
 
@@ -1786,7 +1769,7 @@ def tau2(T1, T2, cells_map):
         sage: T2 = T1.apply_isotopism(x, y, z)
         sage: is_bitrade(T1, T2)
         True
-        sage: (cells_map, t1, t2, t3) = tau123(T1, T2)
+        sage: cells_map, t1, t2, t3 = tau123(T1, T2)
         sage: t2 = tau2(T1, T2, cells_map)
         sage: t2
         [21, 22, 23, 24, 25, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
@@ -1806,8 +1789,8 @@ def tau2(T1, T2, cells_map):
             if e < 0:
                 continue
 
-            (r2, c2, e2) = beta3((r, c, e), T1, T2)
-            (r3, c3, e3) = beta1((r2, c2, e2), T2, T1)
+            r2, c2, e2 = beta3((r, c, e), T1, T2)
+            r3, c3, e3 = beta1((r2, c2, e2), T2, T1)
 
             x[cells_map[(r, c)]] = cells_map[(r3, c3)]
 
@@ -1840,7 +1823,7 @@ def tau3(T1, T2, cells_map):
         sage: T2 = T1.apply_isotopism(x, y, z)
         sage: is_bitrade(T1, T2)
         True
-        sage: (cells_map, t1, t2, t3) = tau123(T1, T2)
+        sage: cells_map, t1, t2, t3 = tau123(T1, T2)
         sage: t3 = tau3(T1, T2, cells_map)
         sage: t3
         [10, 6, 7, 8, 9, 15, 11, 12, 13, 14, 20, 16, 17, 18, 19, 25, 21, 22, 23, 24, 5, 1, 2, 3, 4]
@@ -1860,8 +1843,8 @@ def tau3(T1, T2, cells_map):
             if e < 0:
                 continue
 
-            (r2, c2, e2) = beta1((r, c, e), T1, T2)
-            (r3, c3, e3) = beta2((r2, c2, e2), T2, T1)
+            r2, c2, e2 = beta1((r, c, e), T1, T2)
+            r3, c3, e3 = beta2((r2, c2, e2), T2, T1)
 
             x[cells_map[(r, c)]] = cells_map[(r3, c3)]
 
@@ -2358,7 +2341,7 @@ def alternating_group_bitrade_generators(m):
 
     ::
 
-        sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+        sage: T1, T2 = bitrade_from_group(a, b, c, G)
         sage: T1
         [ 0 -1  3  1]
         [-1  1  0  2]
@@ -2531,7 +2514,7 @@ def is_primary_bitrade(a, b, c, G):
     EXAMPLES::
 
         sage: from sage.combinat.matrices.latin import *
-        sage: (a, b, c, G) = p3_group_bitrade_generators(5)
+        sage: a, b, c, G = p3_group_bitrade_generators(5)
         sage: is_primary_bitrade(a, b, c, G)
         True
     """
@@ -2596,11 +2579,11 @@ def tau_to_bitrade(t1, t2, t3):
     for r in range(len(c1)):
         for c in range(len(c2)):
             for s in range(len(c3)):
-                nr_common = len(reduce(set.intersection,
+                n_common = len(reduce(set.intersection,
                                        [set(c1[r]), set(c2[c]), set(c3[s])]))
-                assert nr_common in [0, 1]
+                assert n_common in [0, 1]
 
-                if nr_common == 1:
+                if n_common == 1:
                     T1[r, c] = s
 
     for cycle in c1:
@@ -2629,7 +2612,7 @@ def bitrade_from_group(a, b, c, G):
 
         sage: from sage.combinat.matrices.latin import *
         sage: a, b, c, G = alternating_group_bitrade_generators(1)
-        sage: (T1, T2) = bitrade_from_group(a, b, c, G)
+        sage: T1, T2 = bitrade_from_group(a, b, c, G)
         sage: T1
         [ 0 -1  3  1]
         [-1  1  0  2]
@@ -2854,7 +2837,7 @@ def dlxcpp_find_completions(P, nr_to_find=None):
         Q = deepcopy(P)
 
         for x in soln:
-            (r, c, e) = cmap[tuple(dlx_rows[x])]
+            r, c, e = cmap[tuple(dlx_rows[x])]
 
             if Q[r, c] >= 0:
                 assert Q[r, c] == e

sage/combinat/misc.py

@@ -2,7 +2,7 @@
 r"""
 Miscellaneous
 """
-#*****************************************************************************
+# ***************************************************************************
 #       Copyright (C) 2007 Mike Hansen <mhansen@gmail.com>,
 #
 #  Distributed under the terms of the GNU General Public License (GPL)
@@ -14,8 +14,8 @@ Miscellaneous
 #
 #  The full text of the GPL is available at:
 #
-#                  http://www.gnu.org/licenses/
-#*****************************************************************************
+#                  https://www.gnu.org/licenses/
+# ***************************************************************************
 
 from sage.misc.misc_c import prod