diff options
author | Jeroen Vermeulen <jtv@precisiontranslationtools.com> | 2015-04-23 15:27:21 +0300 |
---|---|---|
committer | Jeroen Vermeulen <jtv@precisiontranslationtools.com> | 2015-04-23 19:46:04 +0300 |
commit | 38d790cac0f21de9ff8951dce0bb5d522ad46c0d (patch) | |
tree | a65df558350c77e148e3c2fc6e40efa1ed6367e4 /mert/Data.cpp | |
parent | 4b47e1148c7cfe771c8e813cb9d741c2de44ed42 (diff) |
Add cross-platform randomizer module.
The code uses two mechanisms for generating random numbers: srand()/rand(),
which is not thread-safe, and srandom()/random(), which is POSIX-specific.
Here I add a util/random.cc module that centralizes these calls, and unifies
some common usage patterns. If the implementation is not good enough, we can
now change it in a single place.
To keep things simple, this uses the portable srand()/rand() but protects them
with a lock to avoid concurrency problems.
The hard part was to keep the regression tests passing: they rely on fixed
sequences of random numbers, so a small code change could break them very
thoroughly. Util::rand(), for wide types like size_t, calls std::rand() not
once but twice. This behaviour was generalized into utils::wide_rand() and
friends.
Diffstat (limited to 'mert/Data.cpp')
-rw-r--r-- | mert/Data.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mert/Data.cpp b/mert/Data.cpp index 428886b99..98f6c8399 100644 --- a/mert/Data.cpp +++ b/mert/Data.cpp @@ -287,7 +287,7 @@ void Data::createShards(size_t shard_count, float shard_size, const string& scor } else { //create shards by randomly sampling for (size_t i = 0; i < floor(shard_size+0.5); ++i) { - shard_contents.push_back(util::rand_int() % data_size); + shard_contents.push_back(util::rand_excl(data_size)); } } |