From 0b116ad92b7403989c2958c9c33e158049ecc6e1 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Mon, 3 Feb 2020 15:29:46 -0500 Subject: replaced mersenne twister with pcg32 --- hadamard_mcmc.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'hadamard_mcmc.hpp') diff --git a/hadamard_mcmc.hpp b/hadamard_mcmc.hpp index bca8ae2..218f8d1 100644 --- a/hadamard_mcmc.hpp +++ b/hadamard_mcmc.hpp @@ -1,8 +1,11 @@ #pragma once #include "randutils/randutils.hpp" +#include "pcg-cpp/include/pcg_random.hpp" #include +using Rng = randutils::random_generator; + inline double Ei(double x) { return -fabs(x); } class Orthogonal { @@ -53,7 +56,7 @@ private: std::vector rows; public: - Givens(Orthogonal& m, bool t, unsigned a1, unsigned a2, double θ0, randutils::mt19937_rng& rng) + Givens(Orthogonal& m, bool t, unsigned a1, unsigned a2, double θ0, Rng& rng) : m(m), rows(2 * m.size()) { transpose = t; axis_1 = a1; @@ -61,7 +64,7 @@ public: Δθ = rng.uniform(-θ0, θ0); } - Givens(Orthogonal& m, double θ0, randutils::mt19937_rng& rng) : m(m), rows(2 * m.size()) { + Givens(Orthogonal& m, double θ0, Rng& rng) : m(m), rows(2 * m.size()) { Δθ = rng.uniform(-θ0, θ0); unsigned axis1axis2 = rng.uniform((unsigned)0, m.size() * (m.size() - 1) - 1); @@ -134,7 +137,7 @@ private: double θ0; public: - randutils::mt19937_rng rng; + Rng rng; double β; double E; Orthogonal M; -- cgit v1.2.3-54-g00ecf