X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=language_models.py;h=8824bca4597327623798382288c2bcffb9d8005b;hb=373d3077e562c81fe35d0f68e6b8e10983908b6c;hp=929746888d036fb54de3f1fbf228e296e0bcd027;hpb=394bcd0c89bbc6de8e9473002a27c673ee8daa43;p=cipher-tools.git

diff --git a/language_models.py b/language_models.py
index 9297468..8824bca 100644
--- a/language_models.py
+++ b/language_models.py
@@ -5,6 +5,9 @@ import collections
 import unicodedata
 import itertools
 from math import log10
+import os 
+
+unaccent_specials = ''.maketrans({"’": "'", '“': '"', '”': '"'})
 
 def letters(text):
     """Remove all non-alphabetic characters from a text
@@ -31,7 +34,8 @@ def unaccent(text):
     >>> unaccent('HÉLLÖ')
     'HELLO'
     """
-    return unicodedata.normalize('NFKD', text).\
+    translated_text = text.translate(unaccent_specials)
+    return unicodedata.normalize('NFKD', translated_text).\
         encode('ascii', 'ignore').\
         decode('utf-8')
 
@@ -53,7 +57,7 @@ def sanitise(text):
 def datafile(name, sep='\t'):
     """Read key,value pairs from file.
     """
-    with open(name, 'r') as f:
+    with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), name), 'r') as f:
         for line in f:
             splits = line.split(sep)
             yield [splits[0], int(splits[1])]
@@ -67,7 +71,7 @@ normalised_english_bigram_counts = norms.normalise(english_bigram_counts)
 english_trigram_counts = collections.Counter(dict(datafile('count_3l.txt')))
 normalised_english_trigram_counts = norms.normalise(english_trigram_counts)
 
-with open('words.txt', 'r') as f:
+with open(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'words.txt'), 'r') as f:
     keywords = [line.rstrip() for line in f]