diff --git a/Sprint-2/improve_with_caches/fibonacci/fibonacci.py b/Sprint-2/improve_with_caches/fibonacci/fibonacci.py index 60cc6671..83f7a166 100644 --- a/Sprint-2/improve_with_caches/fibonacci/fibonacci.py +++ b/Sprint-2/improve_with_caches/fibonacci/fibonacci.py @@ -1,4 +1,15 @@ +cache = {} + + def fibonacci(n): + if n < 0: + raise ValueError("n must be non-negative number") + if n <= 1: return n - return fibonacci(n - 1) + fibonacci(n - 2) + + if n in cache: + return cache[n] + + cache[n] = fibonacci(n - 1) + fibonacci(n - 2) + return cache[n] 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 255612e5..07a1e778 100644 --- a/Sprint-2/improve_with_caches/making_change/making_change.py +++ b/Sprint-2/improve_with_caches/making_change/making_change.py @@ -7,18 +7,24 @@ 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]) + cache = {} + return ways_to_make_change_helper(total, [200, 100, 50, 20, 10, 5, 2, 1], 0, cache) -def ways_to_make_change_helper(total: int, coins: List[int]) -> int: +def ways_to_make_change_helper( + total: int, coins: List[int], start_index: int, cache: dict[tuple, int] +) -> int: """ Helper function for ways_to_make_change to avoid exposing the coins parameter to callers. """ - if total == 0 or len(coins) == 0: + key = (total, start_index) + if key in cache: + return cache[key] + if total == 0 or start_index >= len(coins) : return 0 ways = 0 - for coin_index in range(len(coins)): + for coin_index in range(start_index, len(coins)): coin = coins[coin_index] count_of_coin = 1 while coin * count_of_coin <= total: @@ -26,7 +32,14 @@ def ways_to_make_change_helper(total: int, coins: List[int]) -> int: if total_from_coins == total: ways += 1 else: - intermediate = ways_to_make_change_helper(total - total_from_coins, coins=coins[coin_index+1:]) + intermediate = ways_to_make_change_helper( + total=total - total_from_coins, + coins=coins, + start_index=coin_index + 1, + cache=cache, + ) ways += intermediate count_of_coin += 1 + + cache[key] = ways return ways