Changeset 2229:4dbb6dd2dd4b in lemon-0.x

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

Files:

• lemon/Makefile.am (modified) (3 diffs)
• lemon/bits/mingw32_rand.cc (deleted)
• lemon/bits/mingw32_rand.h (deleted)
• lemon/hypercube_graph.h (modified) (1 diff)
• lemon/random.cc (added)
• lemon/random.h (added)
• lemon/simann.h (modified) (5 diffs)
• test/graph_utils_test.h (modified) (2 diffs)
• test/heap_test.h (modified) (2 diffs)
• test/test_tools.h (modified) (2 diffs)

lemon/Makefile.am

@@ -13 +13 @@
         lemon/color.cc \
         lemon/eps.cc \
-        lemon/bits/mingw32_rand.cc \
-        lemon/bits/mingw32_time.cc
+        lemon/bits/mingw32_time.cc \
+        lemon/random.cc
 
 lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
@@ -87 +87 @@
         lemon/radix_heap.h \
         lemon/radix_sort.h \
+        lemon/random.h \
         lemon/refptr.h \
         lemon/simann.h \
@@ -113 +114 @@
         lemon/bits/item_writer.h \
         lemon/bits/map_extender.h \
-        lemon/bits/mingw32_rand.h \
         lemon/bits/mingw32_time.h \
         lemon/bits/traits.h \

lemon/hypercube_graph.h

@@ -261 +261 @@
     /// dim2::Point<double> base[DIM];
     /// for (int k = 0; k < DIM; ++k) {
-    ///   base[k].x = rand() / (RAND_MAX + 1.0);
-    ///   base[k].y = rand() / (RAND_MAX + 1.0);
+    ///   base[k].x = random.getReal();
+    ///   base[k].y = random.getReal();
     /// } 
     /// HyperCubeGraph::HyperMap<dim2::Point<double> > 

lemon/simann.h

@@ -32 +32 @@
 #include <limits>
 #include <lemon/time_measure.h>
-
-#ifdef WIN32
-#include <lemon/bits/mingw32_rand.h>
-#endif
+#include <lemon/random.h>
 
 namespace lemon {
@@ -242 +239 @@
       max_no_impr(_max_no_impr), temp(_temp), ann_fact(_ann_fact)
     {
-      srand48(time(0));
     }
     /// \brief This is called when a neighbouring state gets accepted.
@@ -262 +258 @@
     bool accept() {
       double cost_diff = simann->getCurrCost() - simann->getPrevCost();
-      return (drand48() <= exp(-(cost_diff / temp)));
+      return (rnd.getReal() <= exp(-(cost_diff / temp)));
     }
     /// \brief Destructor.
@@ -322 +318 @@
     ann_fact(_ann_fact), init_ann_fact(_ann_fact), start(false)
     {
-      srand48(time(0));
     }
     /// \brief Does initializations before each run.
@@ -371 +366 @@
       else {
         double cost_diff = simann->getCurrCost() - simann->getPrevCost();
-        return (drand48() <= exp(-(cost_diff / temp)));
+        return (rnd.getReal() <= exp(-(cost_diff / temp)));
       }
     }

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);
 }