Test random generators have a more standard interface.

And braces.

Author: kohler

kvrandom.hh

@@ -19,64 +19,83 @@
 #include <stdlib.h>
 
 // A simple LCG with parameters from Numerical Recipes.
-class kvrandom_lcg_nr_simple { public:
-    enum { min_value = 0, max_value = 0xFFFFFFFFU };
-    typedef uint32_t value_type;
-    typedef uint32_t seed_type;
+class kvrandom_lcg_nr_simple {
+public:
+    using result_type = uint32_t;
+    using seed_type = uint32_t;
+    static constexpr result_type min() {
+        return 0;
+    }
+    static constexpr result_type max() {
+        return 0xFFFFFFFFU;
+    }
+
     kvrandom_lcg_nr_simple()
-	: seed_(default_seed) {
+        : seed_(default_seed) {
     }
-    explicit kvrandom_lcg_nr_simple(seed_type seed)
-	: seed_(seed) {
+    explicit kvrandom_lcg_nr_simple(seed_type s)
+        : seed_(s) {
     }
-    void reset(seed_type seed) {
-	seed_ = seed;
+    void seed(seed_type s) {
+        seed_ = s;
     }
-    value_type next() {
-	return (seed_ = seed_ * a + c);
+    result_type operator()() {
+        seed_ = seed_ * a + c;
+        return (seed_ = seed_ * a + c);
     }
-  private:
+
+private:
     uint32_t seed_;
     enum { default_seed = 819234718U, a = 1664525U, c = 1013904223U };
 };
 
 // A combination version of the NR LCG that uses only its higher order
 // digits. (In the default NR LCG the lowest bits have less randomness; e.g.,
 // the low bit flips between 0 and 1 with every call.)
-class kvrandom_lcg_nr : public kvrandom_lcg_nr_simple { public:
-    enum { min_value = 0, max_value = 0x7FFFFFFF };
-    typedef int32_t value_type;
-    value_type next() {
-	uint32_t x0 = kvrandom_lcg_nr_simple::next(),
-	    x1 = kvrandom_lcg_nr_simple::next();
-	return (x0 >> 15) | ((x1 & 0x7FFE) << 16);
+class kvrandom_lcg_nr : public kvrandom_lcg_nr_simple {
+public:
+    static constexpr result_type max() {
+        return 0x7FFFFFFFU;
+    }
+
+    result_type operator()() {
+        uint32_t x0 = kvrandom_lcg_nr_simple::operator()();
+        uint32_t x1 = kvrandom_lcg_nr_simple::operator()();
+        return (x0 >> 15) | ((x1 & 0x7FFE) << 16);
     }
 };
 
 // A random number generator taken from NR's ran4. Based on hashing.
-class kvrandom_psdes_nr { public:
-    enum { min_value = 0, max_value = 0xFFFFFFFFU };
-    typedef uint32_t value_type;
-    typedef uint32_t seed_type;
+class kvrandom_psdes_nr {
+public:
+    using result_type = uint32_t;
+    using seed_type = uint32_t;
+    static constexpr result_type min() {
+        return 0;
+    }
+    static constexpr result_type max() {
+        return 0xFFFFFFFFU;
+    }
+
     kvrandom_psdes_nr() {
-	reset(1);
+        seed(1);
     }
-    explicit kvrandom_psdes_nr(seed_type seed) {
-	reset(seed);
+    explicit kvrandom_psdes_nr(seed_type s) {
+        seed(s);
     }
-    void reset(seed_type seed) {
-	seed_ = seed;
-	next_ = 1;
+    void seed(seed_type s) {
+        seed_ = s;
+        next_ = 1;
     }
-    value_type next() {
-	uint32_t value = psdes(seed_, next_);
-	++next_;
-	return value;
+    result_type operator()() {
+        uint32_t value = psdes(seed_, next_);
+        ++next_;
+        return value;
     }
-    value_type operator[](uint32_t index) const {
-	return psdes(seed_, index);
+    result_type operator[](uint32_t index) const {
+        return psdes(seed_, index);
     }
-  private:
+private:
     uint32_t seed_;
     uint32_t next_;
     enum { niter = 4 };
@@ -85,14 +104,23 @@ class kvrandom_psdes_nr { public:
 };
 
 // a wrapper around random(), for backwards compatibility
-class kvrandom_random { public:
+class kvrandom_random {
+public:
+    using result_type = uint32_t;
+    static constexpr result_type min() {
+        return 0;
+    }
+    static constexpr result_type max() {
+        return 0x7FFFFFFFU;
+    }
+
     kvrandom_random() {
     }
-    void reset(uint32_t seed) {
-	srandom(seed);
+    void seed(uint32_t s) {
+        srandom(s);
     }
-    int32_t next() const {
-	return random();
+    result_type operator()() {
+        return random();
     }
 };
 

kvrow.hh

@@ -297,7 +297,7 @@ class query_json_scanner {
         return nleft_ != 0;
     }
   private:
-    query<R> &q_;
+    query<R>& q_;
     int nleft_;
     lcdf::Json& request_;
     lcdf::String firstkey_;