Skip to content

improved prime number generator to check only up to sqrt(n) instead of n #1984

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 5 commits into from
May 14, 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
37 changes: 36 additions & 1 deletion maths/prime_numbers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@
from typing import Generator
import math


def slow_primes(max: int) -> Generator[int, None, None]:
"""
Return a list of all primes numbers up to max.
>>> list(slow_primes(0))
[]
>>> list(slow_primes(-1))
[]
>>> list(slow_primes(-10))
[]
>>> list(slow_primes(25))
[2, 3, 5, 7, 11, 13, 17, 19, 23]
>>> list(slow_primes(11))
[2, 3, 5, 7, 11]
>>> list(slow_primes(33))
[2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31]
>>> list(slow_primes(10000))[-1]
9973
"""
numbers: Generator = (i for i in range(1, (max + 1)))
for i in (n for n in numbers if n > 1):
for j in range(2, i):
if (i % j) == 0:
break
else:
yield i


def primes(max: int) -> Generator[int, None, None]:
Expand All @@ -21,7 +49,9 @@ def primes(max: int) -> Generator[int, None, None]:
"""
numbers: Generator = (i for i in range(1, (max + 1)))
for i in (n for n in numbers if n > 1):
for j in range(2, i):
# only need to check for factors up to sqrt(i)
bound = int(math.sqrt(i)) + 1
for j in range(2, bound):
if (i % j) == 0:
break
else:
Expand All @@ -32,3 +62,8 @@ def primes(max: int) -> Generator[int, None, None]:
number = int(input("Calculate primes up to:\n>> ").strip())
for ret in primes(number):
print(ret)

# Let's benchmark them side-by-side...
from timeit import timeit
print(timeit("slow_primes(1_000_000)", setup="from __main__ import slow_primes"))
print(timeit("primes(1_000_000)", setup="from __main__ import primes"))