index koincidence pro kratke zpravy

[krypto.git] / koincidence.py

diff --git a/koincidence.py b/koincidence.py
index b471a20..f49174b 100644 (file)
--- a/koincidence.py
+++ b/koincidence.py
@@ -32,14 +32,11 @@ def index_rozkladu(text, deleni):
 
 def tabulka_indexu(text):
     """Vypise tabulku prumernych indexu pro ruzna deleni textu."""
-    return '\n'.join(['{1:>2} {0:.3%}'.format(
-        index_rozkladu(text, d), d) for d in range(1, 11)])
+    n = min((len(text)/3), 11)
+    return '\n'.join(['{1:>2} {0:>7.3%}'.format(
+        index_rozkladu(text, d), d) for d in range(1, n)])
 
 def rozklad(text, deleni):
     """Vrati pole retezcu, v kazdem jsou znaky z puvodniho textu jejichz pozice
     ma stejny zbytek po deleni cislem 'deleni'."""
-    texty = []
-    for i in range(deleni):
-        texty.append(''.join(
-            [text[j] for j in range(len(text)) if j % deleni == i]))
-    return texty
+    return [text[i::deleni] for i in range(deleni)]