flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 03:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "random integer", RAND_MAX applies to diff of high/low, not high

Browse Source
This commit is contained in:
Klaus Basan
2018-06-25 01:52:40 +02:00
parent 350d7257c2
commit 7bb6d84e93
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/math/mathutils.cpp
View File

@@ -102,7 +102,6 @@ namespace BlackMisc
static QThreadStorage<uint> seeds; static QThreadStorage<uint> seeds;
Q_ASSERT_X(high < INT_MAX, Q_FUNC_INFO, "Cannot add 1"); Q_ASSERT_X(high < INT_MAX, Q_FUNC_INFO, "Cannot add 1");
Q_ASSERT_X(low >= 0 && high >= 0, Q_FUNC_INFO, "Only valid for positive values"); Q_ASSERT_X(low >= 0 && high >= 0, Q_FUNC_INFO, "Only valid for positive values");
Q_ASSERT_X(high <= RAND_MAX, Q_FUNC_INFO, "RAND_MAX exceeded");
if (!seeds.hasLocalData()) if (!seeds.hasLocalData())
{ {
// seed is per thread! // seed is per thread!
@@ -112,13 +111,14 @@ namespace BlackMisc
} }
const int r(qrand()); const int r(qrand());
const int mod = (high + 1) - low; const int mod = (high + 1) - low;
Q_ASSERT_X(mod <= RAND_MAX, Q_FUNC_INFO, "RAND_MAX exceeded");
return (r % mod) + low; return (r % mod) + low;
} }
double CMathUtils::randomDouble(double max) double CMathUtils::randomDouble(double max)
{ {
// on Win system, RAND_MAX is only 16bit, on other systems higher // on Win system, RAND_MAX is only 16bit, on other systems higher
static const int MAX(RAND_MAX < INT_MAX ? RAND_MAX : INT_MAX - 1); static const int MAX(RAND_MAX < INT_MAX ? RAND_MAX - 1 : INT_MAX - 1);
const double r = randomInteger(0, MAX); const double r = randomInteger(0, MAX);
return (r / MAX) * max; return (r / MAX) * max;
} }