Done 2016 challenge 5

[cipher-tools.git] / cipherbreak.py

diff --git a/cipherbreak.py b/cipherbreak.py
index 1a589c2ef1c5d1720f44d82651eda6b6a6cfe434..d5d3aa76422c6b0109ee91d55b482d87c66c97a0 100644 (file)
--- a/cipherbreak.py
+++ b/cipherbreak.py
@@ -13,11 +13,22 @@ from multiprocessing import Pool
 
 import matplotlib.pyplot as plt
 
-logger = logging.getLogger(__name__)
-logger.addHandler(logging.FileHandler('cipher.log'))
+# logging.basicConfig(filename="cipher.log", level=logging.INFO)
+# logger = logging.getLogger(__name__)
+
+logger = logging.getLogger('cipherbreak')
 logger.setLevel(logging.WARNING)
-#logger.setLevel(logging.INFO)
-#logger.setLevel(logging.DEBUG)
+# logger.setLevel(logging.INFO)
+# logger.setLevel(logging.DEBUG)
+
+# create the logging file handler
+fh = logging.FileHandler("cipher.log")
+formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+fh.setFormatter(formatter)
+
+# add handler to logger object
+logger.addHandler(fh)
+
 
 from cipher import *
 from language_models import *
@@ -204,7 +215,7 @@ def monoalphabetic_break_hillclimbing(message, max_iterations=10000000,
     if not alphabet:
         alphabet = list(string.ascii_lowercase)
         random.shuffle(alphabet)
-        alphabet = ''.join(alphabet)
+        alphabet = cat(alphabet)
     return monoalphabetic_break_hillclimbing_worker(ciphertext, alphabet,
                                                     max_iterations, fitness)
 
@@ -218,7 +229,7 @@ def monoalphabetic_break_hillclimbing_mp(message, workers=10,
         else:
             this_alphabet = list(string.ascii_lowercase)
             random.shuffle(this_alphabet)
-            this_alphabet = ''.join(this_alphabet)
+            this_alphabet = cat(this_alphabet)
         worker_args.append((ciphertext, this_alphabet, max_iterations, fitness))
     with Pool() as pool:
         breaks = pool.starmap(monoalphabetic_break_hillclimbing_worker,
@@ -290,7 +301,7 @@ def vigenere_frequency_break(message, max_key_length=20, fitness=Pletters):
     """
     def worker(message, key_length, fitness):
         splits = every_nth(sanitised_message, key_length)
-        key = ''.join([chr(caesar_break(s)[0] + ord('a')) for s in splits])
+        key = cat([chr(caesar_break(s)[0] + ord('a')) for s in splits])
         plaintext = vigenere_decipher(message, key)
         fit = fitness(plaintext)
         return key, fit
@@ -314,7 +325,7 @@ def beaufort_frequency_break(message, max_key_length=20, fitness=Pletters):
     """
     def worker(message, key_length, fitness):
         splits = every_nth(sanitised_message, key_length)
-        key = ''.join([chr(-caesar_break(s)[0] % 26 + ord('a'))
+        key = cat([chr(-caesar_break(s)[0] % 26 + ord('a'))
                        for s in splits])
         plaintext = beaufort_decipher(message, key)
         fit = fitness(plaintext)