Skip to content

Commit abf7524

Browse files
donnemartindonnemartin
authored
#273: Remove nose dependency for graphs_trees/ (#277)
1 parent 139e157 commit abf7524

File tree

67 files changed

+863
-1030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+863
-1030
lines changed

‎graphs_trees/bst/bst.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ def _insert(self, node, data):
4040
node.right.parent = node
4141
return node.right
4242
else:
43-
return self._insert(node.right, data)
43+
return self._insert(node.right, data)

‎graphs_trees/bst/bst_challenge.ipynb‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@
8484
{
8585
"cell_type": "code",
8686
"execution_count": null,
87-
"metadata": {
88-
"collapsed": false
89-
},
87+
"metadata": {},
9088
"outputs": [],
9189
"source": [
9290
"class Node(object):\n",
@@ -142,18 +140,17 @@
142140
{
143141
"cell_type": "code",
144142
"execution_count": null,
145-
"metadata": {
146-
"collapsed": false
147-
},
143+
"metadata": {},
148144
"outputs": [],
149145
"source": [
150146
"# %load test_bst.py\n",
151-
"from nose.tools import assert_equal\n",
147+
"import unittest\n",
152148
"\n",
153149
"\n",
154-
"class TestTree(object):\n",
150+
"class TestTree(unittest.TestCase):\n",
155151
"\n",
156-
" def __init__(self):\n",
152+
" def __init__(self, *args, **kwargs):\n",
153+
" super(TestTree, self).__init__()\n",
157154
" self.results = Results()\n",
158155
"\n",
159156
" def test_tree_one(self):\n",
@@ -164,7 +161,7 @@
164161
" bst.insert(1)\n",
165162
" bst.insert(3)\n",
166163
" in_order_traversal(bst.root, self.results.add_result)\n",
167-
" assert_equal(str(self.results), '[1, 2, 3, 5, 8]')\n",
164+
" self.assertEqual(str(self.results), '[1, 2, 3, 5, 8]')\n",
168165
" self.results.clear_results()\n",
169166
"\n",
170167
" def test_tree_two(self):\n",
@@ -175,7 +172,7 @@
175172
" bst.insert(4)\n",
176173
" bst.insert(5)\n",
177174
" in_order_traversal(bst.root, self.results.add_result)\n",
178-
" assert_equal(str(self.results), '[1, 2, 3, 4, 5]')\n",
175+
" self.assertEqual(str(self.results), '[1, 2, 3, 4, 5]')\n",
179176
"\n",
180177
" print('Success: test_tree')\n",
181178
"\n",
@@ -216,9 +213,9 @@
216213
"name": "python",
217214
"nbconvert_exporter": "python",
218215
"pygments_lexer": "ipython3",
219-
"version": "3.5.0"
216+
"version": "3.7.2"
220217
}
221218
},
222219
"nbformat": 4,
223-
"nbformat_minor": 0
220+
"nbformat_minor": 1
224221
}

‎graphs_trees/bst/bst_solution.ipynb‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@
9999
{
100100
"cell_type": "code",
101101
"execution_count": 1,
102-
"metadata": {
103-
"collapsed": false
104-
},
102+
"metadata": {},
105103
"outputs": [
106104
{
107105
"name": "stdout",
@@ -161,9 +159,7 @@
161159
{
162160
"cell_type": "code",
163161
"execution_count": 2,
164-
"metadata": {
165-
"collapsed": false
166-
},
162+
"metadata": {},
167163
"outputs": [],
168164
"source": [
169165
"%run bst.py"
@@ -179,9 +175,7 @@
179175
{
180176
"cell_type": "code",
181177
"execution_count": 3,
182-
"metadata": {
183-
"collapsed": true
184-
},
178+
"metadata": {},
185179
"outputs": [],
186180
"source": [
187181
"%run dfs.py"
@@ -190,9 +184,7 @@
190184
{
191185
"cell_type": "code",
192186
"execution_count": 4,
193-
"metadata": {
194-
"collapsed": false
195-
},
187+
"metadata": {},
196188
"outputs": [],
197189
"source": [
198190
"%run ../utils/results.py"
@@ -201,9 +193,7 @@
201193
{
202194
"cell_type": "code",
203195
"execution_count": 5,
204-
"metadata": {
205-
"collapsed": false
206-
},
196+
"metadata": {},
207197
"outputs": [
208198
{
209199
"name": "stdout",
@@ -215,12 +205,13 @@
215205
],
216206
"source": [
217207
"%%writefile test_bst.py\n",
218-
"from nose.tools import assert_equal\n",
208+
"import unittest\n",
219209
"\n",
220210
"\n",
221-
"class TestTree(object):\n",
211+
"class TestTree(unittest.TestCase):\n",
222212
"\n",
223-
" def __init__(self):\n",
213+
" def __init__(self, *args, **kwargs):\n",
214+
" super(TestTree, self).__init__()\n",
224215
" self.results = Results()\n",
225216
"\n",
226217
" def test_tree_one(self):\n",
@@ -231,7 +222,7 @@
231222
" bst.insert(1)\n",
232223
" bst.insert(3)\n",
233224
" in_order_traversal(bst.root, self.results.add_result)\n",
234-
" assert_equal(str(self.results), '[1, 2, 3, 5, 8]')\n",
225+
" self.assertEqual(str(self.results), '[1, 2, 3, 5, 8]')\n",
235226
" self.results.clear_results()\n",
236227
"\n",
237228
" def test_tree_two(self):\n",
@@ -242,7 +233,7 @@
242233
" bst.insert(4)\n",
243234
" bst.insert(5)\n",
244235
" in_order_traversal(bst.root, self.results.add_result)\n",
245-
" assert_equal(str(self.results), '[1, 2, 3, 4, 5]')\n",
236+
" self.assertEqual(str(self.results), '[1, 2, 3, 4, 5]')\n",
246237
"\n",
247238
" print('Success: test_tree')\n",
248239
"\n",
@@ -260,9 +251,7 @@
260251
{
261252
"cell_type": "code",
262253
"execution_count": 6,
263-
"metadata": {
264-
"collapsed": false
265-
},
254+
"metadata": {},
266255
"outputs": [
267256
{
268257
"name": "stdout",
@@ -293,9 +282,9 @@
293282
"name": "python",
294283
"nbconvert_exporter": "python",
295284
"pygments_lexer": "ipython3",
296-
"version": "3.4.3"
285+
"version": "3.7.2"
297286
}
298287
},
299288
"nbformat": 4,
300-
"nbformat_minor": 0
289+
"nbformat_minor": 1
301290
}

‎graphs_trees/bst/test_bst.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
from nose.tools import assert_equal
1+
import unittest
22

33

4-
class TestTree(object):
4+
class TestTree(unittest.TestCase):
55

6-
def __init__(self):
6+
def __init__(self, *args, **kwargs):
7+
super(TestTree, self).__init__()
78
self.results = Results()
89

910
def test_tree_one(self):
@@ -14,7 +15,7 @@ def test_tree_one(self):
1415
bst.insert(1)
1516
bst.insert(3)
1617
in_order_traversal(bst.root, self.results.add_result)
17-
assert_equal(str(self.results), '[1, 2, 3, 5, 8]')
18+
self.assertEqual(str(self.results), '[1, 2, 3, 5, 8]')
1819
self.results.clear_results()
1920

2021
def test_tree_two(self):
@@ -25,7 +26,7 @@ def test_tree_two(self):
2526
bst.insert(4)
2627
bst.insert(5)
2728
in_order_traversal(bst.root, self.results.add_result)
28-
assert_equal(str(self.results), '[1, 2, 3, 4, 5]')
29+
self.assertEqual(str(self.results), '[1, 2, 3, 4, 5]')
2930

3031
print('Success: test_tree')
3132

@@ -37,4 +38,4 @@ def main():
3738

3839

3940
if __name__ == '__main__':
40-
main()
41+
main()

‎graphs_trees/bst_min/bst_min_challenge.ipynb‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@
8585
{
8686
"cell_type": "code",
8787
"execution_count": null,
88-
"metadata": {
89-
"collapsed": false
90-
},
88+
"metadata": {},
9189
"outputs": [],
9290
"source": [
9391
"class MinBst(object):\n",
@@ -113,13 +111,11 @@
113111
{
114112
"cell_type": "code",
115113
"execution_count": null,
116-
"metadata": {
117-
"collapsed": false
118-
},
114+
"metadata": {},
119115
"outputs": [],
120116
"source": [
121117
"# %load test_bst_min.py\n",
122-
"from nose.tools import assert_equal\n",
118+
"import unittest\n",
123119
"\n",
124120
"\n",
125121
"def height(node):\n",
@@ -129,18 +125,18 @@
129125
" height(node.right))\n",
130126
"\n",
131127
"\n",
132-
"class TestBstMin(object):\n",
128+
"class TestBstMin(unittest.TestCase):\n",
133129
"\n",
134130
" def test_bst_min(self):\n",
135131
" min_bst = MinBst()\n",
136132
" array = [0, 1, 2, 3, 4, 5, 6]\n",
137133
" root = min_bst.create_min_bst(array)\n",
138-
" assert_equal(height(root), 3)\n",
134+
" self.assertEqual(height(root), 3)\n",
139135
"\n",
140136
" min_bst = MinBst()\n",
141137
" array = [0, 1, 2, 3, 4, 5, 6, 7]\n",
142138
" root = min_bst.create_min_bst(array)\n",
143-
" assert_equal(height(root), 4)\n",
139+
" self.assertEqual(height(root), 4)\n",
144140
"\n",
145141
" print('Success: test_bst_min')\n",
146142
"\n",
@@ -180,9 +176,9 @@
180176
"name": "python",
181177
"nbconvert_exporter": "python",
182178
"pygments_lexer": "ipython3",
183-
"version": "3.5.0"
179+
"version": "3.7.2"
184180
}
185181
},
186182
"nbformat": 4,
187-
"nbformat_minor": 0
183+
"nbformat_minor": 1
188184
}

‎graphs_trees/bst_min/bst_min_solution.ipynb‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,16 @@
8383
{
8484
"cell_type": "code",
8585
"execution_count": 1,
86-
"metadata": {
87-
"collapsed": true
88-
},
86+
"metadata": {},
8987
"outputs": [],
9088
"source": [
9189
"%run ../bst/bst.py"
9290
]
9391
},
9492
{
9593
"cell_type": "code",
96-
"execution_count": 1,
97-
"metadata": {
98-
"collapsed": false
99-
},
94+
"execution_count": 2,
95+
"metadata": {},
10096
"outputs": [],
10197
"source": [
10298
"from __future__ import division\n",
@@ -129,9 +125,7 @@
129125
{
130126
"cell_type": "code",
131127
"execution_count": 3,
132-
"metadata": {
133-
"collapsed": false
134-
},
128+
"metadata": {},
135129
"outputs": [
136130
{
137131
"name": "stdout",
@@ -143,7 +137,7 @@
143137
],
144138
"source": [
145139
"%%writefile test_bst_min.py\n",
146-
"from nose.tools import assert_equal\n",
140+
"import unittest\n",
147141
"\n",
148142
"\n",
149143
"def height(node):\n",
@@ -153,18 +147,18 @@
153147
" height(node.right))\n",
154148
"\n",
155149
"\n",
156-
"class TestBstMin(object):\n",
150+
"class TestBstMin(unittest.TestCase):\n",
157151
"\n",
158152
" def test_bst_min(self):\n",
159153
" min_bst = MinBst()\n",
160154
" array = [0, 1, 2, 3, 4, 5, 6]\n",
161155
" root = min_bst.create_min_bst(array)\n",
162-
" assert_equal(height(root), 3)\n",
156+
" self.assertEqual(height(root), 3)\n",
163157
"\n",
164158
" min_bst = MinBst()\n",
165159
" array = [0, 1, 2, 3, 4, 5, 6, 7]\n",
166160
" root = min_bst.create_min_bst(array)\n",
167-
" assert_equal(height(root), 4)\n",
161+
" self.assertEqual(height(root), 4)\n",
168162
"\n",
169163
" print('Success: test_bst_min')\n",
170164
"\n",
@@ -181,9 +175,7 @@
181175
{
182176
"cell_type": "code",
183177
"execution_count": 4,
184-
"metadata": {
185-
"collapsed": false
186-
},
178+
"metadata": {},
187179
"outputs": [
188180
{
189181
"name": "stdout",
@@ -214,9 +206,9 @@
214206
"name": "python",
215207
"nbconvert_exporter": "python",
216208
"pygments_lexer": "ipython3",
217-
"version": "3.5.0"
209+
"version": "3.7.2"
218210
}
219211
},
220212
"nbformat": 4,
221-
"nbformat_minor": 0
213+
"nbformat_minor": 1
222214
}

0 commit comments

Comments
 (0)