OpenSource/aca-tasks
3
0
Fork 0
Code Packages Projects Releases Activity

experiments

Browse Source
This commit is contained in:
Robin Dietzel 2023-11-01 21:38:09 +01:00
parent 11190a0eee
commit 038ef8f439
1 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
task1/mergesort.h
View File

@ -294,37 +294,36 @@ namespace algo {
static auto static auto
merge(typename std::vector<T>::iterator mid, std::vector<T> &left, std::vector<T> &right, merge(typename std::vector<T>::iterator mid, std::vector<T> &left, std::vector<T> &right,
Comparator cmp, std::mutex &mut) { Comparator cmp, std::mutex &mut) {
{
std::lock_guard lock(mut);
auto l = left.begin(); auto l = left.begin();
auto r = right.begin(); auto r = right.begin();
while (l < left.end() && r < right.end()) { while (l < left.end() && r < right.end()) {
if (cmp(*l, *r)) { if (cmp(*l, *r)) {
*mid = *l;
l++;
} else {
*mid = *r;
r++;
}
mid++;
}
while (l < left.end()) {
*mid = *l; *mid = *l;
mid++;
l++; l++;
} } else {
while (r < right.end()) {
*mid = *r; *mid = *r;
mid++;
r++; r++;
} }
mid++;
} }
while (l < left.end()) {
*mid = *l;
mid++;
l++;
}
while (r < right.end()) {
*mid = *r;
mid++;
r++;
}
} }
template<typename T, typename Comparator> template<typename T, typename Comparator>
static auto split(std::vector<T> &data, std::vector<T> &outdata, Comparator cmp, int depth, int &num_threads, std::mutex &mut) { static auto split(std::vector<T> &data, std::vector<T> &output, Comparator cmp, int depth, int &num_threads,
std::mutex &mut) {
if (data.size() <= 1) { if (data.size() <= 1) {
return; return;
} }
@ -333,26 +332,36 @@ namespace algo {
std::advance(mid, std::distance(data.begin(), data.end()) / 2); std::advance(mid, std::distance(data.begin(), data.end()) / 2);
std::span<T> left(data.begin(), mid); std::vector<T> left(data.begin(), mid);
std::span<T> right(mid, data.end()); std::vector<T> right(mid, data.end());
//std::vector<T> left(std::make_move_iterator(data.begin()), std::make_move_iterator(mid));
//std::vector<T> right(std::make_move_iterator(mid), std::make_move_iterator(data.end()));
if (depth < num_threads) { if (depth < num_threads) {
std::thread left_thread([&]() { split(left, outdata, cmp, depth + 1, num_threads, mut); }); std::thread left_thread([&]() { split(left, output, cmp, depth + 1, num_threads, mut); });
std::thread right_thread([&]() { split(right, outdata, cmp, depth + 1, num_threads, mut); }); std::thread right_thread([&]() { split(right, output, cmp, depth + 1, num_threads, mut); });
left_thread.join(); left_thread.join();
right_thread.join(); right_thread.join();
} else { } else {
split(left, outdata, cmp, depth + 1, num_threads, mut); split(left, output, cmp, depth + 1, num_threads, mut);
split(right, outdata, cmp, depth + 1, num_threads, mut); split(right, output, cmp, depth + 1, num_threads, mut);
} }
mid = outdata.begin(); mid = output.begin();
std::advance(mid, std::distance(outdata.begin(), outdata.end())/2); std::advance(mid, std::distance(output.begin(), output.end()) / 2);
merge(mid, left, right, cmp, mut);
std::vector<T> buf;
buf.reserve(data.size());
merge(buf.begin(), left, right, cmp, mut);
{
std::lock_guard lock(mut);
auto bufi = buf.begin();
for(auto &element : output) {
element = *bufi;
bufi++;
}
}
} }
public: public: