Fix the bug that the default language symbols override the symbols.

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)))
 

src/cipher_analytical_machine/cli/cli.clj

@@ -122,8 +122,10 @@
 (defn set-symbols
   "Set defaults symbols for a language."
   [options]
-  (set-option options :symbols
-              (sf/default-symbol-factory (:language options))))
+  (if (contains? options :language)
+    (set-option options :symbols
+                (sf/default-symbol-factory (:language options)))
+    options))
 
 (defn load-and-set-option
   "Load the option and set it."

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<Character, Double> 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;
     }
 

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))))))