[Frederik Eaton] Fixed some random number seed issues

diff --git a/ChangeLog b/ChangeLog
index c4ef390..65f88d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 libDAI-0.2.7 (2010-08-19)
 -------------------------
 
+* [Frederik Eaton] Fixed some random number seed issues
 * Improved code in matlab/dai.cpp that tests whether findMaximum is supported
   (this fixes a bug in matlab/dai.cpp reported by Deepak Roy)
 * Replaced all Name members by name() virtual functions and removed global variable DAINames

diff --git a/src/bp.cpp b/src/bp.cpp
index a88e16f..5944d62 100644 (file)
--- a/src/bp.cpp
+++ b/src/bp.cpp
@@ -310,7 +310,7 @@ Real BP::run() {
         } else {
             // Sequential updates
             if( props.updates == Properties::UpdateType::SEQRND )
-                random_shuffle( _updateSeq.begin(), _updateSeq.end() );
+                random_shuffle( _updateSeq.begin(), _updateSeq.end(), rnd );
 
             foreach( const Edge &e, _updateSeq ) {
                 calcNewMessage( e.first, e.second );

diff --git a/src/graph.cpp b/src/graph.cpp
index 3667f09..62a639e 100644 (file)
--- a/src/graph.cpp
+++ b/src/graph.cpp
@@ -315,7 +315,7 @@ GraphAL createGraphRegular( size_t N, size_t d ) {
             G = GraphAL( N );
             bool finished = false;
             while( !finished ) {
-                random_shuffle( U.begin(), U.end() );
+                random_shuffle( U.begin(), U.end(), rnd );
                 size_t i1, i2;
                 bool suit_pair_found = false;
                 for( i1 = 0; i1 < U.size()-1 && !suit_pair_found; i1++ )

diff --git a/src/lc.cpp b/src/lc.cpp
index 0226319..7e02027 100644 (file)
--- a/src/lc.cpp
+++ b/src/lc.cpp
@@ -299,7 +299,7 @@ Real LC::run() {
     for( _iters = 0; _iters < props.maxiter && maxDiff > props.tol; _iters++ ) {
         // Sequential updates
         if( props.updates == Properties::UpdateType::SEQRND )
-            random_shuffle( update_seq.begin(), update_seq.end() );
+            random_shuffle( update_seq.begin(), update_seq.end(), rnd );
 
         for( size_t t=0; t < nredges; t++ ) {
             size_t i = update_seq[t].first;

diff --git a/src/mf.cpp b/src/mf.cpp
index 42ede4a..f08c9df 100644 (file)
--- a/src/mf.cpp
+++ b/src/mf.cpp
@@ -128,7 +128,7 @@ Real MF::run() {
     // been reached or until the maximum belief difference is smaller than tolerance
     Real maxDiff = INFINITY;
     for( _iters = 0; _iters < props.maxiter && maxDiff > props.tol; _iters++ ) {
-        random_shuffle( update_seq.begin(), update_seq.end() );
+        random_shuffle( update_seq.begin(), update_seq.end(), rnd );
 
         maxDiff = -INFINITY;
         foreach( const size_t &i, update_seq ) {

diff --git a/src/util.cpp b/src/util.cpp
index 52e2215..955d886 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -10,10 +10,7 @@
 
 
 #include <dai/util.h>
-#include <boost/random/linear_congruential.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/normal_distribution.hpp>
-#include <boost/random/variate_generator.hpp>
+#include <boost/random.hpp>
 
 #ifdef WINDOWS
     #include <windows.h>
@@ -67,7 +64,7 @@ double toc() {
 }
 
 /// Type of global random number generator
-typedef boost::minstd_rand _rnd_gen_type;  // Try boost::mt19937 or boost::ecuyer1988 instead of boost::minstd_rand
+typedef boost::mt19937 _rnd_gen_type;
 
 /// Global random number generator
 _rnd_gen_type _rnd_gen(42U);

diff --git a/utils/createfg.cpp b/utils/createfg.cpp
index deb3786..cdf0320 100644 (file)
--- a/utils/createfg.cpp
+++ b/utils/createfg.cpp
@@ -170,8 +170,8 @@ BipartiteGraph createRandomBipartiteGraph( size_t N1, size_t N2, size_t d1, size
             stubs2[n2*d2 + t] = n2;
 
     // shuffle lists
-    random_shuffle( stubs1.begin(), stubs1.end() );
-    random_shuffle( stubs2.begin(), stubs2.end() );
+    random_shuffle( stubs1.begin(), stubs1.end(), rnd );
+    random_shuffle( stubs2.begin(), stubs2.end(), rnd );
 
     // add edges
     vector<Edge> edges;