Fix #13, PEP8-ify notebooks.

This commit is contained in:
Donne Martin
2015-07-11 15:34:52 -04:00
parent 374d67ff30
commit 04083b2011
25 changed files with 210 additions and 173 deletions

View File

@@ -34,7 +34,6 @@
"source": [
"## Constraints\n",
"\n",
"* Do you expect the return to be in reverse order too?\n",
" * Yes\n",
"* What if one of the inputs is None?\n",
@@ -98,7 +97,7 @@
"outputs": [],
"source": [
"class MyLinkedList(LinkedList):\n",
" \n",
"\n",
" def add_reverse(self, first_list, second_list):\n",
" # TODO: Implement me\n",
" pass"
@@ -133,7 +132,7 @@
"\n",
"\n",
"class TestAddReverse(object):\n",
" \n",
"\n",
" def test_add_reverse(self):\n",
" print('Test: Empty list(s)')\n",
" assert_equal(MyLinkedList().add_reverse(None, None), None)\n",
@@ -166,13 +165,15 @@
" second_list.append(7)\n",
" result = MyLinkedList().add_reverse(first_list, second_list)\n",
" assert_equal(result.get_all_data(), [5, 4, 2, 1])\n",
" \n",
"\n",
" print('Success: test_add_reverse')\n",
"\n",
"\n",
"def main():\n",
" test = TestAddReverse()\n",
" test.test_add_reverse()\n",
"\n",
"\n",
"if __name__ == '__main__':\n",
" main()"
]

View File

@@ -33,7 +33,6 @@
"source": [
"## Constraints\n",
"\n",
"* Do you expect the return to be in reverse order too?\n",
" * Yes\n",
"* What if one of the inputs is None?\n",
@@ -117,15 +116,15 @@
"outputs": [],
"source": [
"class MyLinkedList(LinkedList):\n",
" \n",
"\n",
" def __add_reverse__(self, first_node, second_node, carry):\n",
" if type(carry) != int and carry < 0:\n",
" raise ValueError('Invalid int argument: carry')\n",
" \n",
"\n",
" # Base case\n",
" if first_node is None and second_node is None and carry == 0:\n",
" return None\n",
" \n",
"\n",
" # Recursive case\n",
" value = carry\n",
" value += first_node.data if first_node is not None else 0\n",
@@ -133,9 +132,10 @@
" new_carry = 1 if value >= 10 else 0\n",
" remainder = value % 10\n",
" node = Node(remainder)\n",
" node.next = self.__add_reverse__(first_node.next if first_node is not None else None, \n",
" second_node.next if first_node is not None else None, \n",
" new_carry)\n",
" node.next = self.__add_reverse__(\n",
" first_node.next if first_node is not None else None,\n",
" second_node.next if first_node is not None else None,\n",
" new_carry)\n",
" return node\n",
"\n",
" def add_reverse(self, first_list, second_list):\n",
@@ -173,7 +173,7 @@
"\n",
"\n",
"class TestAddReverse(object):\n",
" \n",
"\n",
" def test_add_reverse(self):\n",
" print('Test: Empty list(s)')\n",
" assert_equal(MyLinkedList().add_reverse(None, None), None)\n",
@@ -206,13 +206,15 @@
" second_list.append(7)\n",
" result = MyLinkedList().add_reverse(first_list, second_list)\n",
" assert_equal(result.get_all_data(), [5, 4, 2, 1])\n",
" \n",
"\n",
" print('Success: test_add_reverse')\n",
"\n",
"\n",
"def main():\n",
" test = TestAddReverse()\n",
" test.test_add_reverse()\n",
"\n",
"\n",
"if __name__ == '__main__':\n",
" main()"
]

View File

@@ -2,7 +2,7 @@ from nose.tools import assert_equal
class TestAddReverse(object):
def test_add_reverse(self):
print('Test: Empty list(s)')
assert_equal(MyLinkedList().add_reverse(None, None), None)
@@ -35,12 +35,14 @@ class TestAddReverse(object):
second_list.append(7)
result = MyLinkedList().add_reverse(first_list, second_list)
assert_equal(result.get_all_data(), [5, 4, 2, 1])
print('Success: test_add_reverse')
def main():
test = TestAddReverse()
test.test_add_reverse()
if __name__ == '__main__':
main()