Changeset 2242:16523135943d in lemon-0.x for test/radix_sort_test.cc

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

File:

• test/radix_sort_test.cc (modified) (6 diffs)

test/radix_sort_test.cc

@@ -38 +38 @@
     vector<int> data1(n), data2(n);
     for (int i = 0; i < n; ++i) {
-      data1[i] = data2[i] = (int)(1000 * (rand() / (RAND_MAX + 1.0))) - 500;
+      data1[i] = data2[i] = rnd[1000] - 500;
     }
     radixSort(data1.begin(), data1.end());
@@ -49 +49 @@
     vector<unsigned char> data1(n), data2(n);
     for (int i = 0; i < n; ++i) {
-      data1[i] = data2[i] = (int)(200 * (rand() / (RAND_MAX + 1.0)));
+      data1[i] = data2[i] = rnd[(unsigned char)200];
     }
     radixSort(data1.begin(), data1.end());
@@ -65 +65 @@
     vector<int> data1(n), data2(n);
     for (int i = 0; i < n; ++i) {
-      data1[i] = data2[i] = (int)(1000 * (rand() / (RAND_MAX + 1.0))) - 500;
+      data1[i] = data2[i] = rnd[1000] - 500;
     }
     counterSort(data1.begin(), data1.end());
@@ -76 +76 @@
     vector<unsigned char> data1(n), data2(n);
     for (int i = 0; i < n; ++i) {
-      data1[i] = data2[i] = (int)(200 * (rand() / (RAND_MAX + 1.0)));
+      data1[i] = data2[i] = rnd[(unsigned char)200];
     }
     counterSort(data1.begin(), data1.end());
@@ -107 +107 @@
   vector<Edge> edges;
   for (int i = 0; i < e; ++i) {
-    int s = (int)(n * (double)rand() / (RAND_MAX + 1.0));
-    int t = (int)(n * (double)rand() / (RAND_MAX + 1.0));
+    int s = rnd[n];
+    int t = rnd[n];
     edges.push_back(graph.addEdge(nodes[s], nodes[t]));
   }
@@ -146 +146 @@
   vector<Edge> edges;
   for (int i = 0; i < e; ++i) {
-    int s = (int)(n * (double)rand() / (RAND_MAX + 1.0));
-    int t = (int)(n * (double)rand() / (RAND_MAX + 1.0));
+    int s = rnd[n];
+    int t = rnd[n];
     edges.push_back(graph.addEdge(nodes[s], nodes[t]));
   }