Nove opsny, napoveda

diff --git a/robot.py b/robot.py
index e2b3820..596f386 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -40,8 +40,17 @@ if opsny == 'H':
                "\n\nSeznam prikazu:\n"
                "\"" + settings.subject + "\"   Analyza zpravy z tela mailu.\n" 
                "\"" + settings.subject + " L\" Opakovana analyza posledni zpravy.\n" +
+               "\"" + settings.subject + " X\" Vynuti analyzu bez mezer.\n"
+               "\"" + settings.subject + " M\" Vynuti analyzu s mezerami.\n"
+               "\"" + settings.subject + " B\" Vypise cetnost vsech bigramu.\n"
+               "\"" + settings.subject + " P\" Vypise vsechny posunuti textu.\n"
+               "\"" + settings.subject + " A\" Vypise uplne vsechno co dava "
+               "alespon trochu smysl (nedoporucuji).\n"
                "\"" + settings.subject + " H\" Tato napoveda.\n"
                "\nVolby (mimo \"H\") je mozno libovolne kombinovat.\n"
+               "Napriklad \"" + settings.subject + " LXB\" analyzuje posledni "
+               "prijatou zpravu s vynucenim analyzy bez mezer a navic vypise "
+               "cetnosti bigramu.\n"
                "\nS pozdravem\nVas Robot\n")
     sys.exit()
 if 'L' in opsny:
@@ -61,18 +70,22 @@ analyza.append("Puvodni zprava:")
 analyza.append(telo)
 
 # Prepinani spacemodu
+mod_m = False
+mod_x = False
 if 'X' in opsny:
+    mod_x = True
+if 'M' in opsny:
     mod_m = True
-elif 'M' in opsny:
-    mod_m = False
-elif ' ' in ocesat(zprava, True):
+if 'A' in opsny:
+    mod_x = True
     mod_m = True
-else:
-    mod_m = False    
-if mod_m:
-    analyza.append("\nAnalyza s mezerami.")
-else:
-    analyza.append("\nAnalyza bez mezer.")
+if not mod_m and not mod_x:
+    if ' ' in ocesat(zprava, True):
+        mod_m = True
+        analyza.append("\nAutomaticky zvolena analyza s mezerami.")
+    else:
+        mod_x = True
+        analyza.append("\nAutomaticky zvolena analyza bez mezer.")
     
 # Zakladni udaje
 analyza.append("\nZakladni udaje:")
@@ -86,6 +99,19 @@ if mod_m:
     slova = ocesat(zprava, True).split()
     analyza.append('{0:.3}'.format(float(sum([len(word) for word in slova]))/len(slova)))
 
+# Frekvence znaku 
+analyza.append("\nFrekvencni analyza:")
+freq = dict()
+for char in ABECEDA:
+    freq[char] = 0
+for char in zprava:
+    if char in freq:
+        freq[char] += 1
+celkem = sum(freq.values())
+for char in sorted(freq, key=freq.get, reverse=True):
+    analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, freq[char],
+                   float(freq[char])/celkem))
+
 # Index koincidence
 # TODO verze s mezerami
 analyza.append("\nIndexy koincidence (vzdy bez mezer):")
@@ -94,12 +120,11 @@ analyza.append(koincidence.tabulka_indexu(zprava))
 # Jakobsen
 # TODO verze bez mezer
 if mod_m:
-    analyza.append("\nJakobsen:")
+    analyza.append("\nJakobsen (s mezerami):")
     analyza.append(jakobsen.desifruj(zprava, './ref'))
 
 # Posuny v abecede
-analyza.append("\nPosuny v abecede:")
-
+# TODO najit nejvhodnejsi posuny a vypsat jenom ty
 def posun(char):
     if 65 <= ord(char) < 90:
         return chr(ord(char) + 1)
@@ -108,39 +133,29 @@ def posun(char):
     else:
         return char
 
-posunuty = zprava
-for i in range(26):
-    posunuty = map(posun, posunuty)
-    analyza.append(''.join(posunuty))
-
-# Frekvence znaku 
-analyza.append("\nFrekvencni analyza:")
-freq = dict()
-for char in ABECEDA:
-    freq[char] = 0
-for char in zprava:
-    if char in freq:
-        freq[char] += 1
-celkem = sum(freq.values())
-for char in sorted(freq, key=freq.get, reverse=True):
-    analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, freq[char],
-                   float(freq[char])/celkem))
+if 'P' in opsny or 'A' in opsny:
+    analyza.append("\nPosuny v abecede:")
+    posunuty = zprava
+    for i in range(26):
+        posunuty = map(posun, posunuty)
+        analyza.append(''.join(posunuty))
 
 # Bigramy
-analyza.append("\nBigramy podle cetnosti:")
-bigramy = dict()
-for i in ABECEDA:
-    for j in ABECEDA:
-        bigramy[i+j] = 0
-for i in range(0, len(zprava)-1):
-    if zprava[i:i+2] in bigramy:
-        bigramy[zprava[i:i+2]] += 1
-celkem = sum(bigramy.values())
-for char in sorted(bigramy, key=bigramy.get, reverse=True):
-    if bigramy[char] == 0:
-        break
-    analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, bigramy[char],
-                   float(bigramy[char])/celkem))
+if ('B' in opsny or 'A' in opsny):
+    analyza.append("\nBigramy podle cetnosti:")
+    bigramy = dict()
+    for i in ABECEDA:
+        for j in ABECEDA:
+            bigramy[i+j] = 0
+    for i in range(0, len(zprava)-1):
+        if zprava[i:i+2] in bigramy:
+            bigramy[zprava[i:i+2]] += 1
+    celkem = sum(bigramy.values())
+    for char in sorted(bigramy, key=bigramy.get, reverse=True):
+        if bigramy[char] == 0:
+            break
+        analyza.append('{0} {1:>3} {2:>6.2%}'.format(char, bigramy[char],
+                       float(bigramy[char])/celkem))
 
 # Podpis a pozdrav
 analyza.append(''.join(["\nS pozdravem\nVas Robot\n"