From bf5a93788081d6e72916955fc10a4b5032ef1e24 Mon Sep 17 00:00:00 2001 From: Sebastian Menzel Date: Mon, 22 Jan 2024 12:54:06 +0100 Subject: [PATCH 1/3] solved issues in benchmark_numbers.cpp --- benchmark/single/benchmark_numbers.cpp | 62 +++++++++++++------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/benchmark/single/benchmark_numbers.cpp b/benchmark/single/benchmark_numbers.cpp index 5da2a36..3d49c34 100644 --- a/benchmark/single/benchmark_numbers.cpp +++ b/benchmark/single/benchmark_numbers.cpp @@ -175,33 +175,31 @@ void Generator_sorted_end (size_t n_last) void Generator_sorted_middle (size_t n_last) { vector A, B, C; - A.reserve (NELEM); - A.clear (); - if (fill_vector_uint64 ("input.bin", A, NELEM + n_last) != 0) + A.reserve(NELEM); + A.clear(); + if (fill_vector_uint64("input.bin", A, NELEM + n_last) != 0) { std::cout << "Error in the input file\n"; return; }; - for (size_t i = NELEM; i < A.size (); ++i) - B.push_back (std::move (A[i])); - A.resize ( NELEM); - for (size_t i = 0; i < (NELEM >> 1); ++i) - std::swap (A[i], A[NELEM - 1 - i]); + for (size_t i = NELEM; i < A.size(); ++i) + B.push_back(std::move(A[i])); + A.resize(NELEM); - std::sort (A.begin (), A.end ()); - size_t step = NELEM / n_last + 1; + std::sort(A.begin(), A.end()); + size_t step = NELEM / n_last; size_t pos = 0; - for (size_t i = 0; i < B.size (); ++i, pos += step) + for (size_t i = 0; i < B.size(); ++i, pos += step) { - C.push_back (B[i]); + C.push_back(B[i]); for (size_t k = 0; k < step; ++k) - C.push_back (A[pos + k]); + C.push_back(A.at(pos + k)); }; - while (pos < A.size ()) - C.push_back (A[pos++]); + while (pos < A.size()) + C.push_back(A[pos++]); A = C; - Test> (A); + Test>(A); } ; void Generator_reverse_sorted (void) @@ -233,33 +231,33 @@ void Generator_reverse_sorted_end (size_t n_last) void Generator_reverse_sorted_middle (size_t n_last) { vector A, B, C; - A.reserve (NELEM); - A.clear (); - if (fill_vector_uint64 ("input.bin", A, NELEM + n_last) != 0) + A.reserve(NELEM); + A.clear(); + if (fill_vector_uint64("input.bin", A, NELEM + n_last) != 0) { std::cout << "Error in the input file\n"; return; }; - for (size_t i = NELEM; i < A.size (); ++i) - B.push_back (std::move (A[i])); - A.resize ( NELEM); - for (size_t i = 0; i < (NELEM >> 1); ++i) - std::swap (A[i], A[NELEM - 1 - i]); + for (size_t i = NELEM; i < A.size(); ++i) + B.push_back(std::move(A[i])); + A.resize(NELEM); - std::sort (A.begin (), A.end ()); - size_t step = NELEM / n_last + 1; + std::sort(A.begin(), A.end()); + size_t step = NELEM / n_last; size_t pos = 0; + for (size_t i = 0; i < (NELEM >> 1); ++i) + std::swap(A[i], A[NELEM - 1 - i]); - for (size_t i = 0; i < B.size (); ++i, pos += step) + for (size_t i = 0; i < B.size(); ++i, pos += step) { - C.push_back (B[i]); + C.push_back(B[i]); for (size_t k = 0; k < step; ++k) - C.push_back (A[pos + k]); + C.push_back(A.at(pos + k)); }; - while (pos < A.size ()) - C.push_back (A[pos++]); + while (pos < A.size()) + C.push_back(A[pos++]); A = C; - Test> (A); + Test>(A); }; From 9349789fd4f69831c57f701ecbbd6850ce343aee Mon Sep 17 00:00:00 2001 From: Sebastian Menzel Date: Mon, 22 Jan 2024 13:16:52 +0100 Subject: [PATCH 2/3] changed formatting to match with the current version --- benchmark/single/benchmark_numbers.cpp | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/benchmark/single/benchmark_numbers.cpp b/benchmark/single/benchmark_numbers.cpp index 3d49c34..b1c61ff 100644 --- a/benchmark/single/benchmark_numbers.cpp +++ b/benchmark/single/benchmark_numbers.cpp @@ -175,9 +175,9 @@ void Generator_sorted_end (size_t n_last) void Generator_sorted_middle (size_t n_last) { vector A, B, C; - A.reserve(NELEM); - A.clear(); - if (fill_vector_uint64("input.bin", A, NELEM + n_last) != 0) + A.reserve (NELEM); + A.clear (); + if (fill_vector_uint64 ("input.bin", A, NELEM + n_last) != 0) { std::cout << "Error in the input file\n"; return; @@ -186,20 +186,20 @@ void Generator_sorted_middle (size_t n_last) B.push_back(std::move(A[i])); A.resize(NELEM); - std::sort(A.begin(), A.end()); + std::sort (A.begin (), A.end ()); size_t step = NELEM / n_last; size_t pos = 0; - for (size_t i = 0; i < B.size(); ++i, pos += step) + for (size_t i = 0; i < B.size (); ++i, pos += step) { - C.push_back(B[i]); + C.push_back (B[i]); for (size_t k = 0; k < step; ++k) - C.push_back(A.at(pos + k)); + C.push_back (A.at(pos + k)); }; - while (pos < A.size()) - C.push_back(A[pos++]); + while (pos < A.size ()) + C.push_back (A[pos++]); A = C; - Test>(A); + Test> (A); } ; void Generator_reverse_sorted (void) @@ -231,33 +231,33 @@ void Generator_reverse_sorted_end (size_t n_last) void Generator_reverse_sorted_middle (size_t n_last) { vector A, B, C; - A.reserve(NELEM); - A.clear(); - if (fill_vector_uint64("input.bin", A, NELEM + n_last) != 0) + A.reserve (NELEM); + A.clear (); + if (fill_vector_uint64 ("input.bin", A, NELEM + n_last) != 0) { std::cout << "Error in the input file\n"; return; }; - for (size_t i = NELEM; i < A.size(); ++i) - B.push_back(std::move(A[i])); - A.resize(NELEM); + for (size_t i = NELEM; i < A.size (); ++i) + B.push_back (std::move(A[i])); + A.resize ( NELEM); - std::sort(A.begin(), A.end()); + std::sort (A.begin (), A.end ()); size_t step = NELEM / n_last; size_t pos = 0; for (size_t i = 0; i < (NELEM >> 1); ++i) std::swap(A[i], A[NELEM - 1 - i]); - for (size_t i = 0; i < B.size(); ++i, pos += step) + for (size_t i = 0; i < B.size (); ++i, pos += step) { - C.push_back(B[i]); + C.push_back (B[i]); for (size_t k = 0; k < step; ++k) - C.push_back(A.at(pos + k)); + C.push_back (A.at(pos + k)); }; - while (pos < A.size()) - C.push_back(A[pos++]); + while (pos < A.size ()) + C.push_back (A[pos++]); A = C; - Test>(A); + Test> (A); }; From ff244cd4137de2c78b3efcb01d632b0a30d4ec40 Mon Sep 17 00:00:00 2001 From: Sebastian Menzel Date: Mon, 22 Jan 2024 13:24:19 +0100 Subject: [PATCH 3/3] formatting should be correct now --- benchmark/single/benchmark_numbers.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/benchmark/single/benchmark_numbers.cpp b/benchmark/single/benchmark_numbers.cpp index b1c61ff..2185aa2 100644 --- a/benchmark/single/benchmark_numbers.cpp +++ b/benchmark/single/benchmark_numbers.cpp @@ -182,9 +182,9 @@ void Generator_sorted_middle (size_t n_last) std::cout << "Error in the input file\n"; return; }; - for (size_t i = NELEM; i < A.size(); ++i) - B.push_back(std::move(A[i])); - A.resize(NELEM); + for (size_t i = NELEM; i < A.size (); ++i) + B.push_back (std::move (A[i])); + A.resize ( NELEM); std::sort (A.begin (), A.end ()); size_t step = NELEM / n_last; @@ -239,20 +239,20 @@ void Generator_reverse_sorted_middle (size_t n_last) return; }; for (size_t i = NELEM; i < A.size (); ++i) - B.push_back (std::move(A[i])); + B.push_back (std::move (A[i])); A.resize ( NELEM); std::sort (A.begin (), A.end ()); size_t step = NELEM / n_last; size_t pos = 0; for (size_t i = 0; i < (NELEM >> 1); ++i) - std::swap(A[i], A[NELEM - 1 - i]); + std::swap (A[i], A[NELEM - 1 - i]); for (size_t i = 0; i < B.size (); ++i, pos += step) { - C.push_back (B[i]); + C.push_back (B[i]); for (size_t k = 0; k < step; ++k) - C.push_back (A.at(pos + k)); + C.push_back (A.at(pos + k)); }; while (pos < A.size ()) C.push_back (A[pos++]);