X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=cipher%2Fkeyword_cipher.py;h=2db454cb3ef23e953a83d9129e174906ce2596a5;hb=39c4ae8d56e4399d431cc3f0c782784f1d197eab;hp=20281828030a550948c433f246c8bc05a40622c1;hpb=e670d7e12005cd73385f6c6251174a911ccc018b;p=cipher-tools.git

diff --git a/cipher/keyword_cipher.py b/cipher/keyword_cipher.py
index 2028182..2db454c 100644
--- a/cipher/keyword_cipher.py
+++ b/cipher/keyword_cipher.py
@@ -6,6 +6,8 @@ from support.utilities import *
 from support.language_models import *
 
 from logger import logger
+import logging
+# logger.setLevel(logging.DEBUG)
 
 
 class KeywordWrapAlphabet(Enum):
@@ -160,6 +162,7 @@ def monoalphabetic_break_hillclimbing(message,
                               max_iterations=20000,
                               plain_alphabet=None, 
                               cipher_alphabet=None, 
+                              swap_index_finder=None,
                               fitness=Pletters, chunksize=1):
     return simulated_annealing_break(message, 
                               workers=1, 
@@ -167,6 +170,7 @@ def monoalphabetic_break_hillclimbing(message,
                               max_iterations=max_iterations,
                               plain_alphabet=plain_alphabet, 
                               cipher_alphabet=cipher_alphabet, 
+                              swap_index_finder=swap_index_finder,
                               fitness=fitness, chunksize=chunksize)
 
 
@@ -175,6 +179,7 @@ def monoalphabetic_break_hillclimbing_mp(message,
                               max_iterations=20000,
                               plain_alphabet=None, 
                               cipher_alphabet=None, 
+                              swap_index_finder=None,
                               fitness=Pletters, chunksize=1):
     return simulated_annealing_break(message, 
                               workers=workers, 
@@ -182,17 +187,27 @@ def monoalphabetic_break_hillclimbing_mp(message,
                               max_iterations=max_iterations,
                               plain_alphabet=plain_alphabet, 
                               cipher_alphabet=cipher_alphabet, 
+                              swap_index_finder=swap_index_finder,
                               fitness=fitness, chunksize=chunksize)
 
 
+def gaussian_swap_index(a):
+    return (a + int(random.gauss(0, 4))) % 26
+
+def uniform_swap_index(a):
+    return random.randrange(26)
+
 def simulated_annealing_break(message, workers=10, 
                               initial_temperature=200,
                               max_iterations=20000,
                               plain_alphabet=None, 
                               cipher_alphabet=None, 
-                              fitness=Pletters, chunksize=1):
+                              swap_index_finder=None,
+                              fitness=Ptrigrams, chunksize=1):
     worker_args = []
     ciphertext = sanitise(message)
+    if swap_index_finder is None:
+        swap_index_finder = gaussian_swap_index
     for i in range(workers):
         if plain_alphabet is None:
             used_plain_alphabet = string.ascii_lowercase
@@ -211,7 +226,9 @@ def simulated_annealing_break(message, workers=10,
         #     random.shuffle(cipher_alphabet)
         #     cipher_alphabet = cat(cipher_alphabet)
         worker_args.append((ciphertext, used_plain_alphabet, used_cipher_alphabet, 
-                            initial_temperature, max_iterations, fitness))
+                            swap_index_finder,
+                            initial_temperature, max_iterations, fitness,
+                            i))
     with multiprocessing.Pool() as pool:
         breaks = pool.starmap(simulated_annealing_break_worker,
                               worker_args, chunksize)
@@ -219,7 +236,9 @@ def simulated_annealing_break(message, workers=10,
 
 
 def simulated_annealing_break_worker(message, plain_alphabet, cipher_alphabet, 
-                                     t0, max_iterations, fitness):
+                                     swap_index_finder,
+                                     t0, max_iterations, fitness,
+                                     logID):
     def swap(letters, i, j):
         if i > j:
             i, j = j, i
@@ -246,7 +265,8 @@ def simulated_annealing_break_worker(message, plain_alphabet, cipher_alphabet,
     # print('starting for', max_iterations)
     for i in range(max_iterations):
         swap_a = random.randrange(26)
-        swap_b = (swap_a + int(random.gauss(0, 4))) % 26
+        # swap_b = (swap_a + int(random.gauss(0, 4))) % 26
+        swap_b = swap_index_finder(swap_a)
         alphabet = swap(current_alphabet, swap_a, swap_b)
         cipher_translation = ''.maketrans(alphabet, plain_alphabet)
         plaintext = message.translate(cipher_translation)
@@ -271,9 +291,9 @@ def simulated_annealing_break_worker(message, plain_alphabet, cipher_alphabet,
             best_fitness = current_fitness
             best_plaintext = plaintext
         if i % 500 == 0:
-            logger.debug('Simulated annealing: iteration {}, temperature {}, '
-                'current alphabet {}, current_fitness {}, '
-                'best_plaintext {}'.format(i, temperature, current_alphabet, 
+            logger.debug('Simulated annealing worker {}: iteration {}, temperature {}, '
+                'current alphabet {}, plain alphabet {}, current_fitness {}, '
+                'best_plaintext {}'.format(logID, i, temperature, current_alphabet, plain_alphabet,
                 current_fitness, plaintext[:50]))
         temperature = max(temperature - dt, 0.001)