diff --git a/lab2/Makefile b/lab2/Makefile index aaa709f..0b87009 100644 --- a/lab2/Makefile +++ b/lab2/Makefile @@ -12,7 +12,7 @@ edit: test_edit_distance.o edit_distance.o @echo "Building & linking $@" @$(CXX) $(CXXFLAGS) $^ -o $@ -spell: spell.o word.o dictionary.o edit_distance.o +spell: spell.o word.o dictionary.o @echo "Building & linking $@" @$(CXX) $(CXXFLAGS) $^ -o $@ diff --git a/lab2/dictionary.cc b/lab2/dictionary.cc index ac522ff..7bfd397 100644 --- a/lab2/dictionary.cc +++ b/lab2/dictionary.cc @@ -1,5 +1,4 @@ #include "dictionary.h" -#include "edit_distance.h" #include "word.h" #include #include @@ -57,12 +56,19 @@ void Dictionary::add_trigram_suggestions(std::vector &suggestions, void Dictionary::rank_suggestions(std::vector &suggestions, const std::string &word) const { - // Sort suggestions based on the levenshtein distance + // Get trigrams of the input word + Word input_word(word); + const std::vector &input_trigrams = input_word.get_triagrams(); + + // Sort suggestions based on the number of matching trigrams std::sort(suggestions.begin(), suggestions.end(), [&](const std::string &a, const std::string &b) { - auto dist_a = edit_distance(a, word); - auto dist_b = edit_distance(b, word); - return dist_a < dist_b; + Word word_a(a); + Word word_b(b); + unsigned int match_a = word_a.get_matches(input_trigrams); + unsigned int match_b = word_b.get_matches(input_trigrams); + return match_a > + match_b; // Sort in descending order of match count }); }