Simplified things a bit
This commit is contained in:
@@ -1,58 +1,39 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
|
|
||||||
import sys, re, operator, string
|
import sys, re, operator, string
|
||||||
from abc import ABCMeta
|
from abc import ABCMeta
|
||||||
|
|
||||||
#
|
#
|
||||||
# The classes
|
# The classes
|
||||||
#
|
#
|
||||||
class TFExercise(object):
|
class TFExercise():
|
||||||
__metaclass__ = ABCMeta
|
__metaclass__ = ABCMeta
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
return self.__class__.__name__ + ": No major data structure"
|
return self.__class__.__name__
|
||||||
|
|
||||||
class DataStorageManager(TFExercise):
|
class DataStorageManager(TFExercise):
|
||||||
""" Models the contents of the file """
|
""" Models the contents of the file """
|
||||||
_data = ''
|
_data = ''
|
||||||
def __init__(self, path_to_file):
|
def __init__(self, path_to_file):
|
||||||
f = open(path_to_file)
|
with open(path_to_file) as f:
|
||||||
self._data = f.read()
|
self._data = f.read()
|
||||||
f.close()
|
|
||||||
self.__filter_chars()
|
|
||||||
self.__normalize()
|
|
||||||
|
|
||||||
def __filter_chars(self):
|
|
||||||
"""
|
|
||||||
Takes a string and returns a copy with all nonalphanumeric chars
|
|
||||||
replaced by white space
|
|
||||||
"""
|
|
||||||
pattern = re.compile('[\W_]+')
|
pattern = re.compile('[\W_]+')
|
||||||
self._data = pattern.sub(' ', self._data)
|
self._data = pattern.sub(' ', self._data).lower()
|
||||||
|
|
||||||
def __normalize(self):
|
|
||||||
"""
|
|
||||||
Takes a string and returns a copy with all characters in lower case
|
|
||||||
"""
|
|
||||||
self._data = self._data.lower()
|
|
||||||
|
|
||||||
def words(self):
|
def words(self):
|
||||||
"""
|
""" Returns the list words in storage """
|
||||||
Returns the list words in storage
|
|
||||||
"""
|
|
||||||
data_str = ''.join(self._data)
|
data_str = ''.join(self._data)
|
||||||
return data_str.split()
|
return data_str.split()
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
return self.__class__.__name__ + ": My major data structure is a " + self._data.__class__.__name__
|
return super(DataStorageManager, self).info() + ": My major data structure is a " + self._data.__class__.__name__
|
||||||
|
|
||||||
class StopWordManager(TFExercise):
|
class StopWordManager(TFExercise):
|
||||||
""" Models the stop word filter """
|
""" Models the stop word filter """
|
||||||
_stop_words = []
|
_stop_words = []
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
f = open('../stop_words.txt')
|
with open('../stop_words.txt') as f:
|
||||||
self._stop_words = f.read().split(',')
|
self._stop_words = f.read().split(',')
|
||||||
f.close()
|
|
||||||
# add single-letter words
|
# add single-letter words
|
||||||
self._stop_words.extend(list(string.ascii_lowercase))
|
self._stop_words.extend(list(string.ascii_lowercase))
|
||||||
|
|
||||||
@@ -60,7 +41,7 @@ class StopWordManager(TFExercise):
|
|||||||
return word in self._stop_words
|
return word in self._stop_words
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
return self.__class__.__name__ + ": My major data structure is a " + self._stop_words.__class__.__name__
|
return super(StopWordManager, self).info() + ": My major data structure is a " + self._stop_words.__class__.__name__
|
||||||
|
|
||||||
class WordFrequencyManager(TFExercise):
|
class WordFrequencyManager(TFExercise):
|
||||||
""" Keeps the word frequency data """
|
""" Keeps the word frequency data """
|
||||||
@@ -76,8 +57,7 @@ class WordFrequencyManager(TFExercise):
|
|||||||
return sorted(self._word_freqs.iteritems(), key=operator.itemgetter(1), reverse=True)
|
return sorted(self._word_freqs.iteritems(), key=operator.itemgetter(1), reverse=True)
|
||||||
|
|
||||||
def info(self):
|
def info(self):
|
||||||
return self.__class__.__name__ + ": My major data structure is a " + self._word_freqs.__class__.__name__
|
return super(WordFrequencyManager, self).info() + ": My major data structure is a " + self._word_freqs.__class__.__name__
|
||||||
|
|
||||||
|
|
||||||
class WordFrequencyController(TFExercise):
|
class WordFrequencyController(TFExercise):
|
||||||
def __init__(self, path_to_file):
|
def __init__(self, path_to_file):
|
||||||
@@ -91,8 +71,8 @@ class WordFrequencyController(TFExercise):
|
|||||||
self._word_freq_manager.increment_count(w)
|
self._word_freq_manager.increment_count(w)
|
||||||
|
|
||||||
word_freqs = self._word_freq_manager.sorted()
|
word_freqs = self._word_freq_manager.sorted()
|
||||||
for tf in word_freqs[0:25]:
|
for (w, c) in word_freqs[0:25]:
|
||||||
print tf[0], ' - ', tf[1]
|
print w, ' - ', c
|
||||||
|
|
||||||
#
|
#
|
||||||
# The main function
|
# The main function
|
||||||
|
|||||||
Reference in New Issue
Block a user