diff options
| author | Martin Hořeňovský | 2019-10-07 20:24:37 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-10-07 21:53:07 +0200 |
| commit | a5a22cdadb0e0573de7dc2547165736349439298 (patch) | |
| tree | 048f9210f2f08d453037c3d634c559ce227f4f44 /include | |
| parent | 535da5c5132bcbba6f29c60ed6bb7ded29b9ec3e (diff) | |
| download | catch3-a5a22cdadb0e0573de7dc2547165736349439298.tar.gz | |
Have the random generators use the global rng instance
This means that if you nest multiple random generators inside one
test case, they will not return the same sequence of numbers.
Idea taken from #1736 by Amit Herman.
Closes #1736
Closes #1734
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_generators_specific.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/internal/catch_generators_specific.hpp b/include/internal/catch_generators_specific.hpp index 7985ac70..0734ee78 100644 --- a/include/internal/catch_generators_specific.hpp +++ b/include/internal/catch_generators_specific.hpp @@ -10,6 +10,7 @@ #include "catch_context.h" #include "catch_generators.hpp" #include "catch_interfaces_config.h" +#include "catch_random_number_generator.h" #include <random> @@ -18,14 +19,13 @@ namespace Generators { template <typename Float> class RandomFloatingGenerator final : public IGenerator<Float> { - // FIXME: What is the right seed? - std::minstd_rand m_rand; + Catch::SimplePcg32& m_rng; std::uniform_real_distribution<Float> m_dist; Float m_current_number; public: RandomFloatingGenerator(Float a, Float b): - m_rand(getCurrentContext().getConfig()->rngSeed()), + m_rng(rng()), m_dist(a, b) { static_cast<void>(next()); } @@ -34,20 +34,20 @@ public: return m_current_number; } bool next() override { - m_current_number = m_dist(m_rand); + m_current_number = m_dist(m_rng); return true; } }; template <typename Integer> class RandomIntegerGenerator final : public IGenerator<Integer> { - std::minstd_rand m_rand; + Catch::SimplePcg32& m_rng; std::uniform_int_distribution<Integer> m_dist; Integer m_current_number; public: RandomIntegerGenerator(Integer a, Integer b): - m_rand(getCurrentContext().getConfig()->rngSeed()), + m_rng(rng()), m_dist(a, b) { static_cast<void>(next()); } @@ -56,7 +56,7 @@ public: return m_current_number; } bool next() override { - m_current_number = m_dist(m_rand); + m_current_number = m_dist(m_rng); return true; } }; |