Use std::mt19937 to replace mt_random.

lailongwei · Nov 25, 2023 · 5e0cd11 · lailongwei · Nov 25, 2023 · lailongwei
1 parent 4d1fdcb
commit 5e0cd11
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 196 deletions.
diff --git a/llbc/include/llbc/common/OSHeader.h b/llbc/include/llbc/common/OSHeader.h
@@ -86,6 +86,7 @@
 #include <errno.h>
 #include <time.h>
 #include <math.h>
+#include <random>
 #if LLBC_TARGET_PLATFORM_NON_WIN32
  #include <unistd.h>
 #endif

diff --git a/llbc/include/llbc/core/random/Random.h b/llbc/include/llbc/core/random/Random.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "llbc/common/Common.h"
-#include "llbc/core/random/mtrandom.h"
 
 __LLBC_NS_BEGIN
 
@@ -90,7 +89,7 @@ class LLBC_EXPORT LLBC_Random
     _RandomAccessIter Choice(const _RandomAccessIter &begin, const _RandomAccessIter &end);
 
 private:
-    mtrandom _mtRand;
+    std::mt19937 _mtRand;
 };
 
 /**

diff --git a/llbc/include/llbc/core/random/RandomInl.h b/llbc/include/llbc/core/random/RandomInl.h
@@ -30,23 +30,22 @@ inline LLBC_Random::LLBC_Random(int seed)
 
 inline void LLBC_Random::Seed(int seed)
 {
-    _mtRand.reset(seed);
+    _mtRand.seed(seed);
 }
 
 inline int LLBC_Random::Rand()
 {
-    return static_cast<int>(_mtRand.rand());
+    return static_cast<int>(_mtRand());
 }
 
 inline int LLBC_Random::Rand(int end)
 {
     if (LIKELY(end != 0))
     {
-        const long long randVal = llabs(static_cast<int>(_mtRand.rand()));
         if (end > 0)
-            return static_cast<int>(randVal % end);
+            return _mtRand() % end;
         else
-            return static_cast<int>(randVal % end + end);
+            return _mtRand() % -end + end;
     }
     else
     {
@@ -58,11 +57,10 @@ inline int LLBC_Random::Rand(int begin, int end)
 {
     if (LIKELY(begin != end))
     {
-        const long long randVal = llabs(static_cast<int>(_mtRand.rand()));
         if (begin < end)
-            return randVal % (end - begin) + begin;
+            return _mtRand() % (end - begin) + begin;
         else
-            return randVal % (begin - end) + end;
+            return _mtRand() % (begin - end) + end;
     }
     else
     {
@@ -98,19 +96,19 @@ LLBC_Random::Rand(const _Weights &weights)
 
 inline double LLBC_Random::RandReal()
 {
-    return _mtRand.real();
+    return static_cast<double>(_mtRand()) / 4294967296;
 }
 
 inline bool LLBC_Random::BoolJudge()
 {
-    return _mtRand.rand() % 2 == 1;
+    return _mtRand() % 2 == 1;
 }
 
 template <typename _RandomAccessIter>
 inline _RandomAccessIter LLBC_Random::Choice(const _RandomAccessIter &begin, const _RandomAccessIter &end)
 {
-    long diff = static_cast<long>(end - begin);
-    if (UNLIKELY(diff <= 0))
+    sint64 diff = static_cast<sint64>(end - begin);
+    if (UNLIKELY(diff <= 0 || diff > INT_MAX))
         return end;
 
     return begin + Rand(diff);

diff --git a/llbc/include/llbc/core/random/mtrandom.h b/llbc/include/llbc/core/random/mtrandom.h