From: Tomas Musil Date: Fri, 23 Mar 2012 08:35:33 +0000 (+0100) Subject: index koinc. s mezerami X-Git-Url: http://git.tomasm.cz/krypto.git/commitdiff_plain/137c9ae19b9032326e5ed03050846799e4d703dd?ds=sidebyside;hp=3fa7f2c2cc9ab864e921709ccc0deeff35ab6831 index koinc. s mezerami --- diff --git a/koincidence.py b/koincidence.py index 07231b7..5a41dfa 100644 --- a/koincidence.py +++ b/koincidence.py @@ -1,8 +1,10 @@ from ocesavac import ocesat from collections import deque -def index_koincidence(text): - t = ocesat(text, False) #zatim bez mezer +def index_koincidence(text, mezery=False): + t = ocesat(text, mezery) + if mezery: + t = t[1:-1] deq = deque(t) shod = 0 for i in range(1, len(t)): diff --git a/robot.py b/robot.py index a49c337..a4c9c5c 100755 --- a/robot.py +++ b/robot.py @@ -129,9 +129,12 @@ for char in sorted(freq, key=freq.get, reverse=True): float(freq[char])/celkem)) # Index koincidence -# TODO verze s mezerami -analyza.append("\nIndexy koincidence (vzdy bez mezer):") -analyza.append(koincidence.tabulka_indexu(zprava)) +if mod_m: + analyza.append("\nIndex koincidence (s mezerami):") + analyza.append(koincidence.index_koincidence(zprava)) +if mod_x: + analyza.append("\nIndexy koincidence (bez mezer):") + analyza.append(koincidence.tabulka_indexu(zprava)) # Jakobsen if mod_m: