diff --git a/Sprint-2/improve_with_caches/fibonacci/fibonacci.py b/Sprint-2/improve_with_caches/fibonacci/fibonacci.py index 60cc667..916b532 100644 --- a/Sprint-2/improve_with_caches/fibonacci/fibonacci.py +++ b/Sprint-2/improve_with_caches/fibonacci/fibonacci.py @@ -1,4 +1,12 @@ +_fib_cache = {} + def fibonacci(n): + if n in _fib_cache: + return _fib_cache[n] + if n <= 1: - return n - return fibonacci(n - 1) + fibonacci(n - 2) + x = n + else: + x = fibonacci(n - 1) + fibonacci(n - 2) + _fib_cache[n] = x + return x \ No newline at end of file diff --git a/Sprint-2/improve_with_caches/making_change/making_change.py b/Sprint-2/improve_with_caches/making_change/making_change.py index 255612e..25e3bf9 100644 --- a/Sprint-2/improve_with_caches/making_change/making_change.py +++ b/Sprint-2/improve_with_caches/making_change/making_change.py @@ -1,5 +1,5 @@ -from typing import List - +# cache dictionary, key is (total, tuple_of_coins) +_change_cache = {} def ways_to_make_change(total: int) -> int: """ @@ -7,26 +7,35 @@ def ways_to_make_change(total: int) -> int: For instance, there are two ways to make a value of 3: with 3x 1 coins, or with 1x 1 coin and 1x 2 coin. """ - return ways_to_make_change_helper(total, [200, 100, 50, 20, 10, 5, 2, 1]) + _change_cache.clear() + coins = (200, 100, 50, 20, 10, 5, 2, 1) + return ways_to_make_change_helper(total, tuple(coins)) -def ways_to_make_change_helper(total: int, coins: List[int]) -> int: +def ways_to_make_change_helper(total: int, coins: tuple) -> int: """ Helper function for ways_to_make_change to avoid exposing the coins parameter to callers. """ - if total == 0 or len(coins) == 0: + if total == 0: + return 1 + if not coins: return 0 + key = (total, coins) + if key in _change_cache: + return _change_cache[key] + + coin = coins[0] + rest = coins[1:] + ways = 0 - for coin_index in range(len(coins)): - coin = coins[coin_index] - count_of_coin = 1 - while coin * count_of_coin <= total: - total_from_coins = coin * count_of_coin - if total_from_coins == total: - ways += 1 - else: - intermediate = ways_to_make_change_helper(total - total_from_coins, coins=coins[coin_index+1:]) - ways += intermediate - count_of_coin += 1 + count_of_coin = 0 + + while coin * count_of_coin <= total: + total_from_coins = coin * count_of_coin + intermediate = ways_to_make_change_helper(total - total_from_coins, rest) + ways += intermediate + count_of_coin += 1 + + _change_cache[key] = ways return ways