diff options
| author | Johannes Demel <ufcsy@student.kit.edu> | 2015-09-25 20:24:18 +0200 |
|---|---|---|
| committer | Johannes Demel <ufcsy@student.kit.edu> | 2015-09-28 14:48:21 +0200 |
| commit | 44ef5e1c240b7d5aeac7ca6537c4b07f3cf606c5 (patch) | |
| tree | 576ba8429c5192c256dd7060d66167383a97bb23 /gnuradio-runtime/lib/math | |
| parent | 222e0003f9797a1b92d64855bd2b93f0d9099f93 (diff) | |
random-analog: added new uniform integer distribution source
Diffstat (limited to 'gnuradio-runtime/lib/math')
| -rw-r--r-- | gnuradio-runtime/lib/math/random.cc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/math/random.cc b/gnuradio-runtime/lib/math/random.cc index a2b2621307..b35dfa106e 100644 --- a/gnuradio-runtime/lib/math/random.cc +++ b/gnuradio-runtime/lib/math/random.cc @@ -44,7 +44,7 @@ namespace gr { - random::random(unsigned int seed) + random::random(unsigned int seed, int min_integer, int max_integer) { d_gauss_stored = false; // set gasdev (gauss distributed numbers) on calculation state @@ -52,14 +52,18 @@ namespace gr { d_rng = new boost::mt19937; reseed(seed); // set seed for random number generator d_uniform = new boost::uniform_real<float>; + d_integer_dis = new boost::random::uniform_int_distribution<>(min_integer, max_integer - 1); d_generator = new boost::variate_generator<boost::mt19937&, boost::uniform_real<float> > (*d_rng,*d_uniform); // create number generator in [0,1) from boost.random + d_integer_generator = new boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> >(*d_rng, *d_integer_dis); } random::~random() { delete d_rng; delete d_uniform; + delete d_integer_dis; delete d_generator; + delete d_integer_generator; } /* @@ -68,11 +72,26 @@ namespace gr { void random::reseed(unsigned int seed) { + //FIXME: method without effect after c'tor. if(seed==0) d_seed = static_cast<unsigned int>(std::time(0)); else d_seed = seed; d_rng->seed(d_seed); } + void + random::set_integer_limits(const int minimum, const int maximum){ + // boost expects integer limits defined as [minimum, maximum] which is unintuitive. + boost::random::uniform_int_distribution<>::param_type dis_params(minimum, maximum - 1); + d_integer_dis->param(dis_params); + delete d_integer_generator; + d_integer_generator = new boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> >(*d_rng, *d_integer_dis); + } + + int + random::ran_int(){ + return (*d_integer_generator)(); + } + /* * Returns uniformly distributed numbers in [0,1) taken from boost.random using a Mersenne twister */ |