Merge branch 'working' into lucas

bot.py

 import random
-from math import floor, log
 
 pto100 = [
-    2,3,5,7,11,13,17,19,23,29,31,37,41,
-     43,47,53,59,61,67,71,73,79,83,89,97
+    2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41,
+    43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97
 ]
 
+
 def in_100(x):
     """Check if x is in the primes less than 100 i.e., in the first 25 primes.
     Useful for e.g. the first step in Baillie–PSW.
     """
     return x in pto100
 
+
 def hund_div(x):
     """Check if x is divisible by any of the 25 primes less than 100. Returns 0
     if there is no such divisor, otherwise returns the first divisor.
             return v
     return 0
 
+
 def trd(x):
     """Express x as 2^r * d. Returns two values, r and d.
     """
         xc = xc // 2
     return count, xc
 
+
 def MillerRabinRandom(n, k):
     """Carry out a Miller-Rabin test on n with k iterations, choosing random
     values for a.
             return True
     return False
 
+
 def MillerRabin(n, base):
     """Carry out a Miller-Rabin test on n with a specified base.
     """
-    #print(n, base)
     r, d = trd(n-1)
-    #print(r, d)
     a = base
     x = pow(a, d, n)
-    #print(x)
     if x == 1 or x == n - 1:
-        #print("First")
         return False
     for iterb in range(r - 1):
         x = pow(x, 2, n)
         if x == n - 1:
-            #print("Second,", iterb, x)
             return False
-    #print("True")
     return True
 
-#for i in range(2, 100):
-#    print(i, hund_div(i))
-#
-#print()
 
-#Print pseudoprimes greater than 100 for each base, from base 1 to 15
+# Print pseudoprimes greater than 100 for each base, from base 1 to 15
 for base in range(2, 16):
     print("{}:".format(base))
     for i in range(2, 10000):

sieve.py

 from numpy import array, zeros, int8
 from time import process_time
 
+
 def sieve(to):
     """Construct a sieve of Eratosthenes up to the value of 'to'; return all
     primes below this number.
     avals = array(range(to))
     return avals[zarr[range(to)] == 0]
 
+
 def sieval(to):
     """Run sieve algorithm up to 'to'; return process time, number of primes,
     and last prime calculated (in that order).
     ls = len(sh)
     return te, ls, sh[ls - 1]
 
+
 def sievemsg(to):
     """Format sieval output for sieve up to 'to'
 
     'to' must be greater than 2.
     """
-    t, n, l = sieval(to)
-    rs = ("There are {1} prime numbers smaller than {3}; the largest is {2}. This "
-        "calculation took {0:.2f} seconds via the sieve of "
-        "Eratosthenes.".format(t, n, l, to))
+    t, n, largest = sieval(to)
+    rs = ("There are {1} prime numbers smaller than {3}; "
+          "the largest is {2}. This "
+          "calculation took {0:.2f} seconds via the sieve of "
+          "Eratosthenes.".format(t, n, largest, to))
     return rs
-