mirror of
https://github.com/TheAlgorithms/Python.git
synced 2025-04-21 05:07:35 +00:00
Improved prime_numbers.py (#5592)
* Improved prime_numbers.py * update prime_numbers.py * Increase the timeit number to 1_000_000 Co-authored-by: Christian Clauss <cclauss@me.com>
This commit is contained in:
parent
12e81ea6a2
commit
716beb32ed
@ -58,6 +58,38 @@ def primes(max: int) -> Generator[int, None, None]:
|
|||||||
yield i
|
yield i
|
||||||
|
|
||||||
|
|
||||||
|
def fast_primes(max: int) -> Generator[int, None, None]:
|
||||||
|
"""
|
||||||
|
Return a list of all primes numbers up to max.
|
||||||
|
>>> list(fast_primes(0))
|
||||||
|
[]
|
||||||
|
>>> list(fast_primes(-1))
|
||||||
|
[]
|
||||||
|
>>> list(fast_primes(-10))
|
||||||
|
[]
|
||||||
|
>>> list(fast_primes(25))
|
||||||
|
[2, 3, 5, 7, 11, 13, 17, 19, 23]
|
||||||
|
>>> list(fast_primes(11))
|
||||||
|
[2, 3, 5, 7, 11]
|
||||||
|
>>> list(fast_primes(33))
|
||||||
|
[2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31]
|
||||||
|
>>> list(fast_primes(10000))[-1]
|
||||||
|
9973
|
||||||
|
"""
|
||||||
|
numbers: Generator = (i for i in range(1, (max + 1), 2))
|
||||||
|
# It's useless to test even numbers as they will not be prime
|
||||||
|
if max > 2:
|
||||||
|
yield 2 # Because 2 will not be tested, it's necessary to yield it now
|
||||||
|
for i in (n for n in numbers if n > 1):
|
||||||
|
bound = int(math.sqrt(i)) + 1
|
||||||
|
for j in range(3, bound, 2):
|
||||||
|
# As we removed the even numbers, we don't need them now
|
||||||
|
if (i % j) == 0:
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
yield i
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
number = int(input("Calculate primes up to:\n>> ").strip())
|
number = int(input("Calculate primes up to:\n>> ").strip())
|
||||||
for ret in primes(number):
|
for ret in primes(number):
|
||||||
@ -66,5 +98,24 @@ if __name__ == "__main__":
|
|||||||
# Let's benchmark them side-by-side...
|
# Let's benchmark them side-by-side...
|
||||||
from timeit import timeit
|
from timeit import timeit
|
||||||
|
|
||||||
print(timeit("slow_primes(1_000_000)", setup="from __main__ import slow_primes"))
|
print(
|
||||||
print(timeit("primes(1_000_000)", setup="from __main__ import primes"))
|
timeit(
|
||||||
|
"slow_primes(1_000_000_000_000)",
|
||||||
|
setup="from __main__ import slow_primes",
|
||||||
|
number=1_000_000,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
print(
|
||||||
|
timeit(
|
||||||
|
"primes(1_000_000_000_000)",
|
||||||
|
setup="from __main__ import primes",
|
||||||
|
number=1_000_000,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
print(
|
||||||
|
timeit(
|
||||||
|
"fast_primes(1_000_000_000_000)",
|
||||||
|
setup="from __main__ import fast_primes",
|
||||||
|
number=1_000_000,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user