diff --git a/__pycache__/main.cpython-39.pyc b/__pycache__/main.cpython-39.pyc index 4e5c32d..ec42689 100644 Binary files a/__pycache__/main.cpython-39.pyc and b/__pycache__/main.cpython-39.pyc differ diff --git a/__pycache__/test_questionbot.cpython-39-pytest-7.0.1.pyc b/__pycache__/test_questionbot.cpython-39-pytest-7.0.1.pyc index efb4452..84d7fb1 100644 Binary files a/__pycache__/test_questionbot.cpython-39-pytest-7.0.1.pyc and b/__pycache__/test_questionbot.cpython-39-pytest-7.0.1.pyc differ diff --git a/asked_questions_log.txt b/asked_questions_log.txt index 15ed199..6728411 100644 --- a/asked_questions_log.txt +++ b/asked_questions_log.txt @@ -4,4 +4,5 @@ today weather test /usr/local/bin/python3 "/Volumes/GoogleDrive-100976413726208790908/My Drive/UNI/INFS 2048 - System Design and Realisation/Assessment 2B/main.py" -weather \ No newline at end of file +weather +today \ No newline at end of file diff --git a/main.py b/main.py index 155463d..ae1ece5 100644 --- a/main.py +++ b/main.py @@ -5,7 +5,7 @@ import pytest def jaccard_similarity(userQuestion, questionBank): s1 = set(userQuestion) s2 = set(questionBank) - return float(len(s1.intersection(s2)) / len(s1.union(s2))) + return float(len(s1.intersection(s2)) / len(s1.union(s2))) def most_likely(userQuestion): likelihoodScore = [] diff --git a/test_questionbot.py b/test_questionbot.py index c1d6f39..67dbf73 100644 --- a/test_questionbot.py +++ b/test_questionbot.py @@ -1,7 +1,14 @@ -from main import jaccard_similarity, most_likely +import main +import pytest -def test_CanInstantiatejaccard_similarity(): - co = jaccard_similarity(userQuestion="whats the weather like",questionBank="Sunny") +#def test_CanInstantiatejaccard_similarity(): +# co = main.jaccard_similarity(userQuestion="Weather", questionBank="Same as yesterday.") +# assert main.jaccard_similarity(float) -def test_most_likely(): - co = most_likely(userQuestion="Weather") \ No newline at end of file +def test_likelyQuestion(): + likelyQuestion = main.most_likely("weather today") + assert likelyQuestion['question'] == 'What is the weather like today?' + +def test_likelyAnswer(): + likelyAnswer = main.most_likely("weather today") + assert likelyAnswer['answer'] == 'Same as yesterday.' \ No newline at end of file