Ticket #8870: trac_8870-ref.patch

File trac_8870-ref.patch, 1.3 KB (added by rlm, 11 years ago)
  • sage/graphs/generic_graph.py

    # HG changeset patch
    # User Robert L. Miller <rlm@rlmiller.org>
    # Date 1277156867 25200
    # Node ID d548af124367976582e37fc348bd9686a325fea4
    # Parent  bae3da0320501fa14ba31df7bd8be57f2c485ef9
    #8870 referee adjustments
    
    diff -r bae3da032050 -r d548af124367 sage/graphs/generic_graph.py
    a b  
    41874187 
    41884188            sage: g = graphs.PetersenGraph()
    41894189            sage: matching = [(u,v) for u,v,_ in g.matching()]               # optional - GLPK, CBC
    4190             sage: h = g.multicommodity_flow(matching)
    4191             sage: len(h)
     4190            sage: h = g.multicommodity_flow(matching)                        # optional - GLPK, CBC
     4191            sage: len(h)                                                     # optional - GLPK, CBC
    41924192            5
    41934193 
    41944194        We could also have considered ``g`` as symmetric and computed
     
    41964196        edges can be used in both directions at the same time::
    41974197 
    41984198            sage: h = DiGraph(g).multicommodity_flow(matching)               # optional - GLPK, CBC
    4199             sage: len(h)
     4199            sage: len(h)                                                     # optional - GLPK, CBC
    42004200            5
    42014201 
    42024202        An exception is raised when the problem has no solution ::