michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use C++11's <random> in pdeque/pvector tests (cygwin doesn't support rand_r)

Browse source
This commit is contained in:
Soonho Kong 2013-09-15 01:38:57 -07:00
parent dcc917a6b4
commit e4b327bbaa
2 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/tests/util/pdeque.cpp
View file

@ -5,10 +5,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
Author: Leonardo de Moura Author: Leonardo de Moura
*/ */
#include <iostream> #include <iostream>
#include <cstdlib>
#include <deque> #include <deque>
#include <vector> #include <vector>
#include <ctime> #include <ctime>
#include <random>
#include "util/test.h" #include "util/test.h"
#include "util/pdeque.h" #include "util/pdeque.h"
using namespace lean; using namespace lean;
@ -72,25 +72,29 @@ static void driver(unsigned max_sz, unsigned max_val, unsigned num_ops, double u
std::deque<int> q1; std::deque<int> q1;
pdeque<int> q2; pdeque<int> q2;
pdeque<int> q3; pdeque<int> q3;
unsigned int seed = static_cast<unsigned int>(time(0)); std::mt19937 rng; // the Mersenne Twister Random Number Generator with a popular choice of parameters
rng.seed(static_cast<unsigned int>(time(0)));
std::uniform_int_distribution<unsigned int> uint_dist;
std::vector<pdeque<int>> copies; std::vector<pdeque<int>> copies;
for (unsigned i = 0; i < num_ops; i++) { for (unsigned i = 0; i < num_ops; i++) {
double f = static_cast<double>(rand_r(&seed) % 10000) / 10000.0; double f = static_cast<double>(uint_dist(rng) % 10000) / 10000.0;
if (f < copy_freq) if (f < copy_freq)
copies.push_back(q3); copies.push_back(q3);
// read random positions of q3 // read random positions of q3
if (!empty(q3)) { if (!empty(q3)) {
for (int j = 0; j < rand_r(&seed) % 5; j++) { for (unsigned int j = 0; j < uint_dist(rng) % 5; j++) {
unsigned idx = rand_r(&seed) % size(q3); unsigned idx = uint_dist(rng) % size(q3);
lean_assert(q3[idx] == q1[idx]); lean_assert(q3[idx] == q1[idx]);
} }
} }
f = static_cast<double>(rand_r(&seed) % 10000) / 10000.0; f = static_cast<double>(uint_dist(rng) % 10000) / 10000.0;
if (f < updt_freq) { if (f < updt_freq) {
if (q1.size() >= max_sz) if (q1.size() >= max_sz)
continue; continue;
int v = rand_r(&seed) % max_val; int v = uint_dist(rng) % max_val;
switch (rand_r(&seed) % 3) { switch (uint_dist(rng) % 3) {
case 0: case 0:
q1.push_front(v); q1.push_front(v);
q2 = push_front(q2, v); q2 = push_front(q2, v);
@ -103,7 +107,7 @@ static void driver(unsigned max_sz, unsigned max_val, unsigned num_ops, double u
break; break;
default: default:
if (!empty(q2)) { if (!empty(q2)) {
unsigned idx = rand_r(&seed) % size(q2); unsigned idx = uint_dist(rng) % size(q2);
q1[idx] = v; q1[idx] = v;
q2[idx] = v; q2[idx] = v;
q3[idx] = v; q3[idx] = v;
@ -115,7 +119,7 @@ static void driver(unsigned max_sz, unsigned max_val, unsigned num_ops, double u
} else { } else {
if (q1.size() == 0) if (q1.size() == 0)
continue; continue;
if (rand_r(&seed) % 2 == 0) { if (uint_dist(rng) % 2 == 0) {
lean_assert(front(q2) == q1.front()); lean_assert(front(q2) == q1.front());
lean_assert(front(q3) == q1.front()); lean_assert(front(q3) == q1.front());
q1.pop_front(); q1.pop_front();

22
src/tests/util/pvector.cpp
View file

@ -5,8 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
Author: Leonardo de Moura Author: Leonardo de Moura
*/ */
#include <iostream> #include <iostream>
#include <cstdlib>
#include <vector> #include <vector>
#include <random>
#include <ctime> #include <ctime>
#include "util/test.h" #include "util/test.h"
#include "util/pvector.h" #include "util/pvector.h"
@ -67,27 +67,31 @@ static void driver(unsigned max_sz, unsigned max_val, unsigned num_ops, double u
std::vector<int> v1; std::vector<int> v1;
pvector<int> v2; pvector<int> v2;
pvector<int> v3; pvector<int> v3;
unsigned int seed = static_cast<unsigned int>(time(0)); std::mt19937 rng; // the Mersenne Twister Random Number Generator with a popular choice of parameters
rng.seed(static_cast<unsigned int>(time(0)));
std::uniform_int_distribution<unsigned int> uint_dist;
std::vector<pvector<int>> copies; std::vector<pvector<int>> copies;
for (unsigned i = 0; i < num_ops; i++) { for (unsigned i = 0; i < num_ops; i++) {
double f = static_cast<double>(rand_r(&seed) % 10000) / 10000.0; double f = static_cast<double>(uint_dist(rng) % 10000) / 10000.0;
if (f < copy_freq) { if (f < copy_freq) {
copies.push_back(v2); copies.push_back(v2);
} }
f = static_cast<double>(rand_r(&seed) % 10000) / 10000.0; f = static_cast<double>(uint_dist(rng) % 10000) / 10000.0;
// read random positions of v3 // read random positions of v3
if (!empty(v3)) { if (!empty(v3)) {
for (int j = 0; j < rand_r(&seed) % 5; j++) { for (unsigned int j = 0; j < uint_dist(rng) % 5; j++) {
unsigned idx = rand_r(&seed) % size(v3); unsigned idx = uint_dist(rng) % size(v3);
lean_assert(v3[idx] == v1[idx]); lean_assert(v3[idx] == v1[idx]);
} }
} }
if (f < updt_freq) { if (f < updt_freq) {
if (v1.size() >= max_sz) if (v1.size() >= max_sz)
continue; continue;
int a = rand_r(&seed) % max_val; int a = uint_dist(rng) % max_val;
if (!empty(v2) && rand_r(&seed)%2 == 0) { if (!empty(v2) && uint_dist(rng) % 2 == 0) {
unsigned idx = rand_r(&seed) % size(v2); unsigned idx = uint_dist(rng) % size(v2);
v1[idx] = a; v1[idx] = a;
v2[idx] = a; v2[idx] = a;
v3[idx] = a; v3[idx] = a;