Skip to content

Commit c8fbdee

Browse files
steven7214cclauss
andauthored
improved prime number generator to check only up to sqrt(n) instead of n (#1984)
* improved prime number generator to check only up to sqrt(n) instead of n * added old version as slow_primes() and named new, faster version primes() * fixed docstring in slow_primes * Add a timeit benchmark * Update prime_numbers.py Co-authored-by: Christian Clauss <[email protected]>
1 parent 48bb14d commit c8fbdee

File tree

1 file changed

+36
-1
lines changed

1 file changed

+36
-1
lines changed

maths/prime_numbers.py

+36-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,32 @@
11
from typing import Generator
2+
import math
3+
4+
5+
def slow_primes(max: int) -> Generator[int, None, None]:
6+
"""
7+
Return a list of all primes numbers up to max.
8+
>>> list(slow_primes(0))
9+
[]
10+
>>> list(slow_primes(-1))
11+
[]
12+
>>> list(slow_primes(-10))
13+
[]
14+
>>> list(slow_primes(25))
15+
[2, 3, 5, 7, 11, 13, 17, 19, 23]
16+
>>> list(slow_primes(11))
17+
[2, 3, 5, 7, 11]
18+
>>> list(slow_primes(33))
19+
[2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31]
20+
>>> list(slow_primes(10000))[-1]
21+
9973
22+
"""
23+
numbers: Generator = (i for i in range(1, (max + 1)))
24+
for i in (n for n in numbers if n > 1):
25+
for j in range(2, i):
26+
if (i % j) == 0:
27+
break
28+
else:
29+
yield i
230

331

432
def primes(max: int) -> Generator[int, None, None]:
@@ -21,7 +49,9 @@ def primes(max: int) -> Generator[int, None, None]:
2149
"""
2250
numbers: Generator = (i for i in range(1, (max + 1)))
2351
for i in (n for n in numbers if n > 1):
24-
for j in range(2, i):
52+
# only need to check for factors up to sqrt(i)
53+
bound = int(math.sqrt(i)) + 1
54+
for j in range(2, bound):
2555
if (i % j) == 0:
2656
break
2757
else:
@@ -32,3 +62,8 @@ def primes(max: int) -> Generator[int, None, None]:
3262
number = int(input("Calculate primes up to:\n>> ").strip())
3363
for ret in primes(number):
3464
print(ret)
65+
66+
# Let's benchmark them side-by-side...
67+
from timeit import timeit
68+
print(timeit("slow_primes(1_000_000)", setup="from __main__ import slow_primes"))
69+
print(timeit("primes(1_000_000)", setup="from __main__ import primes"))

0 commit comments

Comments
 (0)