Changeset 2229:4dbb6dd2dd4b in lemon-0.x for test

Timestamp:

10/02/06 18:11:00 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2969

Message:

Mersenne Twister random number generator

The code is based on the official MT19937 implementation
It is fully rewritten:

​http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html

todo: fixing copyright information

Location:

test

Files:

• graph_utils_test.h (modified) (2 diffs)
• heap_test.h (modified) (2 diffs)
• test_tools.h (modified) (2 diffs)

test/graph_utils_test.h

@@ -51 +51 @@
     typedef typename Graph::EdgeIt EdgeIt;
     Graph graph;
-    srand(time(0));
     for (int i = 0; i < 10; ++i) {
       graph.addNode();
@@ -58 +57 @@
     typename DescriptorMap<Graph, Node>::InverseMap invNodes(nodes);
     for (int i = 0; i < 100; ++i) {
-      int src = (int)(rand() / (RAND_MAX + 1.0) * invNodes.size());
-      int trg = (int)(rand() / (RAND_MAX + 1.0) * invNodes.size());
+      int src = rnd.getInt(invNodes.size());
+      int trg = rnd.getInt(invNodes.size());
       graph.addEdge(invNodes[src], invNodes[trg]);
     }

test/heap_test.h

@@ -46 +46 @@
 
   for (int i = 0; i < n; ++i) {
-    v[i] = rand() % 1000;
+    v[i] = rnd.getInt(1000);
     heap.push(i, v[i]);
   }
@@ -66 +66 @@
 
   for (int i = 0; i < n; ++i) {
-    v[i] = rand() % 1000;
+    v[i] = rnd.getInt(1000);
     heap.push(i, v[i]);
   }
   for (int i = 0; i < n; ++i) {
-    v[i] += rand() % 1000;
+    v[i] += rnd.getInt(1000);
     heap.increase(i, v[i]);
   }

test/test_tools.h

@@ -28 +28 @@
 #include <lemon/concept_check.h>
 #include <lemon/concept/graph.h>
+
+#include <lemon/random.h>
 
 using namespace lemon;
@@ -177 +179 @@
 }
 
-int _urandom_init() {
-  int seed = time(0);
-  srand(seed);
-  return seed;
-}
-
 int urandom(int n) {
-  static int seed = _urandom_init();
-  ignore_unused_variable_warning(seed);
-  return (int)(rand() / (1.0 + RAND_MAX) * n);
+  return rnd.getInt(n);
 }