projects
/
cipher-tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fd77917
)
Tidied affine cipher and decipher
author
Neil Smith
<neil.github@njae.me.uk>
Fri, 25 Oct 2013 09:58:15 +0000
(10:58 +0100)
committer
Neil Smith
<neil.github@njae.me.uk>
Fri, 25 Oct 2013 09:58:15 +0000
(10:58 +0100)
cipher.py
patch
|
blob
|
history
diff --git
a/cipher.py
b/cipher.py
index 0e89a9c01ebdbe60e9e29b16c0822093caca983c..273da4681040feff53f28d7fcee21ff22ad1a923 100644
(file)
--- a/
cipher.py
+++ b/
cipher.py
@@
-194,7
+194,6
@@
def affine_encipher_letter(letter, multiplier=1, adder=0, one_based=True):
if one_based:
letter_number += 1
raw_cipher_number = (letter_number * multiplier + adder)
if one_based:
letter_number += 1
raw_cipher_number = (letter_number * multiplier + adder)
- cipher_number = 0
if one_based:
cipher_number = (raw_cipher_number - 1) % 26
else:
if one_based:
cipher_number = (raw_cipher_number - 1) % 26
else:
@@
-217,13
+216,9
@@
def affine_decipher_letter(letter, multiplier=1, adder=0, one_based=True):
else:
alphabet_start = ord('a')
cipher_number = ord(letter) - alphabet_start
else:
alphabet_start = ord('a')
cipher_number = ord(letter) - alphabet_start
- if one_based:
- cipher_number += 1
- plaintext_number = 0
if one_based:
if one_based:
- plaintext_number = (modular_division_table_one_based[multiplier][(cipher_number - adder + 26) % 26] - 1) % 26
+ plaintext_number = (modular_division_table_one_based[multiplier][(cipher_number
+ 1
- adder + 26) % 26] - 1) % 26
else:
else:
- #plaintext_number = (modular_division_table[multiplier][cipher_number] - adder) % 26
plaintext_number = modular_division_table[multiplier][(cipher_number - adder + 26) % 26]
return chr(plaintext_number + alphabet_start)
else:
plaintext_number = modular_division_table[multiplier][(cipher_number - adder + 26) % 26]
return chr(plaintext_number + alphabet_start)
else: