Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-19 18:12:25 +0200
committerMartin Hořeňovský2020-05-20 08:00:24 +0200
commit0c6fda6e7dfbd1a46ad02b692eb90668575df9dc (patch)
treed687b7b2621f8f72e5e39656a6f325c3459e2684 /src/catch2
parentbad8b7c8667b80dae2e37726fbde104a95ec855c (diff)
downloadcatch3-0c6fda6e7dfbd1a46ad02b692eb90668575df9dc.tar.gz
Cleanup benchmark headers a tiny bit
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/benchmark/detail/catch_stats.cpp21
-rw-r--r--src/catch2/benchmark/detail/catch_stats.hpp19
2 files changed, 21 insertions, 19 deletions
diff --git a/src/catch2/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp
index 11ca81b4..c583f70c 100644
--- a/src/catch2/benchmark/detail/catch_stats.cpp
+++ b/src/catch2/benchmark/detail/catch_stats.cpp
@@ -21,6 +21,27 @@
#endif
namespace {
+
+using Catch::Benchmark::Detail::sample;
+
+ template <typename URng, typename Estimator>
+ sample resample(URng& rng, int resamples, std::vector<double>::iterator first, std::vector<double>::iterator last, Estimator& estimator) {
+ auto n = last - first;
+ std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+ sample out;
+ out.reserve(resamples);
+ std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+ std::vector<double> resampled;
+ resampled.reserve(n);
+ std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+ return estimator(resampled.begin(), resampled.end());
+ });
+ std::sort(out.begin(), out.end());
+ return out;
+ }
+
+
double erf_inv(double x) {
// Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
double w, p;
diff --git a/src/catch2/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp
index a8690c45..d43925ab 100644
--- a/src/catch2/benchmark/detail/catch_stats.hpp
+++ b/src/catch2/benchmark/detail/catch_stats.hpp
@@ -18,12 +18,10 @@
#include <algorithm>
#include <functional>
#include <vector>
-#include <iterator>
#include <numeric>
#include <cmath>
#include <utility>
#include <cstddef>
-#include <random>
namespace Catch {
namespace Benchmark {
@@ -63,23 +61,6 @@ namespace Catch {
return sum / count;
}
- template <typename URng, typename Iterator, typename Estimator>
- sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
- auto n = last - first;
- std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
- sample out;
- out.reserve(resamples);
- std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
- std::vector<double> resampled;
- resampled.reserve(n);
- std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
- return estimator(resampled.begin(), resampled.end());
- });
- std::sort(out.begin(), out.end());
- return out;
- }
-
template <typename Estimator, typename Iterator>
sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
auto n = last - first;