pgraph: Remove NewVertex and NewEdge methods and fix examples

Since the pgraph graph can store arbitrary pointers, we don't need a
special method to create the vertices or edges as long as they implement
the String() string method. This cleans up the library and some of the
examples which I let rot previously.
This commit is contained in:
James Shubin
2017-05-31 17:47:36 -04:00
parent 6838dd02c0
commit 0545c4167b
9 changed files with 139 additions and 161 deletions

View File

@@ -63,7 +63,7 @@ func (obj *MyGAPI) Graph() (*pgraph.Graph, error) {
if err != nil {
return nil, err
}
var vertex *pgraph.Vertex
var vertex pgraph.Vertex
for i := uint(0); i < obj.Count; i++ {
n := &resources.NoopRes{
BaseRes: resources.BaseRes{
@@ -71,12 +71,11 @@ func (obj *MyGAPI) Graph() (*pgraph.Graph, error) {
MetaParams: resources.DefaultMetaParams,
},
}
v := pgraph.NewVertex(n)
g.AddVertex(v)
g.AddVertex(n)
if i > 0 {
g.AddEdge(vertex, v, pgraph.NewEdge(fmt.Sprintf("e%d", i)))
g.AddEdge(vertex, n, &resources.Edge{Name: fmt.Sprintf("e%d", i)})
}
vertex = v // save
vertex = n // save
}
//g, err := config.NewGraphFromConfig(obj.data.Hostname, obj.data.World, obj.data.Noop)