Renamed files cvec_pq.h --> cpqueue.h and crand.h --> crandom.h

8 files changed, 39 insertions, 39 deletions

diff --git a/examples/benchmark.c b/examples/benchmark.c
index 07219ec2..7b707260 100644
--- a/examples/benchmark.c
+++ b/examples/benchmark.c
@@ -1,4 +1,4 @@
-#include <stc/crand.h>

+#include <stc/crandom.h>

 #include <stc/cstr.h>

 #include <stc/cmap.h>

 #include "others/khash.h"

@@ -26,9 +26,9 @@ KHASH_MAP_INIT_INT64(ii, uint64_t)
 size_t seed;

 static const float max_load_factor = 0.77f;

 

-crand_eng64_t rng;

-#define SEED(s) rng = crand_eng64_init(seed)

-#define RAND(N) (crand_gen_i64(&rng) & ((1 << N) - 1))

+crandom_eng64_t rng;

+#define SEED(s) rng = crandom_eng64_init(seed)

+#define RAND(N) (crandom_gen_i64(&rng) & ((1 << N) - 1))

 

 

 #define CMAP_SETUP(tag, Key, Value) cmap_##tag map = cmap_init \

diff --git a/examples/geek7.c b/examples/geek7.c
index 58fadcae..9a60c0a9 100644
--- a/examples/geek7.c
+++ b/examples/geek7.c
@@ -24,7 +24,7 @@ After inserting all the elements excluding the ones which are to be deleted, Pop
 #include <stdio.h>

 #include <stc/clist.h>

 #include <stc/cmap.h>

-#include <stc/cvec_pq.h>

+#include <stc/cpqueue.h>

 

 declare_cmap(ii, int, int);

 declare_cvec(i, int);

diff --git a/examples/heap.c b/examples/heap.c
index 72232d58..58895115 100644
--- a/examples/heap.c
+++ b/examples/heap.c
@@ -1,7 +1,7 @@
 #include <stdio.h>

 #include <time.h>

-#include <stc/crand.h>

-#include <stc/cvec_pq.h>

+#include <stc/crandom.h>

+#include <stc/cpqueue.h>

 

 declare_cvec(f, float);

 declare_cvec_pqueue(f, >);

@@ -9,12 +9,12 @@ declare_cvec_pqueue(f, >);
 int main()

 {

     uint32_t seed = time(NULL);

-    crand_eng32_t pcg = crand_eng32_init(seed);

+    crandom_eng32_t pcg = crandom_eng32_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_push_back(&vec, crand_gen_i32(&pcg));

+        cvec_f_push_back(&vec, crandom_gen_i32(&pcg));

     cvec_f_pqueue_build(&vec);

     printf("Built priority queue: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);

 

@@ -25,10 +25,10 @@ int main()
         cvec_f_pqueue_pop(&vec);

     printf("\n\npopped PQ: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);

 

-    pcg = crand_eng32_init(seed);

+    pcg = crandom_eng32_init(seed);

     start = clock();

     for (int i=0; i<N; ++i)

-        cvec_f_pqueue_push(&vec, crand_gen_i32(&pcg));

+        cvec_f_pqueue_push(&vec, crandom_gen_i32(&pcg));

     printf("pushed PQ: %f secs\n", (clock() - start) / (float) CLOCKS_PER_SEC);

     for (int i=0; i<M; ++i)

         printf("%.0f ", cvec_f_pqueue_top(&vec)), cvec_f_pqueue_pop(&vec);

diff --git a/examples/inits.c b/examples/inits.c
index 91973190..6b88905f 100644
--- a/examples/inits.c
+++ b/examples/inits.c
@@ -1,7 +1,7 @@
 #include <stdio.h>

 #include <stc/cstr.h>

 #include <stc/cmap.h>

-#include <stc/cvec_pq.h>

+#include <stc/cpqueue.h>

 #include <stc/clist.h>

 

 declare_cmap(id, int, cstr_t, cstr_destroy); // Map of int -> cstr_t

diff --git a/examples/list.c b/examples/list.c
index bf777611..b981b1ec 100644
--- a/examples/list.c
+++ b/examples/list.c
@@ -1,17 +1,17 @@
 #include <stdio.h>

 #include <time.h>

 #include <stc/clist.h>

-#include <stc/crand.h>

+#include <stc/crandom.h>

 declare_clist(fx, double);

 

 int main() {

     int k, n = 100000;

     clist_fx list = clist_init;

-    crand_eng64_t eng = crand_eng64_init(time(NULL));

-    crand_uniform_f64_t dist = crand_uniform_f64_init(0.0f, n);

+    crandom_eng64_t eng = crandom_eng64_init(time(NULL));

+    crandom_uniform_f64_t dist = crandom_uniform_f64_init(0.0f, n);

     

     for (int i = 0; i < 100000; ++i)

-        clist_fx_push_back(&list, crand_uniform_f64(&eng, dist));

+        clist_fx_push_back(&list, crandom_uniform_f64(&eng, dist));

     k = 0; c_foreach (i, clist_fx, list)

         if (++k <= 10) printf("%8d: %10f\n", k, i.item->value); else break;

 

diff --git a/examples/priority.c b/examples/priority.c
index 015f24fb..70d89f2a 100644
--- a/examples/priority.c
+++ b/examples/priority.c
@@ -1,21 +1,21 @@
 

 #include <stdio.h>

 #include <time.h>

-#include <stc/cvec_pq.h>

+#include <stc/cpqueue.h>

 #include <stc/cmap.h>

-#include <stc/crand.h>

+#include <stc/crandom.h>

 

 declare_cvec(i, uint32_t);

 declare_cvec_pqueue(i, >); // min-heap (increasing values)

 

 int main() {

-    crand_eng32_t pcg = crand_eng32_init(time(NULL));

-    crand_uniform_i32_t dist = crand_uniform_i32_init(0, 100000000);

+    crandom_eng32_t pcg = crandom_eng32_init(time(NULL));

+    crandom_uniform_i32_t dist = crandom_uniform_i32_init(0, 100000000);

     cvec_i heap = cvec_init;

 

     // Push ten million random numbers to priority queue

     for (int i=0; i<10000000; ++i)

-        cvec_i_pqueue_push(&heap, crand_uniform_i32(&pcg, dist));

+        cvec_i_pqueue_push(&heap, crandom_uniform_i32(&pcg, dist));

 

     // Extract the hundred smallest.

     for (int i=0; i<100; ++i) {

diff --git a/examples/rngbirthday.c b/examples/rngbirthday.c
index 03c5b783..216a4cb1 100644
--- a/examples/rngbirthday.c
+++ b/examples/rngbirthday.c
@@ -2,7 +2,7 @@
 #include <stdio.h>

 #include <time.h>

 

-#include <stc/crand.h>

+#include <stc/crandom.h>

 #include <stc/cmap.h>

 #include <stc/cvec.h>

 #include <stc/cstr.h>

@@ -15,12 +15,12 @@ const static uint64_t mask = (1ull << 52) - 1;
 

 void repeats(void)

 {

-    crand_eng64_t rng = crand_eng64_init(seed);

+    crandom_eng64_t rng = crandom_eng64_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 = crand_gen_i64(&rng) & mask;

+        uint64_t k = crandom_gen_i64(&rng) & mask;

         int v = ++cmap_ic_insert(&m, k, 0)->value;

         if (v > 1) printf("%zu: %llx - %d\n", i, k, v);

     }

@@ -34,13 +34,13 @@ declare_cvec(x, uint64_t);
 

 void distribution(void)

 {

-    crand_eng32_t rng = crand_eng32_init(seed); // time(NULL), time(NULL));

+    crandom_eng32_t rng = crandom_eng32_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();

-    crand_uniform_i32_t dist = crand_uniform_i32_init(0, M);

+    crandom_uniform_i32_t dist = crandom_uniform_i32_init(0, M);

     for (size_t i = 0; i < N; ++i) {

-        ++cmap_x_insert(&map, crand_uniform_i32(&rng, dist), 0)->value;

+        ++cmap_x_insert(&map, crandom_uniform_i32(&rng, dist), 0)->value;

     }

     float diff = (float) (clock() - now) / CLOCKS_PER_SEC;

 

diff --git a/examples/rngtest.c b/examples/rngtest.c
index f8fe44cf..ac464afd 100644
--- a/examples/rngtest.c
+++ b/examples/rngtest.c
@@ -1,6 +1,6 @@
 #include <stdio.h>

 #include <time.h>

-#include <stc/crand.h>

+#include <stc/crandom.h>

 #ifdef __cplusplus

 #include <random>

 #endif

@@ -14,34 +14,34 @@ int main(void)
     uint64_t v;

     printf("start\n");

 

-    crand_eng32_t pcg = crand_eng32_init(time(NULL));

+    crandom_eng32_t pcg = crandom_eng32_init(time(NULL));

     before = clock(); \

     v = 0;

     for (size_t i=0; i<NN; i++) {

-        v += crand_gen_i32(&pcg);

+        v += crandom_gen_i32(&pcg);

     }

     difference = clock() - before;

     printf("pcg32: %.02f, %zu\n", (float) difference / CLOCKS_PER_SEC, v);

 

-    crand_eng64_t sfc = crand_eng64_init(time(NULL));

+    crandom_eng64_t sfc = crandom_eng64_init(time(NULL));

     before = clock(); \

     v = 0;

     for (size_t i=0; i<NN; i++) {

-        v += crand_gen_i64(&sfc) & 0xffffffff;

+        v += crandom_gen_i64(&sfc) & 0xffffffff;

     }

     difference = clock() - before;

     printf("sfc64: %.02f, %zu\n", (float) difference / CLOCKS_PER_SEC, v);

 

-    crand_uniform_i32_t i32dist = crand_uniform_i32_init(10, 20);

-    for (int i=0; i<8; ++i) printf("%d ", crand_uniform_i32(&pcg, i32dist));

+    crandom_uniform_i32_t i32dist = crandom_uniform_i32_init(10, 20);

+    for (int i=0; i<8; ++i) printf("%d ", crandom_uniform_i32(&pcg, i32dist));

     puts("");

 

-    crand_uniform_f32_t f32dist = crand_uniform_f32_init(10, 20);

-    for (int i=0; i<8; ++i) printf("%f ", crand_uniform_f32(&pcg, f32dist));

+    crandom_uniform_f32_t f32dist = crandom_uniform_f32_init(10, 20);

+    for (int i=0; i<8; ++i) printf("%f ", crandom_uniform_f32(&pcg, f32dist));

     puts("");

 

-    crand_uniform_f64_t fdist = crand_uniform_f64_init(10, 20);

-    for (int i=0; i<8; ++i) printf("%f ", crand_uniform_f64(&sfc, fdist));

-    //for (int i=0; i<8; ++i) printf("%zu ", crand_gen_i64(&sfc));

+    crandom_uniform_f64_t fdist = crandom_uniform_f64_init(10, 20);

+    for (int i=0; i<8; ++i) printf("%f ", crandom_uniform_f64(&sfc, fdist));

+    //for (int i=0; i<8; ++i) printf("%zu ", crandom_gen_i64(&sfc));

     puts("");

 }
\ No newline at end of file