Ticket #13808: trac_13808-combinations.patch

sage/graphs/hyperbolicity.pyx

@@ -368 +368 @@
     for u,v in G.edge_iterator(labels=None):
         ggnx.add_edge(u,v)
 
-    from sage.combinat.combinat import combinations_iterator
+    from sage.combinat.combination import Combinations
     cdef list elim = []
     cdef set L = set()
 
@@ -383 +383 @@
         # update the list of vertices of degree at most max_degree.
         u = L.pop()
         X = ggnx.neighbors(u)
-        if all(ggnx.has_edge(v,w) for v,w in combinations_iterator(X,2)):
+        if all(ggnx.has_edge(v,w) for v,w in Combinations(X,2).list()):
             elim.append(u)
             ggnx.remove_node(u)
             for v,d in ggnx.degree_iter(X):
@@ -803 +803 @@
     Comparison of results::
 
         sage: from sage.graphs.hyperbolicity import hyperbolicity
-        sage: for i in xrange(10): # long test
+        sage: for i in xrange(10): # long time
         ...       G = graphs.RandomBarabasiAlbert(100,2)
         ...       d1,_,_ = hyperbolicity(G,algorithm='basic')
         ...       d2,_,_ = hyperbolicity(G,algorithm='cuts')