Skip to content

Commit 98e9d6b

Browse files
darkstardarkstar
authored
Fix style of the first ten solutions for Project Euler (TheAlgorithms#3242)
* Fix style of the first ten solutions for Project Euler - Unify the header docstring, and add reference URLs to wikipedia or similar - Fix docstrings to be properly multilined - Add newlines where appropriate - Add doctests where they were missing - Remove doctests that test for the correct solution - fix obvious spelling or grammar mistakes in comments and exception messages - Fix line endings to be UNIX. This makes two of the files seem to have changed completely - no functional changes in any of the solutions were done (except for the spelling fixes mentioned above) * Fix docstrings and main function as per Style Guide
1 parent 5be77f3 commit 98e9d6b

File tree

35 files changed

+716
-468
lines changed

35 files changed

+716
-468
lines changed

‎project_euler/problem_001/sol1.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
"""
2-
Problem Statement:
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
36
If we list all the natural numbers below 10 that are multiples of 3 or 5,
47
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
610
"""
711

812

913
def solution(n: int = 1000) -> int:
10-
"""Returns the sum of all the multiples of 3 or 5 below n.
14+
"""
15+
Returns the sum of all the multiples of 3 or 5 below n.
1116
1217
>>> solution(3)
1318
0
@@ -25,4 +30,4 @@ def solution(n: int = 1000) -> int:
2530

2631

2732
if __name__ == "__main__":
28-
print(solution(int(input().strip())))
33+
print(f"{solution() = }")

‎project_euler/problem_001/sol2.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
"""
2-
Problem Statement:
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
36
If we list all the natural numbers below 10 that are multiples of 3 or 5,
47
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
610
"""
711

812

913
def solution(n: int = 1000) -> int:
10-
"""Returns the sum of all the multiples of 3 or 5 below n.
14+
"""
15+
Returns the sum of all the multiples of 3 or 5 below n.
1116
1217
>>> solution(3)
1318
0
@@ -30,4 +35,4 @@ def solution(n: int = 1000) -> int:
3035

3136

3237
if __name__ == "__main__":
33-
print(solution(int(input().strip())))
38+
print(f"{solution() = }")

‎project_euler/problem_001/sol3.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
"""
2-
Problem Statement:
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
36
If we list all the natural numbers below 10 that are multiples of 3 or 5,
47
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
610
"""
711

812

@@ -57,4 +61,4 @@ def solution(n: int = 1000) -> int:
5761

5862

5963
if __name__ == "__main__":
60-
print(solution(int(input().strip())))
64+
print(f"{solution() = }")

‎project_euler/problem_001/sol4.py

+52-47
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,52 @@
1-
"""
2-
Problem Statement:
3-
If we list all the natural numbers below 10 that are multiples of 3 or 5,
4-
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
6-
"""
7-
8-
9-
def solution(n: int = 1000) -> int:
10-
"""Returns the sum of all the multiples of 3 or 5 below n.
11-
12-
>>> solution(3)
13-
0
14-
>>> solution(4)
15-
3
16-
>>> solution(10)
17-
23
18-
>>> solution(600)
19-
83700
20-
"""
21-
22-
xmulti = []
23-
zmulti = []
24-
z = 3
25-
x = 5
26-
temp = 1
27-
while True:
28-
result = z * temp
29-
if result < n:
30-
zmulti.append(result)
31-
temp += 1
32-
else:
33-
temp = 1
34-
break
35-
while True:
36-
result = x * temp
37-
if result < n:
38-
xmulti.append(result)
39-
temp += 1
40-
else:
41-
break
42-
collection = list(set(xmulti + zmulti))
43-
return sum(collection)
44-
45-
46-
if __name__ == "__main__":
47-
print(solution(int(input().strip())))
1+
"""
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
6+
If we list all the natural numbers below 10 that are multiples of 3 or 5,
7+
we get 3, 5, 6 and 9. The sum of these multiples is 23.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
10+
"""
11+
12+
13+
def solution(n: int = 1000) -> int:
14+
"""
15+
Returns the sum of all the multiples of 3 or 5 below n.
16+
17+
>>> solution(3)
18+
0
19+
>>> solution(4)
20+
3
21+
>>> solution(10)
22+
23
23+
>>> solution(600)
24+
83700
25+
"""
26+
27+
xmulti = []
28+
zmulti = []
29+
z = 3
30+
x = 5
31+
temp = 1
32+
while True:
33+
result = z * temp
34+
if result < n:
35+
zmulti.append(result)
36+
temp += 1
37+
else:
38+
temp = 1
39+
break
40+
while True:
41+
result = x * temp
42+
if result < n:
43+
xmulti.append(result)
44+
temp += 1
45+
else:
46+
break
47+
collection = list(set(xmulti + zmulti))
48+
return sum(collection)
49+
50+
51+
if __name__ == "__main__":
52+
print(f"{solution() = }")

‎project_euler/problem_001/sol5.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
"""
2-
Problem Statement:
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
36
If we list all the natural numbers below 10 that are multiples of 3 or 5,
47
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
610
"""
711

812

913
def solution(n: int = 1000) -> int:
10-
"""Returns the sum of all the multiples of 3 or 5 below n.
11-
A straightforward pythonic solution using list comprehension.
14+
"""
15+
Returns the sum of all the multiples of 3 or 5 below n.
16+
A straightforward pythonic solution using list comprehension.
1217
1318
>>> solution(3)
1419
0
@@ -24,4 +29,4 @@ def solution(n: int = 1000) -> int:
2429

2530

2631
if __name__ == "__main__":
27-
print(solution(int(input().strip())))
32+
print(f"{solution() = }")

‎project_euler/problem_001/sol6.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
"""
2-
Problem Statement:
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
36
If we list all the natural numbers below 10 that are multiples of 3 or 5,
47
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
610
"""
711

812

913
def solution(n: int = 1000) -> int:
10-
"""Returns the sum of all the multiples of 3 or 5 below n.
14+
"""
15+
Returns the sum of all the multiples of 3 or 5 below n.
1116
1217
>>> solution(3)
1318
0
@@ -31,4 +36,4 @@ def solution(n: int = 1000) -> int:
3136

3237

3338
if __name__ == "__main__":
34-
print(solution(int(input().strip())))
39+
print(f"{solution() = }")

‎project_euler/problem_001/sol7.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
"""
2-
Problem Statement:
2+
Project Euler Problem 1: https://projecteuler.net/problem=1
3+
4+
Multiples of 3 and 5
5+
36
If we list all the natural numbers below 10 that are multiples of 3 or 5,
47
we get 3, 5, 6 and 9. The sum of these multiples is 23.
5-
Find the sum of all the multiples of 3 or 5 below N.
8+
9+
Find the sum of all the multiples of 3 or 5 below 1000.
610
"""
711

812

913
def solution(n: int = 1000) -> int:
10-
"""Returns the sum of all the multiples of 3 or 5 below n.
14+
"""
15+
Returns the sum of all the multiples of 3 or 5 below n.
1116
1217
>>> solution(3)
1318
0
@@ -29,4 +34,4 @@ def solution(n: int = 1000) -> int:
2934

3035

3136
if __name__ == "__main__":
32-
print(solution(int(input().strip())))
37+
print(f"{solution() = }")

‎project_euler/problem_002/sol1.py

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
"""
2-
Problem:
3-
Each new term in the Fibonacci sequence is generated by adding the previous two
4-
terms. By starting with 1 and 2, the first 10 terms will be:
2+
Project Euler Problem 2: https://projecteuler.net/problem=2
53
6-
1,2,3,5,8,13,21,34,55,89,..
4+
Even Fibonacci Numbers
5+
6+
Each new term in the Fibonacci sequence is generated by adding the previous
7+
two terms. By starting with 1 and 2, the first 10 terms will be:
8+
9+
1, 2, 3, 5, 8, 13, 21, 34, 55, 89, ...
710
811
By considering the terms in the Fibonacci sequence whose values do not exceed
9-
n, find the sum of the even-valued terms. e.g. for n=10, we have {2,8}, sum is
10-
10.
12+
four million, find the sum of the even-valued terms.
13+
14+
References:
15+
- https://en.wikipedia.org/wiki/Fibonacci_number
1116
"""
1217

1318

1419
def solution(n: int = 4000000) -> int:
15-
"""Returns the sum of all fibonacci sequence even elements that are lower
16-
or equals to n.
20+
"""
21+
Returns the sum of all even fibonacci sequence elements that are lower
22+
or equal to n.
1723
1824
>>> solution(10)
1925
10
@@ -26,6 +32,7 @@ def solution(n: int = 4000000) -> int:
2632
>>> solution(34)
2733
44
2834
"""
35+
2936
i = 1
3037
j = 2
3138
total = 0
@@ -38,4 +45,4 @@ def solution(n: int = 4000000) -> int:
3845

3946

4047
if __name__ == "__main__":
41-
print(solution(int(input().strip())))
48+
print(f"{solution() = }")

‎project_euler/problem_002/sol2.py

+46-39
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,46 @@
1-
"""
2-
Problem:
3-
Each new term in the Fibonacci sequence is generated by adding the previous two
4-
terms. By starting with 1 and 2, the first 10 terms will be:
5-
6-
1,2,3,5,8,13,21,34,55,89,..
7-
8-
By considering the terms in the Fibonacci sequence whose values do not exceed
9-
n, find the sum of the even-valued terms. e.g. for n=10, we have {2,8}, sum is
10-
10.
11-
"""
12-
13-
14-
def solution(n: int = 4000000) -> int:
15-
"""Returns the sum of all fibonacci sequence even elements that are lower
16-
or equals to n.
17-
18-
>>> solution(10)
19-
10
20-
>>> solution(15)
21-
10
22-
>>> solution(2)
23-
2
24-
>>> solution(1)
25-
0
26-
>>> solution(34)
27-
44
28-
"""
29-
even_fibs = []
30-
a, b = 0, 1
31-
while b <= n:
32-
if b % 2 == 0:
33-
even_fibs.append(b)
34-
a, b = b, a + b
35-
return sum(even_fibs)
36-
37-
38-
if __name__ == "__main__":
39-
print(solution(int(input().strip())))
1+
"""
2+
Project Euler Problem 2: https://projecteuler.net/problem=2
3+
4+
Even Fibonacci Numbers
5+
6+
Each new term in the Fibonacci sequence is generated by adding the previous
7+
two terms. By starting with 1 and 2, the first 10 terms will be:
8+
9+
1, 2, 3, 5, 8, 13, 21, 34, 55, 89, ...
10+
11+
By considering the terms in the Fibonacci sequence whose values do not exceed
12+
four million, find the sum of the even-valued terms.
13+
14+
References:
15+
- https://en.wikipedia.org/wiki/Fibonacci_number
16+
"""
17+
18+
19+
def solution(n: int = 4000000) -> int:
20+
"""
21+
Returns the sum of all even fibonacci sequence elements that are lower
22+
or equal to n.
23+
24+
>>> solution(10)
25+
10
26+
>>> solution(15)
27+
10
28+
>>> solution(2)
29+
2
30+
>>> solution(1)
31+
0
32+
>>> solution(34)
33+
44
34+
"""
35+
36+
even_fibs = []
37+
a, b = 0, 1
38+
while b <= n:
39+
if b % 2 == 0:
40+
even_fibs.append(b)
41+
a, b = b, a + b
42+
return sum(even_fibs)
43+
44+
45+
if __name__ == "__main__":
46+
print(f"{solution() = }")

0 commit comments

Comments
 (0)