Skip to content

Commit 4e82508

Browse files
committed
Fixing ERROR maths/miller_rabin.py - ModuleNotFoundError and changing project_euler's isPrime to is_prime function names
1 parent eacca6b commit 4e82508

File tree

5 files changed

+29
-28
lines changed

5 files changed

+29
-28
lines changed

maths/miller_rabin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import random
22

3-
from binary_exp_mod import bin_exp_mod
3+
from .binary_exp_mod import bin_exp_mod
44

55

66
# This is a probabilistic check to test primality, useful for big numbers!

project_euler/problem_003/sol1.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
import math
1414

1515

16-
def isprime(num: int) -> bool:
16+
def is_prime(num: int) -> bool:
1717
"""
1818
Returns boolean representing primality of given number num.
1919
20-
>>> isprime(2)
20+
>>> is_prime(2)
2121
True
22-
>>> isprime(3)
22+
>>> is_prime(3)
2323
True
24-
>>> isprime(27)
24+
>>> is_prime(27)
2525
False
26-
>>> isprime(2999)
26+
>>> is_prime(2999)
2727
True
28-
>>> isprime(0)
28+
>>> is_prime(0)
2929
Traceback (most recent call last):
3030
...
3131
ValueError: Parameter num must be greater than or equal to two.
32-
>>> isprime(1)
32+
>>> is_prime(1)
3333
Traceback (most recent call last):
3434
...
3535
ValueError: Parameter num must be greater than or equal to two.
@@ -84,18 +84,18 @@ def solution(n: int = 600851475143) -> int:
8484
if n <= 0:
8585
raise ValueError("Parameter n must be greater than or equal to one.")
8686
max_number = 0
87-
if isprime(n):
87+
if is_prime(n):
8888
return n
8989
while n % 2 == 0:
9090
n //= 2
91-
if isprime(n):
91+
if is_prime(n):
9292
return n
9393
for i in range(3, int(math.sqrt(n)) + 1, 2):
9494
if n % i == 0:
95-
if isprime(n // i):
95+
if is_prime(n // i):
9696
max_number = n // i
9797
break
98-
elif isprime(i):
98+
elif is_prime(i):
9999
max_number = i
100100
return max_number
101101

project_euler/problem_007/sol2.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,18 @@
1111
References:
1212
- https://en.wikipedia.org/wiki/Prime_number
1313
"""
14+
from typing import List
1415

1516

16-
def isprime(number: int) -> bool:
17+
def is_prime(number: int) -> bool:
1718
"""
1819
Determines whether the given number is prime or not
1920
20-
>>> isprime(2)
21+
>>> is_prime(2)
2122
True
22-
>>> isprime(15)
23+
>>> is_prime(15)
2324
False
24-
>>> isprime(29)
25+
>>> is_prime(29)
2526
True
2627
"""
2728

@@ -73,10 +74,10 @@ def solution(nth: int = 10001) -> int:
7374
raise TypeError("Parameter nth must be int or castable to int.") from None
7475
if nth <= 0:
7576
raise ValueError("Parameter nth must be greater than or equal to one.")
76-
primes: list[int] = []
77+
primes: List[int] = []
7778
num = 2
7879
while len(primes) < nth:
79-
if isprime(num):
80+
if is_prime(num):
8081
primes.append(num)
8182
num += 1
8283
else:

project_euler/problem_007/sol3.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
import math
1616

1717

18-
def prime_check(number: int) -> bool:
18+
def is_prime(number: int) -> bool:
1919
"""
2020
Determines whether a given number is prime or not
2121
22-
>>> prime_check(2)
22+
>>> is_prime(2)
2323
True
24-
>>> prime_check(15)
24+
>>> is_prime(15)
2525
False
26-
>>> prime_check(29)
26+
>>> is_prime(29)
2727
True
2828
"""
2929

@@ -39,7 +39,7 @@ def prime_generator():
3939

4040
num = 2
4141
while True:
42-
if prime_check(num):
42+
if is_prime(num):
4343
yield num
4444
num += 1
4545

project_euler/problem_058/sol1.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
from math import isqrt
3737

3838

39-
def isprime(number: int) -> int:
39+
def is_prime(number: int) -> int:
4040
"""
4141
returns whether the given number is prime or not
42-
>>> isprime(1)
42+
>>> is_prime(1)
4343
0
44-
>>> isprime(17)
44+
>>> is_prime(17)
4545
1
46-
>>> isprime(10000)
46+
>>> is_prime(10000)
4747
0
4848
"""
4949
if number == 1:
@@ -76,7 +76,7 @@ def solution(ratio: float = 0.1) -> int:
7676

7777
while primes / (2 * j - 1) >= ratio:
7878
for i in range(j * j + j + 1, (j + 2) * (j + 2), j + 1):
79-
primes = primes + isprime(i)
79+
primes = primes + is_prime(i)
8080

8181
j = j + 2
8282
return j

0 commit comments

Comments
 (0)