mirror of
https://github.com/donnemartin/interactive-coding-challenges
synced 2026-01-03 16:08:02 +00:00
Move graph bfs to a class
This commit is contained in:
@@ -103,9 +103,11 @@
|
||||
},
|
||||
"outputs": [],
|
||||
"source": [
|
||||
"def bfs(root, visit_func):\n",
|
||||
" # TODO: Implement me\n",
|
||||
" pass"
|
||||
"class GraphBfs(Graph):\n",
|
||||
"\n",
|
||||
" def bfs(self, root, visit_func):\n",
|
||||
" # TODO: Implement me\n",
|
||||
" pass"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -152,7 +154,7 @@
|
||||
"\n",
|
||||
" def test_bfs(self):\n",
|
||||
" nodes = []\n",
|
||||
" graph = Graph()\n",
|
||||
" graph = GraphBfs()\n",
|
||||
" for id in range(0, 6):\n",
|
||||
" nodes.append(graph.add_node(id))\n",
|
||||
" graph.add_edge(0, 1, 5)\n",
|
||||
@@ -163,7 +165,7 @@
|
||||
" graph.add_edge(2, 1, 6)\n",
|
||||
" graph.add_edge(3, 2, 7)\n",
|
||||
" graph.add_edge(3, 4, 8)\n",
|
||||
" bfs(nodes[0], self.results.add_result)\n",
|
||||
" graph.bfs(nodes[0], self.results.add_result)\n",
|
||||
" assert_equal(str(self.results), \"[0, 1, 4, 5, 3, 2]\")\n",
|
||||
"\n",
|
||||
" print('Success: test_bfs')\n",
|
||||
|
||||
@@ -115,19 +115,21 @@
|
||||
"from collections import deque\n",
|
||||
"\n",
|
||||
"\n",
|
||||
"def bfs(root, visit_func):\n",
|
||||
" if root is None:\n",
|
||||
" return\n",
|
||||
" queue = deque()\n",
|
||||
" queue.append(root)\n",
|
||||
" root.visit_state = State.visited\n",
|
||||
" while queue:\n",
|
||||
" node = queue.popleft()\n",
|
||||
" visit_func(node)\n",
|
||||
" for adjacent_node in node.adjacent:\n",
|
||||
" if adjacent_node.visit_state == State.unvisited:\n",
|
||||
" queue.append(adjacent_node)\n",
|
||||
" adjacent_node.visit_state = State.visited"
|
||||
"class GraphBfs(Graph):\n",
|
||||
"\n",
|
||||
" def bfs(self, root, visit_func):\n",
|
||||
" if root is None:\n",
|
||||
" return\n",
|
||||
" queue = deque()\n",
|
||||
" queue.append(root)\n",
|
||||
" root.visit_state = State.visited\n",
|
||||
" while queue:\n",
|
||||
" node = queue.popleft()\n",
|
||||
" visit_func(node)\n",
|
||||
" for adjacent_node in node.adj_nodes.values():\n",
|
||||
" if adjacent_node.visit_state == State.unvisited:\n",
|
||||
" queue.append(adjacent_node)\n",
|
||||
" adjacent_node.visit_state = State.visited"
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -175,7 +177,7 @@
|
||||
"\n",
|
||||
" def test_bfs(self):\n",
|
||||
" nodes = []\n",
|
||||
" graph = Graph()\n",
|
||||
" graph = GraphBfs()\n",
|
||||
" for id in range(0, 6):\n",
|
||||
" nodes.append(graph.add_node(id))\n",
|
||||
" graph.add_edge(0, 1, 5)\n",
|
||||
@@ -186,7 +188,7 @@
|
||||
" graph.add_edge(2, 1, 6)\n",
|
||||
" graph.add_edge(3, 2, 7)\n",
|
||||
" graph.add_edge(3, 4, 8)\n",
|
||||
" bfs(nodes[0], self.results.add_result)\n",
|
||||
" graph.bfs(nodes[0], self.results.add_result)\n",
|
||||
" assert_equal(str(self.results), \"[0, 1, 4, 5, 3, 2]\")\n",
|
||||
"\n",
|
||||
" print('Success: test_bfs')\n",
|
||||
|
||||
@@ -8,7 +8,7 @@ class TestBfs(object):
|
||||
|
||||
def test_bfs(self):
|
||||
nodes = []
|
||||
graph = Graph()
|
||||
graph = GraphBfs()
|
||||
for id in range(0, 6):
|
||||
nodes.append(graph.add_node(id))
|
||||
graph.add_edge(0, 1, 5)
|
||||
@@ -19,7 +19,7 @@ class TestBfs(object):
|
||||
graph.add_edge(2, 1, 6)
|
||||
graph.add_edge(3, 2, 7)
|
||||
graph.add_edge(3, 4, 8)
|
||||
bfs(nodes[0], self.results.add_result)
|
||||
graph.bfs(nodes[0], self.results.add_result)
|
||||
assert_equal(str(self.results), "[0, 1, 4, 5, 3, 2]")
|
||||
|
||||
print('Success: test_bfs')
|
||||
|
||||
Reference in New Issue
Block a user