Skip to content

Hacktoberfest 2020: Add default args, typehints, expand variable names, and fix solutions for PE prob 02 #2898

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 4 commits into from
Oct 6, 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
8 changes: 4 additions & 4 deletions project_euler/problem_02/sol1.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"""


def solution(n):
def solution(n: int = 4000000) -> int:
"""Returns the sum of all fibonacci sequence even elements that are lower
or equals to n.

Expand All @@ -28,13 +28,13 @@ def solution(n):
"""
i = 1
j = 2
sum = 0
total = 0
while j <= n:
if j % 2 == 0:
sum += j
total += j
i, j = j, i + j

return sum
return total


if __name__ == "__main__":
Expand Down
18 changes: 9 additions & 9 deletions project_euler/problem_02/sol2.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@
"""


def solution(n):
def solution(n: int = 4000000) -> int:
"""Returns the sum of all fibonacci sequence even elements that are lower
or equals to n.

>>> solution(10)
[2, 8]
10
>>> solution(15)
[2, 8]
10
>>> solution(2)
[2]
2
>>> solution(1)
[]
0
>>> solution(34)
[2, 8, 34]
44
"""
ls = []
even_fibs = []
a, b = 0, 1
while b <= n:
if b % 2 == 0:
ls.append(b)
even_fibs.append(b)
a, b = b, a + b
return ls
return sum(even_fibs)


if __name__ == "__main__":
Expand Down
2 changes: 1 addition & 1 deletion project_euler/problem_02/sol3.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"""


def solution(n):
def solution(n: int = 4000000) -> int:
"""Returns the sum of all fibonacci sequence even elements that are lower
or equals to n.
Expand Down
6 changes: 3 additions & 3 deletions project_euler/problem_02/sol4.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from decimal import Decimal, getcontext


def solution(n):
def solution(n: int = 4000000) -> int:
"""Returns the sum of all fibonacci sequence even elements that are lower
or equals to n.
Expand Down Expand Up @@ -57,8 +57,8 @@ def solution(n):

index = (math.floor(math.log(n * (phi + 2), phi) - 1) // 3) * 3 + 2
num = Decimal(round(phi ** Decimal(index + 1))) / (phi + 2)
sum = num // 2
return int(sum)
total = num // 2
return int(total)


if __name__ == "__main__":
Expand Down
20 changes: 10 additions & 10 deletions project_euler/problem_02/sol5.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"""


def solution(n):
def solution(n: int = 4000000) -> int:
"""Returns the sum of all fibonacci sequence even elements that are lower
or equals to n.

Expand All @@ -27,19 +27,19 @@ def solution(n):
44
"""

a = [0, 1]
fib = [0, 1]
i = 0
while a[i] <= n:
a.append(a[i] + a[i + 1])
if a[i + 2] > n:
while fib[i] <= n:
fib.append(fib[i] + fib[i + 1])
if fib[i + 2] > n:
break
i += 1
sum = 0
for j in range(len(a) - 1):
if a[j] % 2 == 0:
sum += a[j]
total = 0
for j in range(len(fib) - 1):
if fib[j] % 2 == 0:
total += fib[j]

return sum
return total


if __name__ == "__main__":
Expand Down