Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sorting_searching/anagrams/anagrams_challenge.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@
"outputs": [],
"source": [
"# %load test_anagrams.py\n",
"from nose.tools import assert_equal, assert_raises\n",
"import unittest\n",
"\n",
"\n",
"class TestAnagrams(object):\n",
"class TestAnagrams(unittest.TestCase):\n",
"\n",
" def test_group_anagrams(self):\n",
" anagram = Anagram()\n",
" assert_raises(TypeError, anagram.group_anagrams, None)\n",
" self.assertRaises(TypeError, anagram.group_anagrams, None)\n",
" data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']\n",
" expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']\n",
" assert_equal(anagram.group_anagrams(data), expected)\n",
" self.assertEqual(anagram.group_anagrams(data), expected)\n",
"\n",
" print('Success: test_group_anagrams')\n",
"\n",
Expand Down Expand Up @@ -158,7 +158,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.7.2"
}
},
"nbformat": 4,
Expand Down
24 changes: 9 additions & 15 deletions sorting_searching/anagrams/anagrams_solution.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@
{
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [],
"source": [
"from collections import OrderedDict\n",
Expand Down Expand Up @@ -138,9 +136,7 @@
{
"cell_type": "code",
"execution_count": 2,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [
{
"name": "stdout",
Expand All @@ -152,17 +148,17 @@
],
"source": [
"%%writefile test_anagrams.py\n",
"from nose.tools import assert_equal, assert_raises\n",
"import unittest\n",
"\n",
"\n",
"class TestAnagrams(object):\n",
"class TestAnagrams(unittest.TestCase):\n",
"\n",
" def test_group_anagrams(self):\n",
" anagram = Anagram()\n",
" assert_raises(TypeError, anagram.group_anagrams, None)\n",
" self.assertRaises(TypeError, anagram.group_anagrams, None)\n",
" data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']\n",
" expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']\n",
" assert_equal(anagram.group_anagrams(data), expected)\n",
" self.assertEqual(anagram.group_anagrams(data), expected)\n",
"\n",
" print('Success: test_group_anagrams')\n",
"\n",
Expand All @@ -179,9 +175,7 @@
{
"cell_type": "code",
"execution_count": 3,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [
{
"name": "stdout",
Expand Down Expand Up @@ -212,9 +206,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.0"
"version": "3.7.2"
}
},
"nbformat": 4,
"nbformat_minor": 0
"nbformat_minor": 1
}
10 changes: 5 additions & 5 deletions sorting_searching/anagrams/test_anagrams.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from nose.tools import assert_equal, assert_raises
import unittest


class TestAnagrams(object):
class TestAnagrams(unittest.TestCase):

def test_group_anagrams(self):
anagram = Anagram()
assert_raises(TypeError, anagram.group_anagrams, None)
self.assertRaises(TypeError, anagram.group_anagrams, None)
data = ['ram', 'act', 'arm', 'bat', 'cat', 'tab']
expected = ['ram', 'arm', 'act', 'cat', 'bat', 'tab']
assert_equal(anagram.group_anagrams(data), expected)
self.assertEqual(anagram.group_anagrams(data), expected)

print('Success: test_group_anagrams')

Expand All @@ -19,4 +19,4 @@ def main():


if __name__ == '__main__':
main()
main()
24 changes: 10 additions & 14 deletions sorting_searching/insertion_sort/insertion_sort_challenge.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [],
"source": [
"class InsertionSort(object):\n",
Expand All @@ -101,32 +99,30 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [],
"source": [
"# %load test_insertion_sort.py\n",
"from nose.tools import assert_equal, assert_raises\n",
"import unittest\n",
"\n",
"\n",
"class TestInsertionSort(object):\n",
"class TestInsertionSort(unittest.TestCase):\n",
"\n",
" def test_insertion_sort(self):\n",
" insertion_sort = InsertionSort()\n",
"\n",
" print('None input')\n",
" assert_raises(TypeError, insertion_sort.sort, None)\n",
" self.assertRaises(TypeError, insertion_sort.sort, None)\n",
"\n",
" print('Empty input')\n",
" assert_equal(insertion_sort.sort([]), [])\n",
" self.assertEqual(insertion_sort.sort([]), [])\n",
"\n",
" print('One element')\n",
" assert_equal(insertion_sort.sort([5]), [5])\n",
" self.assertEqual(insertion_sort.sort([5]), [5])\n",
"\n",
" print('Two or more elements')\n",
" data = [5, 1, 7, 2, 6, -3, 5, 7, -1]\n",
" assert_equal(insertion_sort.sort(data), sorted(data))\n",
" self.assertEqual(insertion_sort.sort(data), sorted(data))\n",
"\n",
" print('Success: test_insertion_sort')\n",
"\n",
Expand Down Expand Up @@ -166,9 +162,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.0"
"version": "3.7.2"
}
},
"nbformat": 4,
"nbformat_minor": 0
"nbformat_minor": 1
}
28 changes: 11 additions & 17 deletions sorting_searching/insertion_sort/insertion_sort_solution.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@
{
"cell_type": "code",
"execution_count": 1,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [],
"source": [
"class InsertionSort(object):\n",
Expand Down Expand Up @@ -125,9 +123,7 @@
{
"cell_type": "code",
"execution_count": 2,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [
{
"name": "stdout",
Expand All @@ -139,26 +135,26 @@
],
"source": [
"%%writefile test_insertion_sort.py\n",
"from nose.tools import assert_equal, assert_raises\n",
"import unittest\n",
"\n",
"\n",
"class TestInsertionSort(object):\n",
"class TestInsertionSort(unittest.TestCase):\n",
"\n",
" def test_insertion_sort(self):\n",
" insertion_sort = InsertionSort()\n",
"\n",
" print('None input')\n",
" assert_raises(TypeError, insertion_sort.sort, None)\n",
" self.assertRaises(TypeError, insertion_sort.sort, None)\n",
"\n",
" print('Empty input')\n",
" assert_equal(insertion_sort.sort([]), [])\n",
" self.assertEqual(insertion_sort.sort([]), [])\n",
"\n",
" print('One element')\n",
" assert_equal(insertion_sort.sort([5]), [5])\n",
" self.assertEqual(insertion_sort.sort([5]), [5])\n",
"\n",
" print('Two or more elements')\n",
" data = [5, 1, 7, 2, 6, -3, 5, 7, -1]\n",
" assert_equal(insertion_sort.sort(data), sorted(data))\n",
" self.assertEqual(insertion_sort.sort(data), sorted(data))\n",
"\n",
" print('Success: test_insertion_sort')\n",
"\n",
Expand All @@ -175,9 +171,7 @@
{
"cell_type": "code",
"execution_count": 3,
"metadata": {
"collapsed": false
},
"metadata": {},
"outputs": [
{
"name": "stdout",
Expand Down Expand Up @@ -212,9 +206,9 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.5.0"
"version": "3.7.2"
}
},
"nbformat": 4,
"nbformat_minor": 0
"nbformat_minor": 1
}
14 changes: 7 additions & 7 deletions sorting_searching/insertion_sort/test_insertion_sort.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
from nose.tools import assert_equal, assert_raises
import unittest


class TestInsertionSort(object):
class TestInsertionSort(unittest.TestCase):

def test_insertion_sort(self):
insertion_sort = InsertionSort()

print('None input')
assert_raises(TypeError, insertion_sort.sort, None)
self.assertRaises(TypeError, insertion_sort.sort, None)

print('Empty input')
assert_equal(insertion_sort.sort([]), [])
self.assertEqual(insertion_sort.sort([]), [])

print('One element')
assert_equal(insertion_sort.sort([5]), [5])
self.assertEqual(insertion_sort.sort([5]), [5])

print('Two or more elements')
data = [5, 1, 7, 2, 6, -3, 5, 7, -1]
assert_equal(insertion_sort.sort(data), sorted(data))
self.assertEqual(insertion_sort.sort(data), sorted(data))

print('Success: test_insertion_sort')

Expand All @@ -28,4 +28,4 @@ def main():


if __name__ == '__main__':
main()
main()
16 changes: 8 additions & 8 deletions sorting_searching/merge_into/merge_into_challenge.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -111,23 +111,23 @@
"outputs": [],
"source": [
"# %load test_merge_into.py\n",
"from nose.tools import assert_equal, assert_raises\n",
"import unittest\n",
"\n",
"\n",
"class TestArray(object):\n",
"class TestArray(unittest.TestCase):\n",
"\n",
" def test_merge_into(self):\n",
" array = Array()\n",
" assert_raises(TypeError, array.merge_into, None, None, None, None)\n",
" assert_raises(ValueError, array.merge_into, [1], [2], -1, -1)\n",
" self.assertRaises(TypeError, array.merge_into, None, None, None, None)\n",
" self.assertRaises(ValueError, array.merge_into, [1], [2], -1, -1)\n",
" a = [1, 2, 3]\n",
" assert_equal(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
" self.assertEqual(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
" a = [1, 2, 3]\n",
" assert_equal(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
" self.assertEqual(array.merge_into(a, [], len(a), 0), [1, 2, 3])\n",
" a = [1, 3, 5, 7, 9, None, None, None]\n",
" b = [4, 5, 6]\n",
" expected = [1, 3, 4, 5, 5, 6, 7, 9]\n",
" assert_equal(array.merge_into(a, b, 5, len(b)), expected)\n",
" self.assertEqual(array.merge_into(a, b, 5, len(b)), expected)\n",
" print('Success: test_merge_into')\n",
"\n",
"\n",
Expand Down Expand Up @@ -166,7 +166,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.6.4"
"version": "3.7.2"
}
},
"nbformat": 4,
Expand Down
Loading