diff --git a/src/cipher_analytical_machine/analyzers/caesar.clj b/src/cipher_analytical_machine/analyzers/caesar.clj index 6bc5af2..e538c1e 100644 --- a/src/cipher_analytical_machine/analyzers/caesar.clj +++ b/src/cipher_analytical_machine/analyzers/caesar.clj @@ -50,10 +50,10 @@ (defn frequency-analizer-get-plaintext "Return the plaintext from a ciphertext using simple analizer. The function is case-insensitive." - [ciphertext symbols letter-frequences] + [ciphertext symbols letter-frequencies-string] (let [decrypt (reify Decrypted (decrypt [this message key symbols] (caesar/decrypt-message message key symbols)))] - (-> (new FrequencyAnalyzer ciphertext symbols letter-frequences decrypt) + (-> (new FrequencyAnalyzer ciphertext symbols letter-frequencies-string decrypt) .crack))) diff --git a/src/main/java/cipher_analytical_machine/analyzers/caesar/FrequencyAnalyzer.java b/src/main/java/cipher_analytical_machine/analyzers/caesar/FrequencyAnalyzer.java index 08c4e3b..31a68d8 100644 --- a/src/main/java/cipher_analytical_machine/analyzers/caesar/FrequencyAnalyzer.java +++ b/src/main/java/cipher_analytical_machine/analyzers/caesar/FrequencyAnalyzer.java @@ -7,12 +7,14 @@ public class FrequencyAnalyzer { private String ciphertext; private int key; private String symbols; + private String symbol_frequences; private Decrypted decryptor; - public FrequencyAnalyzer(String ciphertext, String symbols, Map symbol_frequences, Decrypted decryptor) { + public FrequencyAnalyzer(String ciphertext, String symbols, String symbol_frequences, Decrypted decryptor) { this.ciphertext = ciphertext; this.key = 1; this.symbols = symbols; + this.symbol_frequences = symbol_frequences; this.decryptor = decryptor; } diff --git a/test/cipher_analytical_machine/analyzers/caesar_test.clj b/test/cipher_analytical_machine/analyzers/caesar_test.clj index b5a113b..84e1bba 100644 --- a/test/cipher_analytical_machine/analyzers/caesar_test.clj +++ b/test/cipher_analytical_machine/analyzers/caesar_test.clj @@ -79,7 +79,7 @@ ciphertext "bca" key 1 symbols "abc" - frequencies sf/english-letter-frequencies] + frequencies "etaoinsrhldcumfpgwybvkxjqz"] (testing "The ciphertext is 'bca' and key is 1." (is (= plaintext (frequency-analizer-get-plaintext ciphertext symbols frequencies))))))