package/gonum
1
0
Fork 0
mirror of https://github.com/gonum/gonum.git synced 2025-10-19 13:35:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

graph: move NewEdge method from encoding.Builder to graph.EdgeAdder

Browse Source 
Also rename graph.EdgeSetter to graph.EdgeAdder.

Fixes #56.
This commit is contained in:
mewmew
2017-08-18 03:51:30 +02:00
parent a1f42c86ac
commit 0ebdd59ba5
8 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
graph/encoding/dot/decode.go
View File

@@ -167,21 +167,23 @@ func (gen *generator) addStmt(dst encoding.Builder, stmt ast.Stmt) {
}
// addEdgeStmt adds the given edge statement to the graph.
func (gen *generator) addEdgeStmt(dst encoding.Builder, e *ast.EdgeStmt) {
fs := gen.addVertex(dst, e.From)
ts := gen.addEdge(dst, e.To)
func (gen *generator) addEdgeStmt(dst encoding.Builder, stmt *ast.EdgeStmt) {
fs := gen.addVertex(dst, stmt.From)
ts := gen.addEdge(dst, stmt.To)
for _, f := range fs {
for _, t := range ts {
edge, ok := dst.NewEdge(f, t).(encoding.AttributeSetter)
edge := dst.NewEdge(f, t)
dst.SetEdge(edge)
e, ok := edge.(encoding.AttributeSetter)
if !ok {
continue
}
for _, attr := range e.Attrs {
for _, attr := range stmt.Attrs {
a := encoding.Attribute{
Key: attr.Key,
Value: attr.Val,
}
if err := edge.SetAttribute(a); err != nil {
if err := e.SetAttribute(a); err != nil {
panic(fmt.Errorf("unable to unmarshal edge DOT attribute (%s=%s)", a.Key, a.Value))
}
}
@@ -216,7 +218,8 @@ func (gen *generator) addEdge(dst encoding.Builder, to *ast.Edge) []graph.Node {
ts := gen.addEdge(dst, to.To)
for _, f := range fs {
for _, t := range ts {
dst.NewEdge(f, t)
edge := dst.NewEdge(f, t)
dst.SetEdge(edge)
}
}
}