From: Tomas Musil <tomik.musil@gmail.com>
Date: Wed, 21 Mar 2012 13:02:40 +0000 (+0100)
Subject: Merge branch 'mezery'
X-Git-Url: http://git.tomasm.cz/krypto.git/commitdiff_plain/df0003e93591f53b015980aaaec0a68f8e565ead?hp=46907e1d228d6cbce237bde98b619d2510804c49

Merge branch 'mezery'
---

diff --git a/robot.py b/robot.py
index 0202654..e2b3820 100755
--- a/robot.py
+++ b/robot.py
@@ -60,23 +60,42 @@ analyza = []
 analyza.append("Puvodni zprava:")
 analyza.append(telo)
 
+# Prepinani spacemodu
+if 'X' in opsny:
+    mod_m = True
+elif 'M' in opsny:
+    mod_m = False
+elif ' ' in ocesat(zprava, True):
+    mod_m = True
+else:
+    mod_m = False    
+if mod_m:
+    analyza.append("\nAnalyza s mezerami.")
+else:
+    analyza.append("\nAnalyza bez mezer.")
+    
 # Zakladni udaje
-analyza.append("\nDelka zpravy (bez mezer a zvlastnich znaku):")
-analyza.append(str(len(ocesat(zprava, False))))
+analyza.append("\nZakladni udaje:")
+if mod_m:
+    analyza.append("Delka zpravy (vcetne mezer a zvlastnich znaku): " + str(len(zprava)))
+analyza.append("Delka zpravy (bez mezer a zvlastnich znaku): " + str(len(ocesat(zprava, False))))
 
-# TODO pouze v modu s mezerami
 # Prumerna delka slova
-analyza.append("\nPrumerna delka slova:")
-slova = ocesat(zprava, True).split()
-analyza.append('{0:.3}'.format(float(sum([len(word) for word in slova]))/len(slova)))
+if mod_m:
+    analyza.append("\nPrumerna delka slova:")
+    slova = ocesat(zprava, True).split()
+    analyza.append('{0:.3}'.format(float(sum([len(word) for word in slova]))/len(slova)))
 
 # Index koincidence
-analyza.append("\nIndexy koincidence:")
+# TODO verze s mezerami
+analyza.append("\nIndexy koincidence (vzdy bez mezer):")
 analyza.append(koincidence.tabulka_indexu(zprava))
 
 # Jakobsen
-analyza.append("\nJakobsen:")
-analyza.append(jakobsen.desifruj(zprava, './ref'))
+# TODO verze bez mezer
+if mod_m:
+    analyza.append("\nJakobsen:")
+    analyza.append(jakobsen.desifruj(zprava, './ref'))
 
 # Posuny v abecede
 analyza.append("\nPosuny v abecede:")