fix naming

Author: OssieLin

graph.py

@@ -22,16 +22,17 @@ def plot_combined_graph_from_tests(primality_tests):
  plt.show()
 
 
-def generate_spp_heatmap(c0_range, c1_range, k_rough):
- list_of_spp = [[smallest_lucas_type_pseudoprime(c0, c1, k_rough, 1000) for c0 in c0_range] for c1 in c1_range[::-1]]
- sns.heatmap(list_of_spp, cmap="YlGnBu", annot=True, fmt="d", xticklabels=c0_range, yticklabels=c1_range[::-1])
+def generate_spp_heatmap(c0_min, c0_max, c1_min, c1_max, k_rough, pp_max):
+ list_of_spp = [[smallest_lucas_type_pseudoprime(c0, c1, k_rough, pp_max) for c0 in range(c0_min, c0_max)] for c1 in range(c1_min, c1_max)[::-1]]
+ sns.heatmap(list_of_spp, cmap="YlGnBu", annot=True, fmt="d", xticklabels=range(c0_min, c0_max), yticklabels=range(c1_min, c1_max)[::-1])
  plt.title('Logs of Smallest 3-rough Pseudoprimes ', fontdict={'fontsize':13})
  plt.xlabel('Parameter c0')
  plt.ylabel('Parameter c1')
  plt.show()
-def generate_npp_heatmap(c0_range, c1_range, k_rough):
- list_of_spp = [[number_of_lucas_type_pseudoprime_up_to(c0, c1, k_rough, 1000) for c0 in c0_range] for c1 in c1_range[::-1]]
- sns.heatmap(list_of_spp, cmap="YlGnBu", annot=True, fmt="d", xticklabels=c0_range, yticklabels=c1_range[::-1])
+
+def generate_npp_heatmap(c0_min, c0_max, c1_min, c1_max, k_rough, pp_max):
+ list_of_spp = [[number_of_lucas_type_pseudoprime_up_to(c0, c1, k_rough, pp_max) for c0 in range(c0_min, c0_max)] for c1 in range(c1_min, c1_max)[::-1]]
+ sns.heatmap(list_of_spp, cmap="YlGnBu", annot=True, fmt="d", xticklabels=range(c0_min, c0_max), yticklabels=range(c1_min, c1_max)[::-1])
  plt.title(f'Number of 3-rough Pseudoprimes up to 1000', fontdict={'fontsize': 13})
  plt.xlabel('Parameter c0')
  plt.ylabel('Parameter c1')

main.py

@@ -9,21 +9,24 @@
 ]
 #plot_combined_graph_from_tests(compare_primality_tests)
 
-c0_min = -60
-c0_max = 41
-c1_min = 0
-c1_max = 101
+c0_min = 2
+c0_max = 11
+c1_min = 2
+c1_max = 11
+k_rough = 1
+pp_max = 1000 # max pseudoprimes
 
-#plot_heatmap_lucastype_nrpseudoprimes(c0_min, c0_max, c1_min, c1_max, 1, 1000)
+generate_spp_heatmap(c0_min, c0_max, c1_min, c1_max, k_rough, pp_max)
+generate_npp_heatmap(c0_min, c0_max, c1_min, c1_max, k_rough, pp_max)
 
-n_values = list(range(1, 50))
 # Fermat case
+n_values = list(range(1, 50))
 c0_values = [-n**2 for n in n_values]
 c1_values = [2 * n for n in n_values]
 
 plt.plot(c0_values, c1_values, marker='o', linestyle='-', color='red', label='Fermat Case')
 
-#plot_spp_largerscale(c0_min, c0_max, c1_min, c1_max, 1, 1000)
+plot_spp_largerscale(c0_min, c0_max, c1_min, c1_max, 1, 1000)
 
 
 #analyze_primality_test(lambda n: lucas_type_primality_test(n, 1, 2), "Lucas-Type Primality Test",1)

primality_test.py

@@ -27,14 +27,14 @@ def lucas_type_primality_test(n, c0, c1):
  b = c
  return (b-c1) % n == 0
 
-def fermat_primality_test(n, c):#fermat's little theorem
+def fermat_primality_test(n, c):# fermat's little theorem
  return pow(c, n - 1, n) == 1
 
-def smallest_lucas_type_pseudoprime(c0, c1, k, pp_max):
+def smallest_lucas_type_pseudoprime(c0, c1, k_rough, pp_max):
  for n in range(2, pp_max+1):
- if not is_prime(n) and lucas_type_primality_test(n, c0, c1) and is_k_rough(n,k):
+ if not is_prime(n) and lucas_type_primality_test(n, c0, c1) and is_k_rough(n,k_rough):
  return n
- return max
+ return pp_max
 
 def log_of_smallest_lucas_type_pseudoprime_k_rough(c0, c1, k_rough, pp_max):
  for n in range(2, pp_max+1):

util.py

@@ -1,22 +1,13 @@
-default_limit = 1000
-
 # A k rough number is a positive integer whose prime factors are all greater than or equal to k.
-def is_k_rough(n,k):
- for i in range(2, k+1):
+def is_k_rough(n,k_rough):
+ for i in range(2, k_rough+1):
  if n % i == 0:
  return False
  return True
 
 def is_k_pseudoprime(n,k):
  return is_k_rough(n, k) and not is_prime(n)
 
-def primality_test_with_rough_pseudoprimes(primality_test, k):
- results = []
- for n in range(2, default_limit + 1):
- if primality_test(n) and is_k_pseudoprime(n, k):
- results.append(n)
- return results
-
 def is_prime(n): # trial division
  if n < 2 or n % 2 == 0:
  return n == 2