From 4b14954ce30ea7c5e63a49c50294bcec5978bbcd Mon Sep 17 00:00:00 2001
From: Tyge Løvset <tylo@norceresearch.no>
Date: Tue, 28 Jul 2020 14:58:20 +0200
Subject: Updated random

---
 examples/benchmark.c   |  6 +++---
 examples/heap.c        |  8 ++++----
 examples/list.c        |  4 ++--
 examples/priority.c    |  4 ++--
 examples/rngbirthday.c |  8 ++++----
 examples/rngtest.c     | 12 ++++++------
 6 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'examples')

diff --git a/examples/benchmark.c b/examples/benchmark.c
index c9a82d6d..1c69b8ab 100644
--- a/examples/benchmark.c
+++ b/examples/benchmark.c
@@ -21,9 +21,9 @@ KHASH_MAP_INIT_INT64(ii, uint64_t)
 size_t seed;
 static const float maxLoadFactor = 0.77f;
 
-crandom64_t rng;
-#define SEED(s) rng = crandom64_init(seed)
-#define RAND(N) (crandom64(&rng) & ((1 << N) - 1))
+CRand64 rng;
+#define SEED(s) rng = crand64_init(seed)
+#define RAND(N) (crand64_gen(&rng) & ((1 << N) - 1))
 
 
 #define CMAP_SETUP(tag, Key, Value) CMap_##tag map = cmap_init \
diff --git a/examples/heap.c b/examples/heap.c
index e4e91544..f0d56a46 100644
--- a/examples/heap.c
+++ b/examples/heap.c
@@ -9,12 +9,12 @@ declare_CVec_priority_queue(f, >);
 int main()
 {
     uint32_t seed = time(NULL);
-    crandom32_t pcg = crandom32_init(seed);
+    CRand32 pcg = crand32_init(seed);
     int N = 30000000, M = 100;
     CVec_f vec = cvec_init;
     clock_t start = clock();
     for (int i=0; i<N; ++i)
-        cvec_f_pushBack(&vec, crandom32(&pcg));
+        cvec_f_pushBack(&vec, crand32_gen(&pcg));
     cvecpq_f_build(&vec);
     printf("Built priority queue: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);
 
@@ -25,10 +25,10 @@ int main()
         cvecpq_f_pop(&vec);
     printf("\n\npopped PQ: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);
 
-    pcg = crandom32_init(seed);
+    pcg = crand32_init(seed);
     start = clock();
     for (int i=0; i<N; ++i)
-        cvecpq_f_push(&vec, crandom32(&pcg));
+        cvecpq_f_push(&vec, crand32_gen(&pcg));
     printf("pushed PQ: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);
     for (int i=0; i<M; ++i)
         printf("%.0f ", cvecpq_f_top(&vec)), cvecpq_f_pop(&vec);
diff --git a/examples/list.c b/examples/list.c
index 53b8711f..09b20b8c 100644
--- a/examples/list.c
+++ b/examples/list.c
@@ -6,10 +6,10 @@ declare_CList(ix, uint64_t);
 
 int main() {
     CList_ix list = clist_init;
-    crandom32_t pcg = crandom32_init(time(NULL));
+    CRand32 pcg = crand32_init(time(NULL));
     int n;
     for (int i=0; i<10000000; ++i) // ten million
-        clist_ix_pushBack(&list, crandom32(&pcg));
+        clist_ix_pushBack(&list, crand32_gen(&pcg));
     n = 100; 
     c_foreach (i, clist_ix, list)
         if (n--) printf("%8d: %10zu\n", 100 - n, i.item->value); else break;
diff --git a/examples/priority.c b/examples/priority.c
index c1890f8c..baab2779 100644
--- a/examples/priority.c
+++ b/examples/priority.c
@@ -9,12 +9,12 @@ declare_CVec(i, uint32_t);
 declare_CVec_priority_queue(i, >); // min-heap (increasing values)
 
 int main() {
-    crandom32_t pcg = crandom32_init(time(NULL));
+    CRand32 pcg = crand32_init(time(NULL));
     CVec_i heap = cvec_init;
 
     // Push ten million random numbers to queue
     for (int i=0; i<10000000; ++i)
-        cvecpq_i_push(&heap, crandom32(&pcg));
+        cvecpq_i_push(&heap, crand32_gen(&pcg));
 
     // Extract the hundred smallest.
     for (int i=0; i<100; ++i) {
diff --git a/examples/rngbirthday.c b/examples/rngbirthday.c
index 1e6178aa..8129497b 100644
--- a/examples/rngbirthday.c
+++ b/examples/rngbirthday.c
@@ -15,12 +15,12 @@ const static uint64_t mask = (1ull << 52) - 1;
 
 void repeats(void)
 {
-    crandom64_t rng = crandom64_init(seed);
+    CRand64 rng = crand64_init(seed);
     CMap_ic m = cmap_init;
     cmap_ic_reserve(&m, N);
     clock_t now = clock();
     for (size_t i = 0; i < N; ++i) {
-        uint64_t k = crandom64(&rng) & mask;
+        uint64_t k = crand64_gen(&rng) & mask;
         int v = ++cmap_ic_insert(&m, k, 0)->value;
         if (v > 1) printf("%zu: %x - %d\n", i, k, v);
     }
@@ -34,12 +34,12 @@ declare_CVec(x, uint64_t);
 
 void distribution(void)
 {
-    crandom32_t rng = crandom32_init(seed); // time(NULL), time(NULL));
+    CRand32 rng = crand32_init(seed); // time(NULL), time(NULL));
     const size_t N = 1ull << 28, M = 1ull << 9; // 1ull << 10;
     CMap_x map = cmap_x_make(M);
     clock_t now = clock();
     for (size_t i = 0; i < N; ++i) {
-        ++cmap_x_insert(&map, crandom32b(&rng, M), 0)->value;
+        ++cmap_x_insert(&map, crand32_genBounded(&rng, M), 0)->value;
     }
     float diff = (float) (clock() - now) / CLOCKS_PER_SEC;
 
diff --git a/examples/rngtest.c b/examples/rngtest.c
index af7c7dca..a15a8fcb 100644
--- a/examples/rngtest.c
+++ b/examples/rngtest.c
@@ -14,26 +14,26 @@ int main(void)
     uint64_t v;
     printf("start\n");
 
-    crandom32_t pcg = crandom32_init(time(NULL));
+    CRand32 pcg = crand32_init(time(NULL));
     before = clock(); \
     v = 0;
     for (size_t i=0; i<NN; i++) {
-        v += crandom32(&pcg);
+        v += crand32_gen(&pcg);
     }
     difference = clock() - before;
     printf("pcg32: %.02f, %zu\n", (float) difference / CLOCKS_PER_SEC, v);
 
-    crandom64_t sfc = crandom64_init(time(NULL));
+    CRand64 sfc = crand64_init(time(NULL));
     before = clock(); \
     v = 0;
     for (size_t i=0; i<NN; i++) {
-        v += crandom64(&sfc) & 0xffffffff;
+        v += crand64_gen(&sfc) & 0xffffffff;
     }
     difference = clock() - before;
     printf("sfc64: %.02f, %zu\n", (float) difference / CLOCKS_PER_SEC, v);
 
-    for (int i=0; i<8; ++i) printf("%f ", crandom64f(&sfc));
+    for (int i=0; i<8; ++i) printf("%f ", crand32_genReal(&pcg));
     puts("");
-    for (int i=0; i<8; ++i) printf("%f ", crandom32f(&pcg));
+    for (int i=0; i<8; ++i) printf("%f ", crand64_genReal(&sfc));
     puts("");
 }
\ No newline at end of file
-- 
cgit v1.2.3