drobnosti

diff --git a/posuny.py b/posuny.py
index ac99e0b..fd08e8c 100644 (file)
--- a/posuny.py
+++ b/posuny.py
@@ -1,6 +1,5 @@
 """Modul pro praci s posuny v abecede."""
 
 """Modul pro praci s posuny v abecede."""
 

-import referencni

 from referencni import reference
 from ocesavac import ocesat
 from spolecne import ABECEDA
 from referencni import reference
 from ocesavac import ocesat
 from spolecne import ABECEDA


@@ -52,4 +51,4 @@ def nej_posun(text):
         if nova_vzdalenost < vzdalenost:
             vzdalenost = nova_vzdalenost
             posunuti = i
         if nova_vzdalenost < vzdalenost:
             vzdalenost = nova_vzdalenost
             posunuti = i

-    return posunuti
\ No newline at end of file
+    return posunuti

diff --git a/referencni.py b/referencni.py
index d1a89ea..692b4aa 100644 (file)
--- a/referencni.py
+++ b/referencni.py
@@ -65,14 +65,20 @@ def nacti(odkud):
 
 def tiskni(sref):
     r = nacti(sref)
 
 def tiskni(sref):
     r = nacti(sref)

-    d = dict(zip(r.abeceda, r.frekvence))
+    slovnik = dict(zip(r.abeceda, r.frekvence))

     for i in range(len(r.abeceda)):
     for i in range(len(r.abeceda)):

-        print "{0} {1:>6.2%}   {2} {3:>6.2%}".format(r.abeceda[i], r.frekvence[i], r.poradi[i], d[r.poradi[i]] )
+        print "{0} {1:>6.2%}   {2} {3:>6.2%}".format(
+            r.abeceda[i],
+            r.frekvence[i],
+            r.poradi[i],
+            slovnik[r.poradi[i]] )

     print " "
     print "Index koincidence: {0:>5.2%}".format(r.index_koinc)
     print " "
     for char in r.abeceda:
     print " "
     print "Index koincidence: {0:>5.2%}".format(r.index_koinc)
     print " "
     for char in r.abeceda:

-        print char + " " + " ".join(["{:0>5.2f}".format(r.tabulka[char][ch2] * 1000) for ch2 in r.abeceda])
+        print char + " " + " ".join(
+            ["{:0>5.2f}".format(r.tabulka[char][ch2] * 1000)
+                for ch2 in r.abeceda])

 
 def prumerny_index(tref):
     suma = 0
 
 def prumerny_index(tref):
     suma = 0

diff --git a/spolecne.py b/spolecne.py
index 720783f..755cbce 100644 (file)
--- a/spolecne.py
+++ b/spolecne.py
@@ -1,6 +1,9 @@
+"""Modul konstant a jednoduchych funkci, ktere pouzivaji vsechny ostatni
+moduly."""
+

 ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 MABECEDA = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 def cisla_na_text(cisla):
     """Z pole cisel udela textovy retezec (1 = A, ...)."""
 ABECEDA = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 MABECEDA = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 def cisla_na_text(cisla):
     """Z pole cisel udela textovy retezec (1 = A, ...)."""

-    return ''.join([MABECEDA[c] for c in cisla])
\ No newline at end of file
+    return ''.join([MABECEDA[c] for c in cisla])

diff --git a/vigenere.py b/vigenere.py
index 01be7d2..6f3f741 100644 (file)
--- a/vigenere.py
+++ b/vigenere.py
@@ -14,5 +14,5 @@ def vysledek(zprava, delka_h):
     rozklady = rozklad(ocesat(zprava, False), delka_h)
     posuny = [nej_posun(text) for text in rozklady]
     posunute = [''.join([posun(c, posuny[i]) for c in rozklady[i]]) for i in range(len(posuny))]
     rozklady = rozklad(ocesat(zprava, False), delka_h)
     posuny = [nej_posun(text) for text in rozklady]
     posunute = [''.join([posun(c, posuny[i]) for c in rozklady[i]]) for i in range(len(posuny))]

-    vysledek = [x for x  in reduce(soucet, (map(None, *posunute)[i] for i in range(len(rozklady[0])))) if x != None]
+    vysledek = [x for x  in reduce(soucet, (map(None, *posunute)[i] for i in range(len(rozklady[0])))) if x]

     return cisla_na_text(posuny), ''.join(vysledek)
     return cisla_na_text(posuny), ''.join(vysledek)