mandlm/VectorSearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: use std::forward_list for results

Browse source
This commit is contained in:
Michael Mandl 2024-03-20 13:25:28 +01:00
parent 510deb2d54
commit ba460cc00a
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7
8 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib_vector_search/include/finder.h
View file

@ -1,12 +1,14 @@
#pragma once
#include <forward_list>
#include <string>
#include <vector>
using std::string, std::string_view, std::vector;
using std::string, std::string_view, std::forward_list;
class Finder {
public:
virtual ~Finder() = default;
virtual vector<const string *> find_prefix(string_view search_term) const = 0;
virtual forward_list<const string *>
find_prefix(string_view search_term) const = 0;
};

7
lib_vector_search/include/linear_finder.h
View file

@ -2,11 +2,16 @@
#include "finder.h"
#include <vector>
using std::vector;
class LinearFinder : public Finder {
private:
const vector<string> &word_list_;
public:
LinearFinder(const vector<string> &word_list);
vector<const string *> find_prefix(string_view search_term) const override;
forward_list<const string *>
find_prefix(string_view search_term) const override;
};

10
lib_vector_search/include/parallel_finder.h
View file

@ -2,12 +2,16 @@
#include "finder.h"
#include <vector>
class ParallelFinder : public Finder {
private:
const size_t thread_count_;
const vector<string> &word_list_;
const std::vector<string> &word_list_;
public:
ParallelFinder(const vector<string> &word_list, size_t thread_count);
vector<const string *> find_prefix(string_view search_term) const override;
ParallelFinder(const std::vector<string> &word_list, size_t thread_count);
std::forward_list<const std::string *>
find_prefix(std::string_view search_term) const override;
};

6
lib_vector_search/src/linear_finder.cpp
View file

@ -3,13 +3,13 @@
LinearFinder::LinearFinder(const vector<string> &word_list)
: word_list_(word_list) {}
vector<const string *>
forward_list<const string *>
LinearFinder::find_prefix(string_view search_term) const {
vector<const string *> matching_words;
forward_list<const string *> matching_words;
for (const auto &current_word : word_list_) {
if (current_word.starts_with(search_term)) {
matching_words.push_back(&current_word);
matching_words.push_front(&current_word);
}
}

12
lib_vector_search/src/parallel_finder.cpp
View file

@ -3,15 +3,15 @@
#include <mutex>
#include <thread>
using std::mutex, std::thread, std::lock_guard;
using std::mutex, std::thread, std::lock_guard, std::vector, std::forward_list;
ParallelFinder::ParallelFinder(const vector<string> &word_list,
size_t thread_count)
: word_list_(word_list), thread_count_(thread_count) {}
vector<const string *>
forward_list<const string *>
ParallelFinder::find_prefix(string_view search_term) const {
vector<const string *> result;
forward_list<const string *> result;
mutex result_mutex;
vector<thread> threads;
@ -25,13 +25,13 @@ ParallelFinder::find_prefix(string_view search_term) const {
threads.emplace_back(
[](const vector<string> &word_list, const string_view &search_term,
vector<const string *> &result, size_t start_index, size_t end_index,
mutex &result_mutex) {
forward_list<const string *> &result, size_t start_index,
size_t end_index, mutex &result_mutex) {
for (size_t index = start_index; index < end_index; ++index) {
const auto &current_word = word_list[index];
if (current_word.starts_with(search_term)) {
const lock_guard<mutex> lock(result_mutex);
result.push_back(&current_word);
result.push_front(&current_word);
}
}
},