sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cosmetic changes.

Browse Source
This commit is contained in:
lotodore
2011-02-27 22:05:15 +00:00
parent 9e425136f1
commit 3b3ca6339e
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/tools.cpp
+6 -5
View File
@@ -45,7 +45,8 @@ struct nondet_rng : std::unary_function<unsigned, unsigned> {
nondet_rng(boost::random_device &state) : _state(state) {} nondet_rng(boost::random_device &state) : _state(state) {}
}; };
static inline void InitRandState() { static inline void InitRandState()
{
if (!g_rand_state.get()) { if (!g_rand_state.get()) {
g_rand_state.reset(new boost::random_device); g_rand_state.reset(new boost::random_device);
} }
@@ -55,7 +56,7 @@ void Tools::ShuffleArrayNonDeterministic(int *inout, unsigned count)
{ {
InitRandState(); InitRandState();
nondet_rng rand(*g_rand_state); nondet_rng rand(*g_rand_state);
std::random_shuffle(&inout[0], &inout[count], rand); random_shuffle(&inout[0], &inout[count], rand);
} }
void Tools::GetRand(int minValue, int maxValue, unsigned count, int *out) void Tools::GetRand(int minValue, int maxValue, unsigned count, int *out)
@@ -74,13 +75,13 @@ void Tools::GetRandUnique(int minValue, int maxValue, unsigned count, int *out)
InitRandState(); InitRandState();
unsigned numCreated = 0; unsigned numCreated = 0;
int *startPtr = out; int *startPtr = out;
std::set<int> tmpSet; set<int> tmpSet;
for (unsigned i = 0; i < count; i++) { for (unsigned i = 0; i < count; i++) {
boost::uniform_int<> dist(minValue, maxValue - numCreated); boost::uniform_int<> dist(minValue, maxValue - numCreated);
boost::variate_generator<boost::random_device&, boost::uniform_int<> > gen(*g_rand_state, dist); boost::variate_generator<boost::random_device&, boost::uniform_int<> > gen(*g_rand_state, dist);
*startPtr = gen(); *startPtr = gen();
std::set<int>::const_iterator v = tmpSet.begin(); set<int>::const_iterator v = tmpSet.begin();
std::set<int>::const_iterator end = tmpSet.end(); set<int>::const_iterator end = tmpSet.end();
while (v != end) { while (v != end) {
if (*v <= *startPtr) { if (*v <= *startPtr) {
(*startPtr)++; (*startPtr)++;