From ad8a9ada833d58bd27f6f8cee634e4bbe77fef90 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Wed, 20 Mar 2024 20:51:16 +0100 Subject: [PATCH] refactor: remove using from header files --- lib_vector_search/include/finder.h | 6 ++---- lib_vector_search/include/grouped_finder.h | 2 +- lib_vector_search/include/linear_finder.h | 8 ++++---- lib_vector_search/include/parallel_finder.h | 4 ++-- lib_vector_search/include/tree_finder.h | 4 ++-- lib_vector_search/src/grouped_finder.cpp | 4 +++- lib_vector_search/src/linear_finder.cpp | 4 ++++ lib_vector_search/src/parallel_finder.cpp | 3 ++- lib_vector_search/src/tree_finder.cpp | 22 +++++++++++---------- 9 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib_vector_search/include/finder.h b/lib_vector_search/include/finder.h index 1266392..a8b1d77 100644 --- a/lib_vector_search/include/finder.h +++ b/lib_vector_search/include/finder.h @@ -3,12 +3,10 @@ #include #include -using std::string, std::string_view, std::forward_list; - class Finder { public: virtual ~Finder() = default; - virtual forward_list - find_prefix(string_view search_term) const = 0; + virtual std::forward_list + find_prefix(std::string_view search_term) const = 0; }; diff --git a/lib_vector_search/include/grouped_finder.h b/lib_vector_search/include/grouped_finder.h index 93d06ac..060b437 100644 --- a/lib_vector_search/include/grouped_finder.h +++ b/lib_vector_search/include/grouped_finder.h @@ -10,7 +10,7 @@ private: std::map> groups_; public: - GroupedFinder(const std::vector &word_list); + GroupedFinder(const std::vector &word_list); virtual std::forward_list find_prefix(std::string_view search_term) const override; diff --git a/lib_vector_search/include/linear_finder.h b/lib_vector_search/include/linear_finder.h index 646c248..35201d9 100644 --- a/lib_vector_search/include/linear_finder.h +++ b/lib_vector_search/include/linear_finder.h @@ -8,10 +8,10 @@ using std::vector; class LinearFinder : public Finder { private: - const vector &word_list_; + const vector &word_list_; public: - LinearFinder(const vector &word_list); - forward_list - find_prefix(string_view search_term) const override; + LinearFinder(const vector &word_list); + std::forward_list + find_prefix(std::string_view search_term) const override; }; diff --git a/lib_vector_search/include/parallel_finder.h b/lib_vector_search/include/parallel_finder.h index ad2d7e0..1e8b527 100644 --- a/lib_vector_search/include/parallel_finder.h +++ b/lib_vector_search/include/parallel_finder.h @@ -6,10 +6,10 @@ class ParallelFinder : public Finder { private: - const std::vector &word_list_; + const std::vector &word_list_; public: - ParallelFinder(const std::vector &word_list); + ParallelFinder(const std::vector &word_list); std::forward_list find_prefix(std::string_view search_term) const override; diff --git a/lib_vector_search/include/tree_finder.h b/lib_vector_search/include/tree_finder.h index 6117573..ffac545 100644 --- a/lib_vector_search/include/tree_finder.h +++ b/lib_vector_search/include/tree_finder.h @@ -11,7 +11,7 @@ private: std::map children_; public: - void insert(std::string_view partial_word, const string *original_word); + void insert(std::string_view partial_word, const std::string *original_word); const SearchTreeNode *find(std::string_view search_term) const; std::forward_list words() const; @@ -27,7 +27,7 @@ private: SearchTree search_tree_; public: - TreeFinder(const std::vector &word_list); + TreeFinder(const std::vector &word_list); virtual std::forward_list find_prefix(std::string_view search_term) const override; diff --git a/lib_vector_search/src/grouped_finder.cpp b/lib_vector_search/src/grouped_finder.cpp index 81ec7f8..20e4d67 100644 --- a/lib_vector_search/src/grouped_finder.cpp +++ b/lib_vector_search/src/grouped_finder.cpp @@ -1,10 +1,12 @@ #include "grouped_finder.h" +#include #include #include #include -using std::mutex, std::vector, std::thread, std::lock_guard; +using std::mutex, std::vector, std::thread, std::lock_guard, std::string, + std::forward_list, std::string_view; GroupedFinder::GroupedFinder(const std::vector &word_list) { for (const auto &word : word_list) { diff --git a/lib_vector_search/src/linear_finder.cpp b/lib_vector_search/src/linear_finder.cpp index 0c4705e..45525ac 100644 --- a/lib_vector_search/src/linear_finder.cpp +++ b/lib_vector_search/src/linear_finder.cpp @@ -1,4 +1,8 @@ #include "linear_finder.h" +#include +#include + +using std::string, std::forward_list, std::string_view; LinearFinder::LinearFinder(const vector &word_list) : word_list_(word_list) {} diff --git a/lib_vector_search/src/parallel_finder.cpp b/lib_vector_search/src/parallel_finder.cpp index e4d5459..441cadb 100644 --- a/lib_vector_search/src/parallel_finder.cpp +++ b/lib_vector_search/src/parallel_finder.cpp @@ -3,7 +3,8 @@ #include #include -using std::mutex, std::thread, std::lock_guard, std::vector, std::forward_list; +using std::mutex, std::thread, std::lock_guard, std::vector, std::forward_list, + std::string, std::string_view; ParallelFinder::ParallelFinder(const vector &word_list) : word_list_(word_list) {} diff --git a/lib_vector_search/src/tree_finder.cpp b/lib_vector_search/src/tree_finder.cpp index 9b94682..2367d98 100644 --- a/lib_vector_search/src/tree_finder.cpp +++ b/lib_vector_search/src/tree_finder.cpp @@ -1,17 +1,19 @@ #include "tree_finder.h" -void SearchTreeNode::insert(std::string_view partial_word, +using std::string, std::string_view, std::forward_list, std::vector; + +void SearchTreeNode::insert(string_view partial_word, const string *original_word) { if (partial_word.empty()) { words_.push_front(original_word); } else { children_[partial_word.front()].insert( - std::string_view(partial_word).substr(1, partial_word.length()), + string_view(partial_word).substr(1, partial_word.length()), original_word); } } -const SearchTreeNode *SearchTreeNode::find(std::string_view search_term) const { +const SearchTreeNode *SearchTreeNode::find(string_view search_term) const { if (search_term.empty()) { return this; } @@ -24,8 +26,8 @@ const SearchTreeNode *SearchTreeNode::find(std::string_view search_term) const { return nullptr; } -std::forward_list SearchTreeNode::words() const { - std::forward_list results(words_); +forward_list SearchTreeNode::words() const { + forward_list results(words_); for (const auto &child : children_) { results.merge(child.second.words()); } @@ -33,17 +35,17 @@ std::forward_list SearchTreeNode::words() const { return results; }; -SearchTree::SearchTree(const std::vector &word_list) { +SearchTree::SearchTree(const vector &word_list) { for (const auto &word : word_list) { - insert(std::string_view(word), &word); + insert(string_view(word), &word); } } -TreeFinder::TreeFinder(const std::vector &word_list) +TreeFinder::TreeFinder(const vector &word_list) : search_tree_(word_list) {} -std::forward_list -TreeFinder::find_prefix(std::string_view search_term) const { +forward_list +TreeFinder::find_prefix(string_view search_term) const { const auto *result_node = search_tree_.find(search_term); if (result_node == nullptr) { return {};