Merge branch 't/30312' into t/30329

sagemath · Sep 4, 2020 · 49cdcc1 · 49cdcc1
2 parents 2a1861d + 9e69f0d
commit 49cdcc1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/sage/graphs/generators/distance_regular.pyx b/src/sage/graphs/generators/distance_regular.pyx
@@ -334,8 +334,8 @@ def TruncatedWittGraph():
 
     EXAMPLES::
 
-         sage: G = graphs.TruncatedWittGraph()
-         sage: G.is_distance_regular(True)
+         sage: G = graphs.TruncatedWittGraph()  # long time
+         sage: G.is_distance_regular(True)  # long time (due to above)
          ([15, 14, 12, None], [None, 1, 1, 9])
 
     REFERENCES:
@@ -385,8 +385,8 @@ def distance_3_doubly_truncated_Golay_code_graph():
 
     EXAMPLES::
 
-        sage: G = graphs.distance_3_doubly_truncated_Golay_code_graph()
-        sage: G.is_distance_regular(True)
+        sage: G = graphs.distance_3_doubly_truncated_Golay_code_graph()  # long time
+        sage: G.is_distance_regular(True)  # long time (due to above)
         ([9, 8, 6, 3, None], [None, 1, 1, 3, 8])
 
     ALGORITHM:
@@ -492,7 +492,7 @@ def shortened_000_111_extended_binary_Golay_code_graph():
     G.name("Shortened 000 111 extended binary Golay code")
     return G
 
-def LintSchrijverGraph():
+def vanLintSchrijverGraph():
     r"""
     Return the van Lint-Schrijver graph.
 
@@ -501,7 +501,7 @@ def LintSchrijverGraph():
 
     EXAMPLES::
 
-         sage: G = graphs.LintSchrijverGraph()
+         sage: G = graphs.vanLintSchrijverGraph()
          sage: G.is_distance_regular(True)
          ([6, 5, 5, 4, None], [None, 1, 1, 2, 6])
 
@@ -579,13 +579,13 @@ def UstimenkoGraph(const int m, const int q):
 
     TESTS::
 
-        sage: G = graphs.UstimenkoGraph(5, 2)
-        sage: G.order()
+        sage: G = graphs.UstimenkoGraph(5, 2)  # long time
+        sage: G.order()  # long time
         2295
-        sage: G.is_distance_regular(True)
+        sage: G.is_distance_regular(True)  # long time
         ([310, 224, None], [None, 1, 35])
-        sage: G = graphs.UstimenkoGraph(4,3)
-        sage: G.is_distance_regular(True)
+        sage: G = graphs.UstimenkoGraph(4,3)  # long time
+        sage: G.is_distance_regular(True)  # long time
         ([390, 243, None], [None, 1, 130])
     """
     from sage.graphs.graph_generators import graphs
@@ -629,8 +629,8 @@ def BilinearFormsGraph(const int d, const int e, const int q):
         sage: G = graphs.BilinearFormsGraph(3,3,3)  # not tested (20 s)
         sage: G.order()  # not tested (due to above)
         19683
-        sage: G = graphs.BilinearFormsGraph(3, 4, 2)
-        sage: G.is_distance_regular(True)
+        sage: G = graphs.BilinearFormsGraph(3, 4, 2)  # long time
+        sage: G.is_distance_regular(True)  # long time
         ([105, 84, 48, None], [None, 1, 6, 28])
 
     REFERENCES:
@@ -704,8 +704,8 @@ def AlternatingFormsGraph(const int n, const int q):
 
     EXAMPLES::
 
-        sage: G = graphs.AlternatingFormsGraph(5,2)
-        sage: G.is_distance_regular(True)
+        sage: G = graphs.AlternatingFormsGraph(5, 2)  # long time
+        sage: G.is_distance_regular(True)  # long time
         ([155, 112, None], [None, 1, 20])
 
     REFERENCES:

diff --git a/src/sage/graphs/graph_generators.py b/src/sage/graphs/graph_generators.py
@@ -155,7 +155,7 @@ def __append_to_doc(methods):
      "LargeWittGraph",
      "LeonardGraph",
      "LjubljanaGraph",
-     "LintSchrijverGraph",
+     "vanLintSchrijverGraph",
      "LivingstoneGraph",
      "locally_GQ42_distance_transitive_graph",
      "LocalMcLaughlinGraph",
@@ -2002,7 +2002,7 @@ def quadrangulations(self, order, minimum_degree=None, minimum_connectivity=None
     LargeWittGraph           = staticmethod(distance_regular.LargeWittGraph)
     LeonardGraph             = staticmethod(distance_regular.LeonardGraph)
     LjubljanaGraph           = staticmethod(smallgraphs.LjubljanaGraph)
-    LintSchrijverGraph       = staticmethod(distance_regular.LintSchrijverGraph)
+    vanLintSchrijverGraph       = staticmethod(distance_regular.vanLintSchrijverGraph)
     LivingstoneGraph         = staticmethod(smallgraphs.LivingstoneGraph)
     locally_GQ42_distance_transitive_graph = staticmethod(distance_regular.locally_GQ42_distance_transitive_graph)
     LocalMcLaughlinGraph     = staticmethod(smallgraphs.LocalMcLaughlinGraph)