From c1e759f3da7938c404466834860e54cb759a5606 Mon Sep 17 00:00:00 2001 From: Donne Martin Date: Sun, 9 Aug 2015 07:30:37 -0400 Subject: [PATCH] Cleaned up cell execution numbers, minor PEP8 line break tweak. --- .../coin_change_ways_challenge.ipynb | 13 +++----- .../coin_change_ways_solution.ipynb | 30 +++++++------------ .../coin_change_ways/test_coin_change_ways.py | 2 +- 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/recursion_dynamic/coin_change_ways/coin_change_ways_challenge.ipynb b/recursion_dynamic/coin_change_ways/coin_change_ways_challenge.ipynb index a977dd4..5aa28f9 100644 --- a/recursion_dynamic/coin_change_ways/coin_change_ways_challenge.ipynb +++ b/recursion_dynamic/coin_change_ways/coin_change_ways_challenge.ipynb @@ -100,13 +100,7 @@ "metadata": { "collapsed": false }, - "outputs": [ - { - "name":"stdout", - "text":[], - "output_type": "stream" - } - ], + "outputs": [], "source": [ "# %load test_coin_change_ways.py\n", "from nose.tools import assert_equal\n", @@ -117,7 +111,8 @@ " def test_coin_change_ways(self,solution):\n", " assert_equal(solution(0, [1, 2]), 0)\n", " assert_equal(solution(100, [1, 2, 3]), 884)\n", - " assert_equal(solution(1000, range(1, 101)), 15658181104580771094597751280645)\n", + " assert_equal(solution(1000, range(1, 101)), \n", + " 15658181104580771094597751280645)\n", " print('Success: test_coin_change_ways')\n", "\n", "\n", @@ -156,7 +151,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.6" + "version": "2.7.10" } }, "nbformat": 4, diff --git a/recursion_dynamic/coin_change_ways/coin_change_ways_solution.ipynb b/recursion_dynamic/coin_change_ways/coin_change_ways_solution.ipynb index d2d097c..b561198 100644 --- a/recursion_dynamic/coin_change_ways/coin_change_ways_solution.ipynb +++ b/recursion_dynamic/coin_change_ways/coin_change_ways_solution.ipynb @@ -73,12 +73,12 @@ }, "outputs": [], "source": [ - "def change_ways(n, coins):\n", - " arr = [1] + [0] * n\n", - " for coin in coins:\n", - " for i in range(coin, n + 1):\n", - " arr[i] += arr[i - coin]\n", - " return 0 if n == 0 else arr[n]" + "def change_ways(n, coins):\n", + " arr = [1] + [0] * n\n", + " for coin in coins:\n", + " for i in range(coin, n + 1):\n", + " arr[i] += arr[i - coin]\n", + " return 0 if n == 0 else arr[n]" ] }, { @@ -91,7 +91,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -114,7 +114,8 @@ " def test_coin_change_ways(self,solution):\n", " assert_equal(solution(0, [1, 2]), 0)\n", " assert_equal(solution(100, [1, 2, 3]), 884)\n", - " assert_equal(solution(1000, range(1, 101)), 15658181104580771094597751280645)\n", + " assert_equal(solution(1000, range(1, 101)), \n", + " 15658181104580771094597751280645)\n", " print('Success: test_coin_change_ways')\n", "\n", "\n", @@ -129,7 +130,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -145,15 +146,6 @@ "source": [ "%run -i test_coin_change_ways.py" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [] } ], "metadata": { @@ -172,7 +164,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython2", - "version": "2.7.6" + "version": "2.7.10" } }, "nbformat": 4, diff --git a/recursion_dynamic/coin_change_ways/test_coin_change_ways.py b/recursion_dynamic/coin_change_ways/test_coin_change_ways.py index 7c3714f..01e56da 100644 --- a/recursion_dynamic/coin_change_ways/test_coin_change_ways.py +++ b/recursion_dynamic/coin_change_ways/test_coin_change_ways.py @@ -16,4 +16,4 @@ def main(): if __name__ == '__main__': - main() + main() \ No newline at end of file