Replace use of rand() in RandSample, this was resulting in poor results from RndSubspace on windows

Charles Otto
1 parent d56eb4f2
Showing 2 changed files with 18 additions and 9 deletions
openbr/core/common.cpp
openbr/core/common.h
@@ -16,21 +16,32 @@
  
 #include "common.h"
 #include <QMutex>
+#include <RandomLib\Random.hpp>
  
 using namespace std;
  
+static RandomLib::Random g_rand;
+static QMutex rngLock;
+
 /**** GLOBAL ****/
 void Common::seedRNG() {
-    static QMutex seedControl;
-    QMutexLocker lock(&seedControl);
+    QMutexLocker lock(&rngLock);
  
     static bool seeded = false;
     if (!seeded) {
         srand(0); // We seed with 0 instead of time(NULL) to have reproducible randomness
         seeded = true;
+        g_rand.Reseed(0);
     }
 }
  
+double Common::randN()
+{
+    QMutexLocker lock(&rngLock);
+
+    return g_rand.FloatN();
+}
+
 QList<int> Common::RandSample(int n, int max, int min, bool unique)
 {
     QList<int> samples; samples.reserve(n);
@@ -220,6 +220,9 @@ double KernelDensityEstimation(const V&lt;T&gt; &amp;vals, double x, double h)
     return y / (vals.size() * h);
 }
  
+// Return a random number, uniformly distributed over 0,1
+double randN();
+
 /*!
  * \brief Returns a vector of n integers sampled in the range <min, max].
  *
@@ -236,19 +239,14 @@ QList&lt;int&gt; RandSample(int n, const QSet&lt;int&gt; &amp;values, bool unique = false);
 template <typename T>
 QList<int> RandSample(int n, const QList<T> &weights, bool unique = false)
 {
-    static bool seeded = false;
-    if (!seeded) {
-        srand(time(NULL));
-        seeded = true;
-    }
-
     QList<T> cdf = CumSum(weights);
     for (int i=0; i<cdf.size(); i++) // Normalize cdf
         cdf[i] = cdf[i] / cdf.last();
  
     QList<int> samples; samples.reserve(n);
     while (samples.size() < n) {
-        T r = (T)rand() / (T)RAND_MAX;
+        T r = randN();
+
         for (int j=0; j<weights.size(); j++) {
             if ((r >= cdf[j]) && (r <= cdf[j+1])) {
                 if (!unique || !samples.contains(j))