Core/Random: Refactor random number generation to use std::uniform_*_distribution to restrict result range instead of doing that ourselves

* Seed SFMTRand with more values for its state

# Conflicts:
#	src/common/Utilities/Random.cpp
This commit is contained in:
Shauren authored and Ovahlord committed 2019-11-10 18:58:25 +01:00
1 parent 983f28e73b
commit bbdf60701b
5 files changed
+44 -81

No files matched your search

+17 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
* Copyright (C) 2008-2019 TrinityCore <https://www.trinitycore.org/>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -16,14 +16,13 @@
*/
#include "Random.h"
#include "Common.h"
#include "Errors.h"
#include "SFMTRand.h"
#include <boost/thread/tss.hpp>
#include <random>
static boost::thread_specific_ptr<SFMTRand> sfmtRand;
static SFMTEngine engine;
static RandomEngine engine;
static SFMTRand* GetRng()
{
@@ -41,26 +40,28 @@ static SFMTRand* GetRng()
int32 irand(int32 min, int32 max)
{
ASSERT(max >= min);
return int32(GetRng()->IRandom(min, max));
std::uniform_int_distribution<int32> uid(min, max);
return uid(engine);
}
uint32 urand(uint32 min, uint32 max)
{
ASSERT(max >= min);
return GetRng()->URandom(min, max);
std::uniform_int_distribution<uint32> uid(min, max);
return uid(engine);
}
uint32 urandms(uint32 min, uint32 max)
{
ASSERT(max >= min);
ASSERT(INT_MAX / IN_MILLISECONDS >= max);
return GetRng()->URandom(min * IN_MILLISECONDS, max * IN_MILLISECONDS);
ASSERT(std::numeric_limits<uint32>::max() / Milliseconds::period::den >= max);
return urand(min * Milliseconds::period::den, max * Milliseconds::period::den);
}
float frand(float min, float max)
{
ASSERT(max >= min);
return float(GetRng()->Random() * (max - min) + min);
std::uniform_real_distribution<float> urd(min, max);
return urd(engine);
}
Milliseconds randtime(Milliseconds min, Milliseconds max)
@@ -73,26 +74,28 @@ Milliseconds randtime(Milliseconds min, Milliseconds max)
uint32 rand32()
{
return GetRng()->BRandom();
return GetRng()->RandomUInt32();
}
double rand_norm()
{
return GetRng()->Random();
std::uniform_real_distribution<double> urd;
return urd(engine);
}
double rand_chance()
{
return GetRng()->Random() * 100.0;
std::uniform_real_distribution<double> urd(0.0, 100.0);
return urd(engine);
}
uint32 urandweighted(size_t count, double const* chances)
{
std::discrete_distribution<uint32> dd(chances, chances + count);
return dd(SFMTEngine::Instance());
return dd(engine);
}
SFMTEngine& SFMTEngine::Instance()
RandomEngine& RandomEngine::Instance()
{
return engine;
}