#18618: sandpile revisions
-------------------------------------+-------------------------------------
Reporter: dperkinson | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-6.8
Component: graph theory | Resolution:
Keywords: sandpile | Merged in:
Authors: David Perkinson | Reviewers: Qiaoyu Yang, Kaui Yu
Report Upstream: N/A | Work issues:
Branch: | Commit:
u/dperkinson/sandpile_revisions | 1852ccc5e3e28aadf4b1766e9d40577d74286780
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by dimpase):
for some reason I have the following conflict when I try to merge the
changes into Sage 6.8.beta8:
{{{
<<<<<<< HEAD
processed_g = {}
for k in g.keys():
temp = {}
for vertex in g[k]:
temp[vertex] = 1
processed_g[k] = temp
g = processed_g
elif isinstance(g, Graph):
processed_g = {}
for v in g.vertices():
edges = {}
for n in g.neighbors(v):
if (isinstance(g.edge_label(v,n), int)
and g.edge_label(v,n) >= 0):
edges[n] = g.edge_label(v,n)
else:
edges[n] = 1
processed_g[v] = edges
g = processed_g
elif isinstance(g, DiGraph):
processed_g = {}
for v in g.vertices():
edges = {}
for n in g.neighbors_out(v):
if (isinstance(g.edge_label(v,n), int)
and g.edge_label(v,n) >= 0):
edges[n] = g.edge_label(v,n)
else:
edges[n] = 1
processed_g[v] = edges
=======
processed_g = {i:dict(Counter(g[i])) for i in g}
>>>>>>> trac/u/dperkinson/sandpile_revisions
}}}
in `src/sage/sandpiles/sandpile.py`; i.e. you want to replace everything
between `<<<<< HEAD` and `========`
with the stuff after `======`. Is this correct?
(It would be great if you do the rebase yourself, but if you don't know
how, please say so).
--
Ticket URL: <http://trac.sagemath.org/ticket/18618#comment:40>
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 unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
