passagemath-graphs 10.5.43__cp312-cp312-macosx_14_0_arm64.whl → 10.6.1rc2__cp312-cp312-macosx_14_0_arm64.whl

sage/graphs/generators/families.py

@@ -58,7 +58,7 @@ def JohnsonGraph(n, k):
         True
     """
 
-    g = Graph(name="Johnson graph with parameters "+str(n)+","+str(k))
+    g = Graph(name=f"Johnson graph with parameters {n},{k}")
     from sage.combinat.subset import Set, Subsets
 
     S = Set(range(n))
@@ -114,7 +114,7 @@ def KneserGraph(n, k):
     if k <= 0 or k > n:
         raise ValueError("Parameter k should be a strictly positive integer inferior to n")
 
-    g = Graph(name="Kneser graph with parameters {},{}".format(n, k))
+    g = Graph(name=f"Kneser graph with parameters {n},{k}")
 
     from sage.combinat.subset import Subsets
     S = Subsets(n, k)
@@ -390,7 +390,7 @@ def EgawaGraph(p, s):
     """
     from sage.graphs.generators.basic import CompleteGraph
     from itertools import product, chain, repeat
-    g = Graph(name="Egawa Graph with parameters " + str(p) + "," + str(s), multiedges=False)
+    g = Graph(name=f"Egawa Graph with parameters {p},{s}", multiedges=False)
     X = CompleteGraph(4)
     Y = Graph('O?Wse@UgqqT_LUebWkbT_')
     g.add_vertices(product(*chain(repeat(Y, p), repeat(X, s))))
@@ -478,7 +478,7 @@ def HammingGraph(n, q, X=None):
         X = list(range(q))
     if q != len(X):
         raise ValueError("q must be the cardinality of X")
-    g = Graph(name="Hamming Graph with parameters " + str(n) + "," + str(q), multiedges=False)
+    g = Graph(name=f"Hamming Graph with parameters {n},{q}", multiedges=False)
     g.add_vertices(product(*repeat(X, n)))
     for v in g:
         for i in range(n):
@@ -1162,7 +1162,7 @@ def CirculantGraph(n, adjacency):
     if not isinstance(adjacency, list):
         adjacency = [adjacency]
 
-    G = Graph(n, name="Circulant graph (" + str(adjacency) + ")")
+    G = Graph(n, name=f"Circulant graph ({adjacency})")
     G._circle_embedding(list(range(n)))
 
     for v in G:
@@ -1276,7 +1276,7 @@ def CubeGraph(n, embedding=1):
             p, pn = pn, {}
 
         # construct the graph
-        G = Graph(d, format='dict_of_lists', pos=p, name="%d-Cube" % n)
+        G = Graph(d, format='dict_of_lists', pos=p, name=f"{n}-Cube")
 
     else:
         # construct recursively the adjacency dict
@@ -1297,7 +1297,7 @@ def CubeGraph(n, embedding=1):
             d, dn = dn, {}
 
         # construct the graph
-        G = Graph(d, name="%d-Cube" % n, format='dict_of_lists')
+        G = Graph(d, name=f"{n}-Cube", format='dict_of_lists')
 
         if embedding == 2:
             # Orthogonal projection
@@ -1399,7 +1399,7 @@ def DorogovtsevGoltsevMendesGraph(n):
     """
     import networkx
     return Graph(networkx.dorogovtsev_goltsev_mendes_graph(n),
-                 name="Dorogovtsev-Goltsev-Mendes Graph, %d-th generation" % n)
+                 name=f"Dorogovtsev-Goltsev-Mendes Graph, {n}-th generation")
 
 
 def FoldedCubeGraph(n):
@@ -1638,7 +1638,7 @@ def FibonacciTree(n):
 
     - Harald Schilly and Yann Laigle-Chapuy (2010-03-25)
     """
-    T = Graph(name="Fibonacci-Tree-%d" % n)
+    T = Graph(name=f"Fibonacci-Tree-{n}")
     if n == 1:
         T.add_vertex(0)
     if n < 2:
@@ -1712,6 +1712,13 @@ def GeneralizedPetersenGraph(n, k):
         sage: g.is_bipartite()
         True
 
+    TESTS:
+
+    Check that the name of the graph is correct::
+
+        sage: graphs.GeneralizedPetersenGraph(7, 2).name()
+        'Generalized Petersen graph (n=7,k=2)'
+
     AUTHORS:
 
     - Anders Jonsson (2009-10-15)
@@ -1720,7 +1727,7 @@ def GeneralizedPetersenGraph(n, k):
         raise ValueError("n must be larger than 2")
     if k < 1 or k > (n - 1) // 2:
         raise ValueError("k must be in 1<= k <=floor((n-1)/2)")
-    G = Graph(2 * n, name="Generalized Petersen graph (n='+str(n)+',k="+str(k)+")")
+    G = Graph(2 * n, name=f"Generalized Petersen graph (n={n},k={k})")
     for i in range(n):
         G.add_edge(i, (i+1) % n)
         G.add_edge(i, i+n)
@@ -1805,7 +1812,7 @@ def IGraph(n, j, k):
     if k < 1 or k > (n - 1) // 2:
         raise ValueError("k must be in 1 <= k <= floor((n - 1) / 2)")
 
-    G = Graph(2 * n, name="I-graph (n={}, j={}, k={})".format(n, j, k))
+    G = Graph(2 * n, name=f"I-graph (n={n}, j={j}, k={k})")
     for i in range(n):
         G.add_edge(i, (i + j) % n)
         G.add_edge(i, i + n)
@@ -1833,7 +1840,7 @@ def DoubleGeneralizedPetersenGraph(n, k):
 
     PLOTTING: Upon construction, the position dictionary is filled to override
     the spring-layout algorithm. By convention, the double generalized Petersen
-    graphs are displayed as 4 cocentric cycles, with the first n nodes drawn on
+    graphs are displayed as 4 concentric cycles, with the first n nodes drawn on
     the outer circle.  The first (0) node is drawn at the top of the
     outer-circle, moving counterclockwise after that. The second circle is drawn
     with the (n)th node at the top, then counterclockwise as well. The tird
@@ -1871,7 +1878,7 @@ def DoubleGeneralizedPetersenGraph(n, k):
     if k < 1 or k > (n - 1) // 2:
         raise ValueError("k must be in 1 <= k <= floor((n - 1) / 2)")
 
-    G = Graph(4 * n, name="Double generalized Petersen graph (n={}, k={})".format(n, k))
+    G = Graph(4 * n, name=f"Double generalized Petersen graph (n={n}, k={k})")
     for i in range(n):
         G.add_edge(i, (i + 1) % n)
         G.add_edge(i + 3 * n, (i + 1) % n + 3 * n)
@@ -1890,7 +1897,7 @@ def RoseWindowGraph(n, a, r):
     r"""
     Return a rose window graph with `2n` nodes.
 
-    The rose window graphs is a family of tetravalant graphs introduced in
+    The rose window graphs is a family of tetravalent graphs introduced in
     [Wilson2008]_. The parameters `n`, `a` and `r` are integers such that
     `n > 2`, `1 \leq a, r < n`, and `r \neq n / 2`.
 
@@ -1964,7 +1971,7 @@ def RoseWindowGraph(n, a, r):
     if r == n / 2:
         raise ValueError("r must be different than n / 2")
 
-    G = Graph(2 * n, name="rose window graph (n={}, a={}, r={})".format(n, a, r))
+    G = Graph(2 * n, name=f"Rose window graph (n={n}, a={a}, r={r})")
     for i in range(n):
         G.add_edge(i, (i + 1) % n)
         G.add_edge(i, i + n)
@@ -2072,7 +2079,7 @@ def TabacjnGraph(n, a, b, r):
     if r == n/2:
         raise ValueError("r must be different than n / 2")
 
-    G = Graph(2 * n, name="Tabačjn graph (n={}, a={}, b={}, r={})".format(n, a, b, r))
+    G = Graph(2 * n, name=f"Tabačjn graph (n={n}, a={a}, b={b}, r={r})")
     for i in range(n):
         G.add_edge(i, (i + 1) % n)
         G.add_edge(i, i + n)
@@ -2211,7 +2218,7 @@ def HyperStarGraph(n, k):
                 c[i] = one
             adj[u] = L
 
-    return Graph(adj, format='dict_of_lists', name="HS(%d,%d)" % (n, k))
+    return Graph(adj, format='dict_of_lists', name=f"HS({n},{k})")
 
 
 def LCFGraph(n, shift_list, repeats):
@@ -2451,7 +2458,7 @@ def NKStarGraph(n, k):
                 tmp_dict[vert] = None
             v[0] = tmp_bit
         d["".join(v)] = tmp_dict
-    return Graph(d, name="(%d,%d)-star" % (n, k))
+    return Graph(d, name=f"({n},{k})-star")
 
 
 def NStarGraph(n):
@@ -2499,7 +2506,7 @@ def NStarGraph(n):
                 # swap back
                 v[0], v[i] = v[i], v[0]
         d["".join(v)] = tmp_dict
-    return Graph(d, name="%d-star" % n)
+    return Graph(d, name=f"{n}-star")
 
 
 def OddGraph(n):
@@ -2580,7 +2587,7 @@ def PaleyGraph(q):
     if not mod(q, 4) == 1:
         raise ValueError("parameter q must be congruent to 1 mod 4")
     g = Graph([FiniteField(q, 'a'), lambda i, j: (i - j).is_square()],
-              loops=False, name="Paley graph with parameter {}".format(q))
+              loops=False, name=f"Paley graph with parameter {q}")
     return g
 
 
@@ -3136,7 +3143,7 @@ def petersen_family(generate=False):
     # for as long as we generate new graphs.
     P = PetersenGraph()
 
-    l = set([])
+    l = set()
     l_new = [P.canonical_label().graph6_string()]
 
     while l_new:
@@ -3236,7 +3243,7 @@ def SierpinskiGasketGraph(n):
     dg.add_edges([(tuple(b), tuple(c)) for a, b, c in tri_list])
     dg.add_edges([(tuple(c), tuple(a)) for a, b, c in tri_list])
     dg.set_pos({(x, y): (x + y / 2, y * 3 / 4)
-                for (x, y) in dg})
+                for x, y in dg})
     dg.relabel()
     return dg
 
@@ -4265,14 +4272,17 @@ def MuzychukS6Graph(n, d, Phi='fixed', Sigma='fixed', verbose=False):
                 rand = randrange(0, len(temp))
                 Phi[(x, line)] = temp.pop(rand)
     elif Phi == 'fixed':
-        Phi = {(x, line): val for x in range(m) for val, line in enumerate(L_i[x])}
+        Phi = {(x, line): val for x in range(m)
+               for val, line in enumerate(L_i[x])}
     else:
         assert isinstance(Phi, dict), \
                "Phi must be a dictionary or 'random' or 'fixed'"
-        assert set(Phi.keys()) == set([(x, line) for x in range(m) for line in L_i[x]]), \
+        assert set(Phi.keys()) == {(x, line) for x in range(m)
+                                   for line in L_i[x]}, \
                'each Phi_i must have domain L_i'
         for x in range(m):
-            assert m - 2 == len(set([val for (key, val) in Phi.items() if key[0] == x])), \
+            assert m - 2 == len({val for key, val in Phi.items()
+                                 if key[0] == x}), \
                    'each phi_i must be injective'
         for val in Phi.values():
             assert val in range(m - 1), \
@@ -4311,7 +4321,7 @@ def MuzychukS6Graph(n, d, Phi='fixed', Sigma='fixed', verbose=False):
 
     # build V
     edges = []  # how many? *m^2*n^2
-    for (i, j) in L.edges(sort=True, labels=False):
+    for i, j in L.edges(sort=True, labels=False):
         for hyp in phi[(i, (i, j))]:
             for x in hyp:
                 newEdges = [((i, x), (j, y))
@@ -4405,7 +4415,7 @@ def CubeConnectedCycle(d):
     if d < 1:
         raise ValueError('the dimension d must be greater than 0')
 
-    G = Graph(name="Cube-Connected Cycle of dimension {}".format(d))
+    G = Graph(name=f"Cube-Connected Cycle of dimension {d}")
 
     if d == 1:
         G.allow_loops(True)

sage/graphs/generators/random.py

@@ -966,12 +966,12 @@ def RandomProperIntervalGraph(n, seed=None):
         for k in range(2 * np):
             # Choose symbol x_{k+1}
             if random() < ((hx[k] + 2) * (r - hx[k] + 1)) / (2 * (r + 1) * (hx[k] + 1)):
-                # We have choosen symbol [, so we start an interval
+                # We have chosen symbol [, so we start an interval
                 hx.append(hx[k] + 1)
                 intervals[L][0] = k + 1
                 L += 1
             else:
-                # We have choosen symbol ], so we end an interval
+                # We have chosen symbol ], so we end an interval
                 hx.append(hx[k] - 1)
                 intervals[R][1] = k + 1
                 R += 1

sage/graphs/generators/smallgraphs.py

@@ -3338,7 +3338,7 @@ def HoffmanSingletonGraph():
             D.append(p)
         vv = 'q%s' % (int(p[1]) + 1)
         v = [v[-1] for v in H.neighbors(p) if v[:2] == vv]
-        if len(v):
+        if v:
             s = int(v[0])
         l += 1
     map = H.relabel(range(50), return_map=True)
@@ -4023,7 +4023,7 @@ def MurtyGraph():
         3
         sage: g.diameter()
         2
-        sage: g.is_hamiltonian()
+        sage: g.is_hamiltonian()                                                        # needs sage.numerical.mip
         True
         sage: g.show()                          # long time                             # needs sage.plot
 
@@ -5644,7 +5644,7 @@ def IoninKharaghani765Graph():
     # Associate a matrix to every entry of W
     int_to_matrix = {0: matrix.zero(45)}
     for i in range(15):
-        vec = [frozenset([]), L[0, 0], L[1, 0], L[2, 0], L[3, 0]]
+        vec = [frozenset(), L[0, 0], L[1, 0], L[2, 0], L[3, 0]]
         vec = f_pow(pi_vec, i % 3, vec)
         vec = f_pow(sigma2, i % 5, vec)
         int_to_matrix[i + 1] = N(vec)