Changed simulated annealing breaks to use trigrams by default

diff --git a/cipher/keyword_cipher.py b/cipher/keyword_cipher.py
index 20281828030a550948c433f246c8bc05a40622c1..fc8eb1c6847b11dc2a2ea29c40e0934776c84c1c 100644 (file)
--- a/cipher/keyword_cipher.py
+++ b/cipher/keyword_cipher.py
@@ -160,7 +160,7 @@ def monoalphabetic_break_hillclimbing(message,
                               max_iterations=20000,
                               plain_alphabet=None, 
                               cipher_alphabet=None, 
-                              fitness=Pletters, chunksize=1):
+                              fitness=Ptrigrams, chunksize=1):
     return simulated_annealing_break(message, 
                               workers=1, 
                               initial_temperature=0,
@@ -175,7 +175,7 @@ def monoalphabetic_break_hillclimbing_mp(message,
                               max_iterations=20000,
                               plain_alphabet=None, 
                               cipher_alphabet=None, 
-                              fitness=Pletters, chunksize=1):
+                              fitness=Ptrigrams, chunksize=1):
     return simulated_annealing_break(message, 
                               workers=workers, 
                               initial_temperature=0,
@@ -190,7 +190,7 @@ def simulated_annealing_break(message, workers=10,
                               max_iterations=20000,
                               plain_alphabet=None, 
                               cipher_alphabet=None, 
-                              fitness=Pletters, chunksize=1):
+                              fitness=Ptrigrams, chunksize=1):
     worker_args = []
     ciphertext = sanitise(message)
     for i in range(workers):