Skip to content

math/sieve_of_eratosthenes: add type hints #2627

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 6 commits into from
Nov 23, 2020
Merged
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
38 changes: 21 additions & 17 deletions maths/sieve_of_eratosthenes.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,54 +8,58 @@
Reference: https://en.wikipedia.org/wiki/Sieve_of_Eratosthenes

doctest provider: Bruno Simas Hadlich (https://github.com/brunohadlich)
Also thanks Dmitry (https://github.com/LizardWizzard) for finding the problem
Also thanks to Dmitry (https://github.com/LizardWizzard) for finding the problem
"""


import math
from typing import List


def sieve(n):
def prime_sieve(num: int) -> List[int]:
"""
Returns a list with all prime numbers up to n.

>>> sieve(50)
>>> prime_sieve(50)
[2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47]
>>> sieve(25)
>>> prime_sieve(25)
[2, 3, 5, 7, 11, 13, 17, 19, 23]
>>> sieve(10)
>>> prime_sieve(10)
[2, 3, 5, 7]
>>> sieve(9)
>>> prime_sieve(9)
[2, 3, 5, 7]
>>> sieve(2)
>>> prime_sieve(2)
[2]
>>> sieve(1)
>>> prime_sieve(1)
[]
"""

l = [True] * (n + 1) # noqa: E741
if num <= 0:
raise ValueError(f"{num}: Invalid input, please enter a positive integer.")

sieve = [True] * (num + 1)
prime = []
start = 2
end = int(math.sqrt(n))
end = int(math.sqrt(num))

while start <= end:
# If start is a prime
if l[start] is True:
if sieve[start] is True:
prime.append(start)

# Set multiples of start be False
for i in range(start * start, n + 1, start):
if l[i] is True:
l[i] = False
for i in range(start * start, num + 1, start):
if sieve[i] is True:
sieve[i] = False

start += 1

for j in range(end + 1, n + 1):
if l[j] is True:
for j in range(end + 1, num + 1):
if sieve[j] is True:
prime.append(j)

return prime


if __name__ == "__main__":
print(sieve(int(input("Enter n: ").strip())))
print(prime_sieve(int(input("Enter a positive integer: ").strip())))