Ticket #12378: trac_12378.patch

File trac_12378.patch, 2.7 KB (added by ncohen, 8 years ago)
  • sage/graphs/generic_graph.py

    # HG changeset patch
    # User Nathann Cohen <nathann.cohen@gmail.com>
    # Date 1327847295 -3600
    # Node ID 77802171227f88c611530e84f77fd56fddfa1bca
    # Parent  697e6a75573f5b79f3d75b42b80257ef5d43c027
    trac 12378 -- Graph chromatic_number documentation
    
    diff --git a/sage/graphs/generic_graph.py b/sage/graphs/generic_graph.py
    a b  
    43684368            using the Cliquer package.
    43694369
    43704370          - ``"MILP"`` will compute a minimum vertex cover through a mixed
    4371             integer linear program (requires packages GLPK or CBC).
     4371            integer linear program.
    43724372
    43734373        - ``value_only`` -- boolean (default: ``False``). If set to ``True``,
    43744374          only the size of a minimum vertex cover is returned. Otherwise,
  • sage/graphs/graph.py

    diff --git a/sage/graphs/graph.py b/sage/graphs/graph.py
    a b  
    24492449            method is inefficient in terms of speed and it only useful for
    24502450            small graphs.
    24512451
    2452           - If ``algorithm="MILP"``, the chromatic number is computed
    2453             using a mixed integer linear program. This method requires
    2454             you to install an optional Sage package like GLPK or
    2455             COIN-OR's CBC. Of the methods "DLX", "CP", and "MILP", the last
    2456             method is the fastest method of the three.
     2452          - If ``algorithm="MILP"``, the chromatic number is computed using a
     2453            mixed integer linear program. The performance of this implementation
     2454            is affected by whether optional MILP solvers have been installed
     2455            (see the :mod:`MILP module <sage.numerical.mip>`, or Sage's tutorial
     2456            on Linear Programming).
    24572457
    24582458        .. SEEALSO::
    24592459
     
    25062506        - ``algorithm`` -- Select an algorithm from the following supported
    25072507          algorithms:
    25082508
    2509           - If ``algorithm="DLX"`` (default), the chromatic number is computed
    2510             using the dancing link algorithm.
    2511 
    2512           - If ``algorithm="MILP"``, the chromatic number is computed using
    2513             a mixed integer linear program. This algorithm requires you to
    2514             install an optional Sage package like GLPK or COIN-OR's CBC.
     2509          - If ``algorithm="DLX"`` (default), the coloring is computed using the
     2510            dancing link algorithm.
     2511
     2512          - If ``algorithm="MILP"``, the coloring is computed using a mixed
     2513            integer linear program. The performance of this implementation is
     2514            affected by whether optional MILP solvers have been installed (see
     2515            the :mod:`MILP module <sage.numerical.mip>`).
    25152516
    25162517        - ``hex_colors`` -- (default: ``False``) if ``True``, return a
    25172518          dictionary which can easily be used for plotting.