Don't need that first argument. Can be enclosed internally to the maps

This commit is contained in:
Crista Lopes
2014-01-02 17:10:43 -08:00
parent 1d6cec0d33
commit 28cdd919e8

View File

@@ -22,29 +22,29 @@ def increment_count(obj, w):
data_storage_obj = { data_storage_obj = {
'data' : [], 'data' : [],
'init' : lambda obj, path_to_file : extract_words(obj, path_to_file), 'init' : lambda path_to_file : extract_words(data_storage_obj, path_to_file),
'words' : lambda obj : obj['data'] 'words' : lambda : data_storage_obj['data']
} }
stop_words_obj = { stop_words_obj = {
'stop_words' : [], 'stop_words' : [],
'init' : lambda obj : load_stop_words(obj), 'init' : lambda : load_stop_words(stop_words_obj),
'is_stop_word' : lambda obj, word : word in obj['stop_words'] 'is_stop_word' : lambda word : word in stop_words_obj['stop_words']
} }
word_freqs_obj = { word_freqs_obj = {
'freqs' : {}, 'freqs' : {},
'increment_count' : lambda obj, w : increment_count(obj, w), 'increment_count' : lambda w : increment_count(word_freqs_obj, w),
'sorted' : lambda obj : sorted(obj['freqs'].iteritems(), key=operator.itemgetter(1), reverse=True) 'sorted' : lambda : sorted(word_freqs_obj['freqs'].iteritems(), key=operator.itemgetter(1), reverse=True)
} }
data_storage_obj['init'](data_storage_obj, sys.argv[1]) data_storage_obj['init'](sys.argv[1])
stop_words_obj['init'](stop_words_obj) stop_words_obj['init']()
for w in data_storage_obj['words'](data_storage_obj): for w in data_storage_obj['words']():
if not stop_words_obj['is_stop_word'](stop_words_obj, w): if not stop_words_obj['is_stop_word'](w):
word_freqs_obj['increment_count'](word_freqs_obj, w) word_freqs_obj['increment_count'](w)
word_freqs = word_freqs_obj['sorted'](word_freqs_obj) word_freqs = word_freqs_obj['sorted']()
for (w, c) in word_freqs[0:25]: for (w, c) in word_freqs[0:25]:
print w, ' - ', c print w, ' - ', c