Added crand.h - Alternative API to crandom.h, which will be deprecated.

3 files changed, 17 insertions, 17 deletions

diff --git a/misc/benchmarks/various/cbits_benchmark.cpp b/misc/benchmarks/various/cbits_benchmark.cpp
index dd709db1..1764f556 100644
--- a/misc/benchmarks/various/cbits_benchmark.cpp
+++ b/misc/benchmarks/various/cbits_benchmark.cpp
@@ -5,7 +5,7 @@
 
 enum{ N=1<<22 }; // 4.2 mill.
 #define i_static
-#include <stc/crandom.h>
+#include <stc/crand.h>
 #define i_type cbits
 #define i_len N
 #include <stc/cbits.h>
@@ -39,12 +39,12 @@ int main(int argc, char **argv)
     one_sec_delay();
 
     total = 0;
-    csrandom(seed);
+    csrand(seed);
     current_time = get_time_in_ms();
 
     c_forrange (40 * N)
     {
-        uint64_t r = crandom();
+        uint64_t r = crand();
         bools[r & (N-1)] = r & 1<<29;
     }
 
@@ -66,13 +66,13 @@ int main(int argc, char **argv)
     one_sec_delay();
 
     total = 0;
-    csrandom(seed);
+    csrand(seed);
     current_time = get_time_in_ms();
     bitset<N> bits;
 
     c_forrange (40 * N)
     {
-        uint64_t r = crandom();
+        uint64_t r = crand();
         bits[r & (N-1)] = r & 1<<29;
     }
 
@@ -92,13 +92,13 @@ int main(int argc, char **argv)
     one_sec_delay();
 
     total = 0;
-    csrandom(seed);
+    csrand(seed);
     current_time = get_time_in_ms();
     cbits bits2 = cbits_with_size(N, false);
 
     c_forrange (40 * N)
     {
-        uint64_t r = crandom();
+        uint64_t r = crand();
         cbits_set_value(&bits2, r & (N-1), r & 1<<29);
     }
 
diff --git a/misc/benchmarks/various/prng_bench.cpp b/misc/benchmarks/various/prng_bench.cpp
index be07f799..234e3805 100644
--- a/misc/benchmarks/various/prng_bench.cpp
+++ b/misc/benchmarks/various/prng_bench.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <ctime>
 #include <random>
-#include <stc/crandom.h>
+#include <stc/crand.h>
 
 static inline uint64_t rotl64(const uint64_t x, const int k)
   { return (x << k) | (x >> (64 - k)); }
@@ -124,7 +124,7 @@ int main(void)
 {
     enum {N = 500000000};
     uint16_t* recipient = new uint16_t[N];
-    static stc64_t rng;
+    static crand_t rng;
     init_state(rng.state, 12345123);
     std::mt19937 mt(12345123);
 
@@ -187,7 +187,7 @@ int main(void)
 
         beg = clock();
         for (size_t i = 0; i < N; i++)
-            recipient[i] = stc64_rand(&rng);
+            recipient[i] = crand_u64(&rng);
         end = clock();
         cout << "stc64:\t\t"
              << (float(end - beg) / CLOCKS_PER_SEC)
diff --git a/misc/benchmarks/various/sso_bench.cpp b/misc/benchmarks/various/sso_bench.cpp
index 0fffef7a..993ff1bb 100644
--- a/misc/benchmarks/various/sso_bench.cpp
+++ b/misc/benchmarks/various/sso_bench.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <chrono>
 
-#include <stc/crandom.h>
+#include <stc/crand.h>
 #include <stc/cstr.h>
 
 #define i_type StcVec
@@ -30,7 +30,7 @@ static inline std::string randomString_STD(int strsize) {
     char* p = &s[0];
     union { uint64_t u8; uint8_t b[8]; } r;
     for (int i = 0; i < strsize; ++i) {
-        if ((i & 7) == 0) r.u8 = crandom() & 0x3f3f3f3f3f3f3f3f;
+        if ((i & 7) == 0) r.u8 = crand() & 0x3f3f3f3f3f3f3f3f;
         p[i] = CHARS[r.b[i & 7]];
     }
     return s;
@@ -41,7 +41,7 @@ static inline cstr randomString_STC(int strsize) {
     char* p = cstr_data(&s);
     union { uint64_t u8; uint8_t b[8]; } r;
     for (int i = 0; i < strsize; ++i) {
-        if ((i & 7) == 0) r.u8 = crandom() & 0x3f3f3f3f3f3f3f3f;
+        if ((i & 7) == 0) r.u8 = crand() & 0x3f3f3f3f3f3f3f3f;
         p[i] = CHARS[r.b[i & 7]];
     }
     return s;
@@ -85,7 +85,7 @@ int main() {
 
     // VECTOR WITH STRINGS
 
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tstd::vector<std::string>, size=" << BENCHMARK_SIZE << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {
@@ -95,7 +95,7 @@ int main() {
     }
     std::cout << "Avg:\t" << sum/n << '\n';
 
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tcvec<cstr>, size=" << BENCHMARK_SIZE << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {
@@ -108,7 +108,7 @@ int main() {
 
     // SORTED SET WITH STRINGS
     
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tstd::set<std::string>, size=" << BENCHMARK_SIZE/16 << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {
@@ -118,7 +118,7 @@ int main() {
     }
     std::cout << "Avg:\t" << sum/n << '\n';
 
-    csrandom(seed);
+    csrand(seed);
     sum = 0, n = 0;
     std::cerr << "\nstrsize\tmsecs\tcsset<cstr>, size=" << BENCHMARK_SIZE/16 << "\n";
     for (int strsize = 1; strsize <= MAX_STRING_SIZE; strsize += 2) {