Randomizer: Remove unused interfaces

pull/135/merge
Tatsuhiro Tsujikawa 2013-09-28 22:55:05 +09:00
parent 986f69e5bf
commit 6f6a17bff7
4 changed files with 4 additions and 38 deletions

View File

@ -43,10 +43,6 @@ class Randomizer {
public:
virtual ~Randomizer() {}
virtual long int getRandomNumber() = 0;
virtual long int getMaxRandomNumber() = 0;
/**
* Returns random number in [0, to).
*/

View File

@ -78,8 +78,9 @@ SimpleRandomizer::~SimpleRandomizer()
#endif // __MINGW32__
}
long int SimpleRandomizer::getRandomNumber()
long int SimpleRandomizer::getRandomNumber(long int to)
{
assert(to > 0);
#ifdef __MINGW32__
int32_t val;
BOOL r = CryptGenRandom(cryProvider_, sizeof(val),
@ -90,26 +91,7 @@ long int SimpleRandomizer::getRandomNumber()
} else if(val < 0) {
val = -val;
}
return val;
#else // !__MINGW32__
return eng_();
#endif // !__MINGW32__
}
long int SimpleRandomizer::getMaxRandomNumber()
{
#ifdef __MINGW32__
return INT32_MAX;
#else // !__MINGW32__
return eng_.max();
#endif // !__MINGW32__
}
long int SimpleRandomizer::getRandomNumber(long int to)
{
assert(to > 0);
#ifdef __MINGW32__
return getRandomNumber() % to;
return val % to;
#else // !__MINGW32__
return std::uniform_int_distribution<long int>(0, to - 1)(eng_);
#endif // !__MINGW32__

View File

@ -65,10 +65,6 @@ public:
void init();
virtual long int getRandomNumber() CXX11_OVERRIDE;
virtual long int getMaxRandomNumber() CXX11_OVERRIDE;
/**
* Returns random number in [0, to).
*/

View File

@ -14,17 +14,9 @@ public:
virtual ~FixedNumberRandomizer() {}
virtual long int getRandomNumber() CXX11_OVERRIDE {
return fixedNumber;
}
virtual long int getMaxRandomNumber() CXX11_OVERRIDE {
return RAND_MAX;
}
virtual long int getRandomNumber(long int to) CXX11_OVERRIDE
{
return getRandomNumber();
return fixedNumber;
}
void setFixedNumber(int32_t num) {