From f01d94e6ee72733f79753e6a2ffbad33f84235b6 Mon Sep 17 00:00:00 2001 From: Jsor Date: Sat, 22 Mar 2014 22:08:28 -0700 Subject: [PATCH] Cleaned up TileGraph --- concrete/tilegraph.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/concrete/tilegraph.go b/concrete/tilegraph.go index 19d5970f..e75a1d41 100644 --- a/concrete/tilegraph.go +++ b/concrete/tilegraph.go @@ -156,7 +156,7 @@ func (graph *TileGraph) CoordsToNode(row, col int) (node gr.Node) { func (graph *TileGraph) Neighbors(node gr.Node) []gr.Node { id := node.ID() - if !NodeExists(node) { + if !graph.NodeExists(node) { return nil } @@ -174,8 +174,7 @@ func (graph *TileGraph) Neighbors(node gr.Node) []gr.Node { } func (graph *TileGraph) EdgeBetween(node, neighbor gr.Node) gr.Edge { - id, succ := node.ID(), successor.ID() - if !graph.NodeExists(node.ID()) || !graph.NodeExist(node.ID()) { + if !graph.NodeExists(node) || !graph.NodeExists(neighbor) { return nil } @@ -204,7 +203,7 @@ func (graph *TileGraph) EdgeList() []gr.Edge { continue } - for _, succ := range graph.successors(Node(id)) { + for _, succ := range graph.Neighbors(Node(id)) { edges = append(edges, Edge{Node(id), succ}) } }