X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=language_models.py;h=babbea19ceed80bd9d95fee347c64e53256b5626;hb=32a4467e6f7ac8ff2e6738118242ec4e4c255e8a;hp=173de64c18c39b40beb2bbe1c208dfc50dede48f;hpb=1f41381fedf8f2177de235687e45d7d82e3d099b;p=cipher-training.git

diff --git a/language_models.py b/language_models.py
index 173de64..babbea1 100644
--- a/language_models.py
+++ b/language_models.py
@@ -1,6 +1,10 @@
+"""Language-specific functions, including models of languages based on data of
+its use.
+"""
+
 import string
-import norms
 import random
+import norms
 import collections
 import unicodedata
 import itertools
@@ -16,7 +20,7 @@ def letters(text):
     return ''.join([c for c in text if c in string.ascii_letters])
 
 def unaccent(text):
-    """Remove all accents from letters. 
+    """Remove all accents from letters.
     It does this by converting the unicode string to decomposed compatability
     form, dropping all the combining accents, then re-encoding the bytes.
 
@@ -37,7 +41,7 @@ def unaccent(text):
 
 def sanitise(text):
     """Remove all non-alphabetic characters and convert the text to lowercase
-    
+
     >>> sanitise('The Quick')
     'thequick'
     >>> sanitise('The Quick BROWN fox jumped! over... the (9lazy) DOG')
@@ -72,20 +76,20 @@ with open('words.txt', 'r') as f:
 
 
 def weighted_choice(d):
-	"""Generate random item from a dictionary of item counts
-	"""
-	target = random.uniform(0, sum(d.values()))
-	cuml = 0.0
-	for (l, p) in d.items():
-		cuml += p
-		if cuml > target:
-			return l
-	return None
+    """Generate random item from a dictionary of item counts
+    """
+    target = random.uniform(0, sum(d.values()))
+    cuml = 0.0
+    for (l, p) in d.items():
+        cuml += p
+        if cuml > target:
+            return l
+    return None
 
 def random_english_letter():
-	"""Generate a random letter based on English letter counts
-	"""
-	return weighted_choice(normalised_english_counts)
+    """Generate a random letter based on English letter counts
+    """
+    return weighted_choice(normalised_english_counts)
 
 
 def ngrams(text, n):
@@ -148,7 +152,7 @@ def Pbigrams(letters):
     return sum(P2l[p] for p in ngrams(letters, 2))
 
 def Ptrigrams(letters):
-    """The Naive Bayes log probability of the bigrams formed from a sequence 
+    """The Naive Bayes log probability of the trigrams formed from a sequence 
     of letters.
     """
     return sum(P3l[p] for p in ngrams(letters, 3))