X-Git-Url: https://git.donarmstrong.com/?p=rsem.git;a=blobdiff_plain;f=sampling.h;fp=sampling.h;h=7e445cf8995e871183b5b18b66ee23b8efd91b8e;hp=8f80b72eca8d4982731d15a366100b5c68563ed3;hb=030b9364ddefc6d4ff17da9d8ae88fc3e4a973a5;hpb=2d71eb92104693ca9baa5a2e1c23eeca776d8fd3 diff --git a/sampling.h b/sampling.h index 8f80b72..7e445cf 100644 --- a/sampling.h +++ b/sampling.h @@ -10,10 +10,11 @@ #include "boost/random.hpp" typedef unsigned int seedType; -typedef boost::mt19937 engine_type; -typedef boost::gamma_distribution<> gamma_dist; -typedef boost::uniform_01 uniform01; -typedef boost::variate_generator gamma_generator; +typedef boost::random::mt19937 engine_type; +typedef boost::random::uniform_01<> uniform_01_dist; +typedef boost::random::gamma_distribution<> gamma_dist; +typedef boost::random::variate_generator uniform_01_generator; +typedef boost::random::variate_generator gamma_generator; class engineFactory { public: @@ -46,7 +47,7 @@ engine_type* engineFactory::seedEngine = NULL; // interval : [,) // random number should be in [0, arr[len - 1]) // If by chance arr[len - 1] == 0.0, one possibility is to sample uniformly from 0...len-1 -int sample(uniform01& rg, std::vector& arr, int len) { +int sample(uniform_01_generator& rg, std::vector& arr, int len) { int l, r, mid; double prb = rg() * arr[len - 1];