From b87be6d555bed82b6d95b622cdcc8c9aff1d13ed Mon Sep 17 00:00:00 2001 From: AlexGel17 Date: Sun, 22 Dec 2019 10:47:42 +0200 Subject: [PATCH] Update FrequencyCount project --- .gitignore | 2 ++ src/frequent_count.py | 2 +- src/main.py | 14 +++++++++++--- t8.shakespeare.txt => src/t8.shakespeare.txt | 0 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 .gitignore rename t8.shakespeare.txt => src/t8.shakespeare.txt (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f1d055 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea +__pycache__/ diff --git a/src/frequent_count.py b/src/frequent_count.py index 6fefce9..8c0f0c7 100644 --- a/src/frequent_count.py +++ b/src/frequent_count.py @@ -7,7 +7,7 @@ class FrequentCount: def __init__(self, method, fr, k): self.method = method - self.fr = re.sub(r'[^\w]', ' ', open(fr).read().lower()).split() + self.fr = fr self.k = int(k) def run(self): diff --git a/src/main.py b/src/main.py index 491d088..636c06c 100644 --- a/src/main.py +++ b/src/main.py @@ -1,7 +1,15 @@ -import sys from src.frequent_count import FrequentCount if __name__ == "__main__": - count = FrequentCount(sys.argv[1], sys.argv[2], sys.argv[3]) + + with open('/home/alex/Desktop/agf/Labor/University/Karl/FrequencyCount/t8.shakespeare.txt', 'r') as file: + inp = file.read() + inp = inp.split() + + count = FrequentCount('frequent', inp, 10) a, b, c, d = count.run() - print(d) + + print(a) + print('Most frequent seq:', b) + print('Shows on text:', c) + print('Time:', d) diff --git a/t8.shakespeare.txt b/src/t8.shakespeare.txt similarity index 100% rename from t8.shakespeare.txt rename to src/t8.shakespeare.txt