Renamed stc64_random() => crandom(), stc64_srandom(seed) => csrandom(seed). Kept old names for backward comp.

1 files changed, 14 insertions, 14 deletions

diff --git a/benchmarks/plotbench/cdeq_benchmark.cpp b/benchmarks/plotbench/cdeq_benchmark.cpp
index f57da6b2..b6eebb26 100644
--- a/benchmarks/plotbench/cdeq_benchmark.cpp
+++ b/benchmarks/plotbench/cdeq_benchmark.cpp
@@ -27,10 +27,10 @@ Sample test_std_deque() {
     {

         s.test[INSERT].t1 = clock();

         container con;

-        stc64_srandom(seed);

-        c_forrange (N/3) con.push_front(stc64_random() & mask1);

-        c_forrange (N/3) {con.push_back(stc64_random() & mask1); con.pop_front();}

-        c_forrange (N/3) con.push_back(stc64_random() & mask1);

+        csrandom(seed);

+        c_forrange (N/3) con.push_front(crandom() & mask1);

+        c_forrange (N/3) {con.push_back(crandom() & mask1); con.pop_front();}

+        c_forrange (N/3) con.push_back(crandom() & mask1);

         s.test[INSERT].t2 = clock();

         s.test[INSERT].sum = con.size();

         s.test[ERASE].t1 = clock();

@@ -39,13 +39,13 @@ Sample test_std_deque() {
         s.test[ERASE].sum = con.size();

      }{

         container con;

-        stc64_srandom(seed);

-        c_forrange (N) con.push_back(stc64_random() & mask2);

+        csrandom(seed);

+        c_forrange (N) con.push_back(crandom() & mask2);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

         // Iteration - not inherent find - skipping

         //container::iterator it;

-        //c_forrange (S) if ((it = std::find(con.begin(), con.end(), stc64_random() & mask2)) != con.end()) sum += *it;

+        //c_forrange (S) if ((it = std::find(con.begin(), con.end(), crandom() & mask2)) != con.end()) sum += *it;

         s.test[FIND].t2 = clock();

         s.test[FIND].sum = sum;

         s.test[ITER].t1 = clock();

@@ -71,10 +71,10 @@ Sample test_stc_deque() {
         s.test[INSERT].t1 = clock();

         container con = cdeq_x_init();

         //cdeq_x_reserve(&con, N);

-        stc64_srandom(seed);

-        c_forrange (N/3) cdeq_x_push_front(&con, stc64_random() & mask1);

-        c_forrange (N/3) {cdeq_x_push_back(&con, stc64_random() & mask1); cdeq_x_pop_front(&con);}

-        c_forrange (N/3) cdeq_x_push_back(&con, stc64_random() & mask1);

+        csrandom(seed);

+        c_forrange (N/3) cdeq_x_push_front(&con, crandom() & mask1);

+        c_forrange (N/3) {cdeq_x_push_back(&con, crandom() & mask1); cdeq_x_pop_front(&con);}

+        c_forrange (N/3) cdeq_x_push_back(&con, crandom() & mask1);

         s.test[INSERT].t2 = clock();

         s.test[INSERT].sum = cdeq_x_size(con);

         s.test[ERASE].t1 = clock();

@@ -83,13 +83,13 @@ Sample test_stc_deque() {
         s.test[ERASE].sum = cdeq_x_size(con);

         cdeq_x_drop(&con);

      }{

-        stc64_srandom(seed);

+        csrandom(seed);

         container con = cdeq_x_init();

-        c_forrange (N) cdeq_x_push_back(&con, stc64_random() & mask2);

+        c_forrange (N) cdeq_x_push_back(&con, crandom() & mask2);

         s.test[FIND].t1 = clock();

         size_t sum = 0;

         //cdeq_x_iter it, end = cdeq_x_end(&con);

-        //c_forrange (S) if ((it = cdeq_x_find(&con, stc64_random() & mask2)).ref != end.ref) sum += *it.ref;

+        //c_forrange (S) if ((it = cdeq_x_find(&con, crandom() & mask2)).ref != end.ref) sum += *it.ref;

         s.test[FIND].t2 = clock();

         s.test[FIND].sum = sum;

         s.test[ITER].t1 = clock();