Changeset 2242:16523135943d in lemon-0.x for benchmark

Timestamp:

10/14/06 17:26:05 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

New random interface
Switching to the new interface

Location:

benchmark

Files:

• edge_lookup.cc (modified) (2 diffs)
• radix_sort-bench.cc (modified) (5 diffs)
• swap_bipartite_bench.cc (modified) (3 diffs)

benchmark/edge_lookup.cc

@@ -3 +3 @@
 #include<vector>
 #include<lemon/time_measure.h>
+#include<lemon/random.h>
 
 using namespace lemon;
@@ -101 +102 @@
   std::vector<Node> v;
   for(int i=0;i<N;i++) v.push_back(g.addNode());
-  for(int i=0;i<M;i++) g.addEdge(v[int(drand48()*N)],v[int(drand48()*N)]);
+  for(int i=0;i<M;i++) g.addEdge(v[rnd[N]],v[rnd[N]]);
 
 //   {

benchmark/radix_sort-bench.cc

@@ -27 +27 @@
 #include <lemon/radix_sort.h>
 
+#include <lemon/random.h>
+
 #include <vector>
 #include <algorithm>
@@ -38 +40 @@
   vector<int> data(n);
   for (int i = 0; i < n; ++i) {
-    data[i] = (int)(1000 * (rand() / (RAND_MAX + 1.0))) - 500;
+    data[i] = rnd[1000] - 500;
   }
   radixSort(data.begin(), data.end());
@@ -48 +50 @@
   vector<int> data(n);
   for (int i = 0; i < n; ++i) {
-    data[i] = (int)(1000 * (rand() / (RAND_MAX + 1.0))) - 500;
+    data[i] = rnd[1000] - 500;
   }
   counterSort(data.begin(), data.end());
@@ -57 +59 @@
   vector<int> data(n);
   for (int i = 0; i < n; ++i) {
-    data[i] = (int)(1000 * (rand() / (RAND_MAX + 1.0))) - 500;
+    data[i] = rnd[1000] - 500;
   }
   sort(data.begin(), data.end());
@@ -66 +68 @@
   vector<int> data(n);
   for (int i = 0; i < n; ++i) {
-    data[i] = (int)(1000 * (rand() / (RAND_MAX + 1.0))) - 500;
+    data[i] = rnd[1000] - 500;
   }
   stable_sort(data.begin(), data.end());

benchmark/swap_bipartite_bench.cc

@@ -13 +13 @@
 
 #include <lemon/time_measure.h>
+#include <lemon/random.h>
 
 using namespace std;
@@ -21 +22 @@
 BPUGRAPH_TYPEDEFS(Graph);
 
-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);
-}
 
 int main() {
@@ -67 +57 @@
       for (int i = 0; i < e; ++i) {
         int a,b;
-        Node aNode = aNodes[a=urandom(n)];
-        Node bNode = bNodes[b=urandom(m)];
+        Node aNode = aNodes[a=rnd[n]];
+        Node bNode = bNodes[b=rnd[m]];
         graph.addEdge(aNode, bNode);
         LGraph::Node laNode = laNodes[a];