From f0b4789e58d3e438793e8682bd21bc0f8e3efa67 Mon Sep 17 00:00:00 2001 From: robtor Date: Tue, 7 Nov 2023 11:45:49 +0100 Subject: [PATCH] fix comparability --- task1/main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/task1/main.cpp b/task1/main.cpp index 599631b..c201f9b 100644 --- a/task1/main.cpp +++ b/task1/main.cpp @@ -57,9 +57,10 @@ auto main(int argc, char *argv[]) -> int { auto dataset_seq = dataset; auto t1 = std::chrono::high_resolution_clock::now(); - algo::MergeSort_mt::sort(dataset_seq, [](int32_t a, int32_t b) { - return (a > b); + MergeSorterMT msst([](int32_t a, int32_t b) { + return (a>b); }, 0); + msst.sort(dataset_seq); auto t2 = std::chrono::high_resolution_clock::now(); auto t_seq = std::chrono::duration_cast(t2 - t1); @@ -70,10 +71,10 @@ auto main(int argc, char *argv[]) -> int { const int max_depth = std::log(threads); t1 = std::chrono::high_resolution_clock::now(); - MergeSorterMT ms([](int32_t a, int32_t b) { + MergeSorterMT msmt([](int32_t a, int32_t b) { return (a>b); }, max_depth); - ms.sort(dataset_par); + msmt.sort(dataset_par); t2 = std::chrono::high_resolution_clock::now(); auto t_par = std::chrono::duration_cast(t2 - t1);