StarMirror/interactive-coding-challenges
1
0
Fork 0
mirror of https://github.com/donnemartin/interactive-coding-challenges.git synced 2024-03-22 13:11:13 +08:00
Code Issues Projects Releases Wiki Activity

Move graph dfs to a class

Browse Source
This commit is contained in:
Donne Martin 2016-09-10 07:41:23 -04:00
parent e1bf3e791a
commit 62f806100e
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
graphs_trees/graph_dfs/dfs_challenge.ipynb
View File

@ -104,7 +104,9 @@
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"def dfs(root, visit_func):\n", "class GraphDfs(Graph):\n",
"\n",
" def dfs(self, root, visit_func):\n",
" # TODO: Implement me\n", " # TODO: Implement me\n",
" pass" " pass"
] ]
@ -153,7 +155,7 @@
"\n", "\n",
" def test_dfs(self):\n", " def test_dfs(self):\n",
" nodes = []\n", " nodes = []\n",
" graph = Graph()\n", " graph = GraphDfs()\n",
" for id in range(0, 6):\n", " for id in range(0, 6):\n",
" nodes.append(graph.add_node(id))\n", " nodes.append(graph.add_node(id))\n",
" graph.add_edge(0, 1, 5)\n", " graph.add_edge(0, 1, 5)\n",
@ -164,7 +166,7 @@
" graph.add_edge(2, 1, 6)\n", " graph.add_edge(2, 1, 6)\n",
" graph.add_edge(3, 2, 7)\n", " graph.add_edge(3, 2, 7)\n",
" graph.add_edge(3, 4, 8)\n", " graph.add_edge(3, 4, 8)\n",
" dfs(nodes[0], self.results.add_result)\n", " graph.dfs(nodes[0], self.results.add_result)\n",
" assert_equal(str(self.results), \"[0, 1, 3, 2, 4, 5]\")\n", " assert_equal(str(self.results), \"[0, 1, 3, 2, 4, 5]\")\n",
"\n", "\n",
" print('Success: test_dfs')\n", " print('Success: test_dfs')\n",

12
graphs_trees/graph_dfs/dfs_solution.ipynb
View File

@ -110,14 +110,16 @@
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"def dfs(root, visit_func):\n", "class GraphDfs(Graph):\n",
"\n",
" def dfs(self, root, visit_func):\n",
" if root is None:\n", " if root is None:\n",
" return\n", " return\n",
" visit_func(root)\n", " visit_func(root)\n",
" root.visit_state = State.visited\n", " root.visit_state = State.visited\n",
" for node in root.adjacent:\n", " for node in root.adj_nodes.values():\n",
" if node.visit_state == State.unvisited:\n", " if node.visit_state == State.unvisited:\n",
" dfs(node, visit_func)" " self.dfs(node, visit_func)"
] ]
}, },
{ {
@ -165,7 +167,7 @@
"\n", "\n",
" def test_dfs(self):\n", " def test_dfs(self):\n",
" nodes = []\n", " nodes = []\n",
" graph = Graph()\n", " graph = GraphDfs()\n",
" for id in range(0, 6):\n", " for id in range(0, 6):\n",
" nodes.append(graph.add_node(id))\n", " nodes.append(graph.add_node(id))\n",
" graph.add_edge(0, 1, 5)\n", " graph.add_edge(0, 1, 5)\n",
@ -176,7 +178,7 @@
" graph.add_edge(2, 1, 6)\n", " graph.add_edge(2, 1, 6)\n",
" graph.add_edge(3, 2, 7)\n", " graph.add_edge(3, 2, 7)\n",
" graph.add_edge(3, 4, 8)\n", " graph.add_edge(3, 4, 8)\n",
" dfs(nodes[0], self.results.add_result)\n", " graph.dfs(nodes[0], self.results.add_result)\n",
" assert_equal(str(self.results), \"[0, 1, 3, 2, 4, 5]\")\n", " assert_equal(str(self.results), \"[0, 1, 3, 2, 4, 5]\")\n",
"\n", "\n",
" print('Success: test_dfs')\n", " print('Success: test_dfs')\n",

4
graphs_trees/graph_dfs/test_dfs.py
View File

@ -8,7 +8,7 @@ class TestDfs(object):
def test_dfs(self): def test_dfs(self):
nodes = [] nodes = []
graph = Graph() graph = GraphDfs()
for id in range(0, 6): for id in range(0, 6):
nodes.append(graph.add_node(id)) nodes.append(graph.add_node(id))
graph.add_edge(0, 1, 5) graph.add_edge(0, 1, 5)
@ -19,7 +19,7 @@ class TestDfs(object):
graph.add_edge(2, 1, 6) graph.add_edge(2, 1, 6)
graph.add_edge(3, 2, 7) graph.add_edge(3, 2, 7)
graph.add_edge(3, 4, 8) graph.add_edge(3, 4, 8)
dfs(nodes[0], self.results.add_result) graph.dfs(nodes[0], self.results.add_result)
assert_equal(str(self.results), "[0, 1, 3, 2, 4, 5]") assert_equal(str(self.results), "[0, 1, 3, 2, 4, 5]")
print('Success: test_dfs') print('Success: test_dfs')