Skip to content

Hacktoberfest 2020 - Add typehints and default input for project_euler/problem_25 #2901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions project_euler/problem_25/sol1.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,24 @@
"""


def fibonacci(n):
def fibonacci(n: int) -> int:
"""
Computes the Fibonacci number for input n by iterating through n numbers
and creating an array of ints using the Fibonacci formula.
Returns the nth element of the array.

>>> fibonacci(2)
1
>>> fibonacci(3)
2
>>> fibonacci(5)
5
>>> fibonacci(10)
55
>>> fibonacci(12)
144

"""
if n == 1 or type(n) is not int:
return 0
elif n == 2:
Expand All @@ -38,7 +55,21 @@ def fibonacci(n):
return sequence[n]


def fibonacci_digits_index(n):
def fibonacci_digits_index(n: int) -> int:
"""
Computes incrementing Fibonacci numbers starting from 3 until the length
of the resulting Fibonacci result is the input value n. Returns the term
of the Fibonacci sequence where this occurs.

>>> fibonacci_digits_index(1000)
4782
>>> fibonacci_digits_index(100)
476
>>> fibonacci_digits_index(50)
237
>>> fibonacci_digits_index(3)
12
"""
digits = 0
index = 2

Expand All @@ -49,8 +80,9 @@ def fibonacci_digits_index(n):
return index


def solution(n):
"""Returns the index of the first term in the Fibonacci sequence to contain
def solution(n: int = 1000) -> int:
"""
Returns the index of the first term in the Fibonacci sequence to contain
n digits.

>>> solution(1000)
Expand Down
19 changes: 17 additions & 2 deletions project_euler/problem_25/sol2.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,29 @@
"""


def fibonacci_generator():
def fibonacci_generator() -> int:
"""
A generator that produces numbers in the Fibonacci sequence

>>> generator = fibonacci_generator()
>>> next(generator)
1
>>> next(generator)
2
>>> next(generator)
3
>>> next(generator)
5
>>> next(generator)
8
"""
a, b = 0, 1
while True:
a, b = b, a + b
yield b


def solution(n):
def solution(n: int = 1000) -> int:
"""Returns the index of the first term in the Fibonacci sequence to contain
n digits.

Expand Down
2 changes: 1 addition & 1 deletion project_euler/problem_25/sol3.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"""


def solution(n):
def solution(n: int = 1000) -> int:
"""Returns the index of the first term in the Fibonacci sequence to contain
n digits.
Expand Down