#7527: include graph_coloring in the reference manual.
-----------------------------+----------------------------------------------
Reporter: ncohen | Owner: rlm
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-4.3
Component: documentation | Keywords:
Work_issues: | Author: Nathann Cohen
Upstream: N/A | Reviewer: Minh Van Nguyen
Merged: |
-----------------------------+----------------------------------------------
Changes (by newvalueoldvalue):
* reviewer: => Minh Van Nguyen
* author: => Nathann Cohen
Comment:
The patch `trac_7527.patch` doesn't apply cleanly on top of Sage
4.3.alpha1:
{{{
[mv...@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-
attachment/ticket/7527/trac_7527.patch
adding trac_7527.patch to series file
[mv...@sage sage-main]$ hg qpush
applying trac_7527.patch
patching file sage/graphs/graph_coloring.py
Hunk #3 FAILED at 143
Hunk #4 succeeded at 175 with fuzz 1 (offset 14 lines).
Hunk #7 succeeded at 651 with fuzz 1 (offset 416 lines).
1 out of 7 hunks FAILED -- saving rejects to file
sage/graphs/graph_coloring.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh trac_7527.patch
}}}
The rejected hunk is
{{{
[mv...@sage ~]$ cat graph_coloring.py.rej
--- graph_coloring.py
+++ graph_coloring.py
@@ -142,11 +144,12 @@
raise RuntimeError, "Too much recursion! Graph coloring failed."
def first_coloring(G,n=0):
- """
- Given a graph, and optionally a natural number n, returns
- the first coloring we find with at least n colors.
+ r"""
+ Given a graph, and optionally a natural number `n`, returns
+ the first coloring we find with at least `n` colors.
- EXAMPLES:
+ EXAMPLES::
+
sage: from sage.graphs.graph_coloring import first_coloring
sage: G = Graph({0:[1,2,3],1:[2]})
sage: first_coloring(G,3)
}}}
which fails to apply because #6679 already takes care of that hunk. I have
rebased ncohen's patch using Sage 4.3.alpha1; see
`trac_7527-rebased.patch` which doesn't include the rejected hunk. I'm OK
with ncohen's original patch, so only the rebased patch and my patch
`trac_7527-reviewer.patch` needs reviewing. Patches should be applied in
this order:
1. `trac_7527-rebased.patch`
1. `trac_7527-reviewer.patch`
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/7527#comment:3>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
