vigenere

[krypto.git] / referencni.py

diff --git a/referencni.py b/referencni.py
index 5afbd86..06bfeec 100644 (file)
--- a/referencni.py
+++ b/referencni.py
@@ -5,9 +5,7 @@ import pickle
 from ocesavac import ocesat
 import codecs
 from koincidence import index_koincidence
 from ocesavac import ocesat
 import codecs
 from koincidence import index_koincidence

-
-ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-MABECEDA = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+from spolecne import ABECEDA, MABECEDA

 
 def nova_tabulka(tabulka, abc=MABECEDA):
     celkem = sum(sum(tab2.values()) for tab2 in tabulka.values())
 
 def nova_tabulka(tabulka, abc=MABECEDA):
     celkem = sum(sum(tab2.values()) for tab2 in tabulka.values())


@@ -69,5 +67,5 @@ def prumerny_index(tref):
         f = codecs.open(soubor, encoding='UTF-8')
         text = ocesat(f.read(), tref.mezery)
         f.close()
         f = codecs.open(soubor, encoding='UTF-8')
         text = ocesat(f.read(), tref.mezery)
         f.close()

-        suma += index_koincidence(text[:len(text)/2], text[len(text)/2:])
+        suma += index_koincidence2(text[:len(text)/2], text[len(text)/2:])

     return float(suma)/len(tref.soubory)
     return float(suma)/len(tref.soubory)