Changeset 750519 for src/graph/centrality

Timestamp:

05/23/09 11:22:24 (4 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

a8f2c8

Parents:

b334e1

git-author:

Tiago de Paula Peixoto <tiago@…> (05/23/09 06:38:05)

git-committer:

Tiago de Paula Peixoto <tiago@…> (05/23/09 11:22:24)

Message:

Switch from boost::random to tr1::random

The generators from boost::random seem to have a bug which causes them
to be biased. The generators from tr1::random seem to be in better
shape.

See: http://thread.gmane.org/gmane.comp.lib.boost.user/48006

Location:

src/graph/centrality

Files:

• graph_absolute_trust.cc (modified) (1 diff)
• graph_absolute_trust.hh (modified) (4 diffs)

src/graph/centrality/graph_absolute_trust.cc

@@ -23 +23 @@
 #include "graph_selectors.hh"
 
-#include <boost/random.hpp>
-typedef boost::mt19937 rng_t;
+#include <tr1/random>
+typedef std::tr1::mt19937 rng_t;
 
 #include "graph_absolute_trust.hh"

src/graph/centrality/graph_absolute_trust.hh

@@ -24 +24 @@
 
 #include <tr1/unordered_set>
-#include <boost/random/uniform_int.hpp>
+#include <tr1/random>
 #include <boost/functional/hash.hpp>
+
+#include <iostream>
 
 namespace graph_tool
@@ -52 +54 @@
         // init inferred trust t
         int i, N = num_vertices(g);
-        #pragma omp parallel for default(shared) private(i)     \
-            schedule(dynamic)
+        #pragma omp parallel for default(shared) private(i) schedule(dynamic)
         for (i = (source == -1) ? 0 : source;
              i < ((source == -1) ? N : source + 1); ++i)
@@ -72 +73 @@
             // walk hash set
             tr1::unordered_set<size_t> path_set;
-            uniform_int<size_t> random_salt(0, numeric_limits<size_t>::max());
+            tr1::uniform_int<size_t>
+                random_salt(0, numeric_limits<size_t>::max());
             size_t salt = random_salt(rng);
 
@@ -122 +124 @@
                         // select edge according to its probability
                         typename graph_traits<Graph>::edge_descriptor e;
-                        uniform_real<t_type> random(0,out_prob.back());
+                        typedef tr1::uniform_real<t_type> dist_t;
+                        tr1::variate_generator<rng_t, dist_t>
+                            random(rng, dist_t(0, out_prob.back()));
 
                         t_type u;
                         {
                             #pragma omp critical
-                            u = random(rng);
+                            u = random();
                         }
                         e = out_es[lower_bound(out_prob.begin(),