feat: use std::forward_list for results

main
mandlm 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

View File

@ -7,8 +7,8 @@
#include "timer.h"
#include "word_list_generator.h"
#include <thread>
#include <sstream>
#include <thread>
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow) {
@ -51,8 +51,8 @@ void MainWindow::search(const QString &search_term) {
timer.stop();
std::stringstream status_message;
status_message << "search took " << timer << ", found " << results.size()
<< " results";
status_message << "search took " << timer << ", found "
<< std::distance(results.begin(), results.end()) << " results";
ui->mainStatusBar->showMessage(QString::fromStdString(status_message.str()));
showResults(results);
@ -71,7 +71,8 @@ std::unique_ptr<Finder> MainWindow::createSelectedFinder() const {
}
}
void MainWindow::showResults(const std::vector<const std::string *> &results) {
void MainWindow::showResults(
const std::forward_list<const std::string *> &results) {
QStringList ui_results;
for (auto word : results) {
ui_results.append(QString::fromStdString(*word));

View File

@ -29,7 +29,7 @@ private:
void generateWordList();
void search(const QString &search_term);
std::unique_ptr<Finder> createSelectedFinder() const;
void showResults(const std::vector<const std::string *> &results);
void showResults(const std::forward_list<const std::string *> &results);
private slots:
void on_searchInput_textChanged(const QString &search_term);

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;
};

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;
};

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;
};

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);
}
}

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);
}
}
},

View File

@ -35,7 +35,8 @@ void test_linear_finder(const vector<string> &word_list) {
find_timer.stop();
cout << "linear finder took " << find_timer << endl;
cout << "result list is " << result.size() << " element(s) long" << endl;
cout << "result list is " << std::distance(result.cbegin(), result.cend())
<< " element(s) long" << endl;
}
void test_parallel_finder(const vector<string> &word_list) {
@ -54,7 +55,8 @@ void test_parallel_finder(const vector<string> &word_list) {
find_timer.stop();
cout << "parallel finder took " << find_timer << endl;
cout << "result list is " << result.size() << " element(s) long" << endl;
cout << "result list is " << std::distance(result.cbegin(), result.cend())
<< " element(s) long" << endl;
}
int main(int argc, char *argv[]) {