X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=szyfrow%2Faffine.py;fp=szyfrow%2Faffine.py;h=0ef50dfd53e384479f5a8428c4760c673c1874ae;hb=27c8005f6dea0026887b80a01b5f93a8f1b3c2b2;hp=a5647be20e3b30abd5573ac087eac7da1f1f5d2f;hpb=a870050db6bc974b1bb0d132001750b6624fb43f;p=szyfrow.git diff --git a/szyfrow/affine.py b/szyfrow/affine.py index a5647be..0ef50df 100644 --- a/szyfrow/affine.py +++ b/szyfrow/affine.py @@ -1,7 +1,5 @@ -from support.utilities import * -from support.language_models import * -from logger import logger - +from szyfrow.support.utilities import * +from szyfrow.support.language_models import * modular_division_table = { (multiplier, (multiplier * plaintext) % 26): plaintext @@ -106,18 +104,10 @@ def affine_break(message, fitness=Pletters): plaintext = affine_decipher(sanitised_message, multiplier, adder, one_based) fit = fitness(plaintext) - logger.debug('Affine break attempt using key {0}x+{1} ({2}) ' - 'gives fit of {3} and decrypt starting: {4}'. - format(multiplier, adder, one_based, fit, - plaintext[:50])) if fit > best_fit: best_fit = fit best_multiplier = multiplier best_adder = adder best_one_based = one_based - logger.info('Affine break best fit with key {0}x+{1} ({2}) gives fit of ' - '{3} and decrypt starting: {4}'.format( - best_multiplier, best_adder, best_one_based, best_fit, - affine_decipher(sanitised_message, best_multiplier, - best_adder, best_one_based)[:50])) + return (best_multiplier, best_adder, best_one_based), best_fit