Lepsi vypis posunu

diff --git a/posuny.py b/posuny.py
index 7145900..07879a3 100644 (file)
--- a/posuny.py
+++ b/posuny.py
@@ -18,7 +18,7 @@ def vsechny(zprava):
     for i in range(26):
         posunuty = map(posun, posunuty)
         analyza.append(''.join(posunuty))
     for i in range(26):
         posunuty = map(posun, posunuty)
         analyza.append(''.join(posunuty))

-    return '\n'.join(analyza)
+    return analyza

 
 def eu_vzdalenost(v1, v2):
     return sum([(x - y)**2 for (x, y) in zip(v1, v2)])
 
 def eu_vzdalenost(v1, v2):
     return sum([(x - y)**2 for (x, y) in zip(v1, v2)])

diff --git a/robot.py b/robot.py
index bebce87..87c97f9 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -128,12 +128,14 @@ if mod_x:
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)

-analyza.append("\nNejlepsi posun ({0}):".format(posun))
-analyza.append(posunuty_text)
+

 
 if 'P' in opsny or 'A' in opsny:
 
 if 'P' in opsny or 'A' in opsny:

-    analyza.append("\nPosuny v abecede:")
-    analyza.append(posuny.vsechny(zprava))
+    analyza.append("\nPosuny v abecede (nejlepsi posun {0}):".format(posun))
+    analyza.append("{0} {1}".format(i, posuny.vsechny(zprava)[i]) for i in range(26))
+else:
+    analyza.append("\nNejlepsi posun ({0}):".format(posun))
+    analyza.append(posunuty_text)

 
 # Bigramy
 if ('B' in opsny or 'A' in opsny):
 
 # Bigramy
 if ('B' in opsny or 'A' in opsny):