Deukhoofd
/
Arbutils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Style changes for pcg_random to keep my CI from yelling at me.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-05-26 13:24:40 +02:00
parent 779ddd49e3
commit e599bc730f
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 863 additions and 1331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
extern/pcg_extras.hpp vendored
View File

@ -33,17 +33,17 @@
#ifndef PCG_EXTRAS_HPP_INCLUDED #ifndef PCG_EXTRAS_HPP_INCLUDED
#define PCG_EXTRAS_HPP_INCLUDED 1 #define PCG_EXTRAS_HPP_INCLUDED 1
#include <cassert>
#include <cinttypes> #include <cinttypes>
#include <cstddef> #include <cstddef>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <cassert>
#include <limits>
#include <iostream> #include <iostream>
#include <iterator>
#include <limits>
#include <locale>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
#include <locale>
#include <iterator>
#ifdef __GNUC__ #ifdef __GNUC__
#include <cxxabi.h> #include <cxxabi.h>
@ -78,19 +78,16 @@
namespace pcg_extras { namespace pcg_extras {
typedef __uint128_t pcg128_t; typedef __uint128_t pcg128_t;
} }
#define PCG_128BIT_CONSTANT(high,low) \ #define PCG_128BIT_CONSTANT(high, low) ((pcg_extras::pcg128_t(high) << 64) + low)
((pcg_extras::pcg128_t(high) << 64) + low)
#else #else
#include "pcg_uint128.hpp" #include "pcg_uint128.hpp"
namespace pcg_extras { namespace pcg_extras {
typedef pcg_extras::uint_x4<uint32_t, uint64_t> pcg128_t; typedef pcg_extras::uint_x4<uint32_t, uint64_t> pcg128_t;
} }
#define PCG_128BIT_CONSTANT(high,low) \ #define PCG_128BIT_CONSTANT(high, low) pcg_extras::pcg128_t(high, low)
pcg_extras::pcg128_t(high,low)
#define PCG_EMULATED_128BIT_MATH 1 #define PCG_EMULATED_128BIT_MATH 1
#endif #endif
namespace pcg_extras { namespace pcg_extras {
/* /*
@ -117,9 +114,7 @@ namespace pcg_extras {
*/ */
template <typename CharT, typename Traits> template <typename CharT, typename Traits>
std::basic_ostream<CharT,Traits>& std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& out, pcg128_t value) {
operator<<(std::basic_ostream<CharT,Traits>& out, pcg128_t value)
{
auto desired_base = out.flags() & out.basefield; auto desired_base = out.flags() & out.basefield;
bool want_hex = desired_base == out.hex; bool want_hex = desired_base == out.hex;
@ -161,9 +156,7 @@ namespace pcg_extras {
} }
template <typename CharT, typename Traits> template <typename CharT, typename Traits>
std::basic_istream<CharT,Traits>& std::basic_istream<CharT, Traits>& operator>>(std::basic_istream<CharT, Traits>& in, pcg128_t& value) {
operator>>(std::basic_istream<CharT,Traits>& in, pcg128_t& value)
{
typename std::basic_istream<CharT, Traits>::sentry s(in); typename std::basic_istream<CharT, Traits>::sentry s(in);
if (!s) if (!s)
@ -209,16 +202,12 @@ namespace pcg_extras {
*/ */
template <typename CharT, typename Traits> template <typename CharT, typename Traits>
std::basic_ostream<CharT,Traits>& std::basic_ostream<CharT, Traits>& operator<<(std::basic_ostream<CharT, Traits>& out, uint8_t value) {
operator<<(std::basic_ostream<CharT,Traits>&out, uint8_t value)
{
return out << uint32_t(value); return out << uint32_t(value);
} }
template <typename CharT, typename Traits> template <typename CharT, typename Traits>
std::basic_istream<CharT,Traits>& std::basic_istream<CharT, Traits>& operator>>(std::basic_istream<CharT, Traits>& in, uint8_t& target) {
operator>>(std::basic_istream<CharT,Traits>& in, uint8_t& target)
{
uint32_t value = 0xdecea5edU; uint32_t value = 0xdecea5edU;
in >> value; in >> value;
if (!in && value == 0xdecea5edU) if (!in && value == 0xdecea5edU)
@ -236,18 +225,14 @@ namespace pcg_extras {
* Ugh. * Ugh.
*/ */
inline std::ostream& operator<<(std::ostream& out, uint8_t value) inline std::ostream& operator<<(std::ostream& out, uint8_t value) {
{
return pcg_extras::operator<<<char>(out, value); return pcg_extras::operator<<<char>(out, value);
} }
inline std::istream& operator>>(std::istream& in, uint8_t& value) inline std::istream& operator>>(std::istream& in, uint8_t& value) {
{
return pcg_extras::operator>><char>(in, value); return pcg_extras::operator>><char>(in, value);
} }
/* /*
* Useful bitwise operations. * Useful bitwise operations.
*/ */
@ -258,9 +243,7 @@ namespace pcg_extras {
* generator defined later. * generator defined later.
*/ */
template <typename itype> template <typename itype> inline itype unxorshift(itype x, bitcount_t bits, bitcount_t shift) {
inline itype unxorshift(itype x, bitcount_t bits, bitcount_t shift)
{
if (2 * shift >= bits) { if (2 * shift >= bits) {
return x ^ (x >> shift); return x ^ (x >> shift);
} }
@ -287,9 +270,7 @@ namespace pcg_extras {
* (but still crappy) code if you define PCG_USE_ZEROCHECK_ROTATE_IDIOM. * (but still crappy) code if you define PCG_USE_ZEROCHECK_ROTATE_IDIOM.
*/ */
template <typename itype> template <typename itype> inline itype rotl(itype value, bitcount_t rot) {
inline itype rotl(itype value, bitcount_t rot)
{
constexpr bitcount_t bits = sizeof(itype) * 8; constexpr bitcount_t bits = sizeof(itype) * 8;
constexpr bitcount_t mask = bits - 1; constexpr bitcount_t mask = bits - 1;
#if PCG_USE_ZEROCHECK_ROTATE_IDIOM #if PCG_USE_ZEROCHECK_ROTATE_IDIOM
@ -299,9 +280,7 @@ namespace pcg_extras {
#endif #endif
} }
template <typename itype> template <typename itype> inline itype rotr(itype value, bitcount_t rot) {
inline itype rotr(itype value, bitcount_t rot)
{
constexpr bitcount_t bits = sizeof(itype) * 8; constexpr bitcount_t bits = sizeof(itype) * 8;
constexpr bitcount_t mask = bits - 1; constexpr bitcount_t mask = bits - 1;
#if PCG_USE_ZEROCHECK_ROTATE_IDIOM #if PCG_USE_ZEROCHECK_ROTATE_IDIOM
@ -320,27 +299,23 @@ namespace pcg_extras {
*/ */
#if PCG_USE_INLINE_ASM && __GNUC__ && (__x86_64__ || __i386__) #if PCG_USE_INLINE_ASM && __GNUC__ && (__x86_64__ || __i386__)
inline uint8_t rotr(uint8_t value, bitcount_t rot) inline uint8_t rotr(uint8_t value, bitcount_t rot) {
{
asm("rorb %%cl, %0" : "=r"(value) : "0"(value), "c"(rot)); asm("rorb %%cl, %0" : "=r"(value) : "0"(value), "c"(rot));
return value; return value;
} }
inline uint16_t rotr(uint16_t value, bitcount_t rot) inline uint16_t rotr(uint16_t value, bitcount_t rot) {
{
asm("rorw %%cl, %0" : "=r"(value) : "0"(value), "c"(rot)); asm("rorw %%cl, %0" : "=r"(value) : "0"(value), "c"(rot));
return value; return value;
} }
inline uint32_t rotr(uint32_t value, bitcount_t rot) inline uint32_t rotr(uint32_t value, bitcount_t rot) {
{
asm("rorl %%cl, %0" : "=r"(value) : "0"(value), "c"(rot)); asm("rorl %%cl, %0" : "=r"(value) : "0"(value), "c"(rot));
return value; return value;
} }
#if __x86_64__ #if __x86_64__
inline uint64_t rotr(uint64_t value, bitcount_t rot) inline uint64_t rotr(uint64_t value, bitcount_t rot) {
{
asm("rorq %%cl, %0" : "=r"(value) : "0"(value), "c"(rot)); asm("rorq %%cl, %0" : "=r"(value) : "0"(value), "c"(rot));
return value; return value;
} }
@ -351,29 +326,16 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
#pragma intrinsic(_rotr, _rotr64, _rotr8, _rotr16) #pragma intrinsic(_rotr, _rotr64, _rotr8, _rotr16)
inline uint8_t rotr(uint8_t value, bitcount_t rot) inline uint8_t rotr(uint8_t value, bitcount_t rot) { return _rotr8(value, rot); }
{
return _rotr8(value, rot);
}
inline uint16_t rotr(uint16_t value, bitcount_t rot) inline uint16_t rotr(uint16_t value, bitcount_t rot) { return _rotr16(value, rot); }
{
return _rotr16(value, rot);
}
inline uint32_t rotr(uint32_t value, bitcount_t rot) inline uint32_t rotr(uint32_t value, bitcount_t rot) { return _rotr(value, rot); }
{
return _rotr(value, rot);
}
inline uint64_t rotr(uint64_t value, bitcount_t rot) inline uint64_t rotr(uint64_t value, bitcount_t rot) { return _rotr64(value, rot); }
{
return _rotr64(value, rot);
}
#endif // PCG_USE_INLINE_ASM #endif // PCG_USE_INLINE_ASM
/* /*
* The C++ SeedSeq concept (modelled by seed_seq) can fill an array of * The C++ SeedSeq concept (modelled by seed_seq) can fill an array of
* 32-bit integers with seed data, but sometimes we want to produce * 32-bit integers with seed data, but sometimes we want to produce
@ -402,10 +364,7 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
/* uneven_copy helper, case where destination ints are less than 32 bit. */ /* uneven_copy helper, case where destination ints are less than 32 bit. */
template <class SrcIter, class DestIter> template <class SrcIter, class DestIter>
SrcIter uneven_copy_impl( SrcIter uneven_copy_impl(SrcIter src_first, DestIter dest_first, DestIter dest_last, std::true_type) {
SrcIter src_first, DestIter dest_first, DestIter dest_last,
std::true_type)
{
typedef typename std::iterator_traits<SrcIter>::value_type src_t; typedef typename std::iterator_traits<SrcIter>::value_type src_t;
typedef typename std::iterator_traits<DestIter>::value_type dest_t; typedef typename std::iterator_traits<DestIter>::value_type dest_t;
@ -431,10 +390,7 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
/* uneven_copy helper, case where destination ints are more than 32 bit. */ /* uneven_copy helper, case where destination ints are more than 32 bit. */
template <class SrcIter, class DestIter> template <class SrcIter, class DestIter>
SrcIter uneven_copy_impl( SrcIter uneven_copy_impl(SrcIter src_first, DestIter dest_first, DestIter dest_last, std::false_type) {
SrcIter src_first, DestIter dest_first, DestIter dest_last,
std::false_type)
{
typedef typename std::iterator_traits<SrcIter>::value_type src_t; typedef typename std::iterator_traits<SrcIter>::value_type src_t;
typedef typename std::iterator_traits<DestIter>::value_type dest_t; typedef typename std::iterator_traits<DestIter>::value_type dest_t;
@ -460,16 +416,13 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
/* uneven_copy, call the right code for larger vs. smaller */ /* uneven_copy, call the right code for larger vs. smaller */
template <class SrcIter, class DestIter> template <class SrcIter, class DestIter>
inline SrcIter uneven_copy(SrcIter src_first, inline SrcIter uneven_copy(SrcIter src_first, DestIter dest_first, DestIter dest_last) {
DestIter dest_first, DestIter dest_last)
{
typedef typename std::iterator_traits<SrcIter>::value_type src_t; typedef typename std::iterator_traits<SrcIter>::value_type src_t;
typedef typename std::iterator_traits<DestIter>::value_type dest_t; typedef typename std::iterator_traits<DestIter>::value_type dest_t;
constexpr bool DEST_IS_SMALLER = sizeof(dest_t) < sizeof(src_t); constexpr bool DEST_IS_SMALLER = sizeof(dest_t) < sizeof(src_t);
return uneven_copy_impl(src_first, dest_first, dest_last, return uneven_copy_impl(src_first, dest_first, dest_last, std::integral_constant<bool, DEST_IS_SMALLER>{});
std::integral_constant<bool, DEST_IS_SMALLER>{});
} }
/* generate_to, fill in a fixed-size array of integral type using a SeedSeq /* generate_to, fill in a fixed-size array of integral type using a SeedSeq
@ -477,26 +430,20 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
*/ */
template <size_t size, typename SeedSeq, typename DestIter> template <size_t size, typename SeedSeq, typename DestIter>
inline void generate_to_impl(SeedSeq&& generator, DestIter dest, inline void generate_to_impl(SeedSeq&& generator, DestIter dest, std::true_type) {
std::true_type)
{
generator.generate(dest, dest + size); generator.generate(dest, dest + size);
} }
template <size_t size, typename SeedSeq, typename DestIter> template <size_t size, typename SeedSeq, typename DestIter>
void generate_to_impl(SeedSeq&& generator, DestIter dest, void generate_to_impl(SeedSeq&& generator, DestIter dest, std::false_type) {
std::false_type)
{
typedef typename std::iterator_traits<DestIter>::value_type dest_t; typedef typename std::iterator_traits<DestIter>::value_type dest_t;
constexpr auto DEST_SIZE = sizeof(dest_t); constexpr auto DEST_SIZE = sizeof(dest_t);
constexpr auto GEN_SIZE = sizeof(uint32_t); constexpr auto GEN_SIZE = sizeof(uint32_t);
constexpr bool GEN_IS_SMALLER = GEN_SIZE < DEST_SIZE; constexpr bool GEN_IS_SMALLER = GEN_SIZE < DEST_SIZE;
constexpr size_t FROM_ELEMS = constexpr size_t FROM_ELEMS =
GEN_IS_SMALLER GEN_IS_SMALLER ? size * ((DEST_SIZE + GEN_SIZE - 1) / GEN_SIZE)
? size * ((DEST_SIZE+GEN_SIZE-1) / GEN_SIZE) : (size + (GEN_SIZE / DEST_SIZE) - 1) / ((GEN_SIZE / DEST_SIZE) + GEN_IS_SMALLER);
: (size + (GEN_SIZE / DEST_SIZE) - 1)
/ ((GEN_SIZE / DEST_SIZE) + GEN_IS_SMALLER);
// this odd code ^^^^^^^^^^^^^^^^^ is work-around for // this odd code ^^^^^^^^^^^^^^^^^ is work-around for
// a bug: http://llvm.org/bugs/show_bug.cgi?id=21287 // a bug: http://llvm.org/bugs/show_bug.cgi?id=21287
@ -513,13 +460,11 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
} }
template <size_t size, typename SeedSeq, typename DestIter> template <size_t size, typename SeedSeq, typename DestIter>
inline void generate_to(SeedSeq&& generator, DestIter dest) inline void generate_to(SeedSeq&& generator, DestIter dest) {
{
typedef typename std::iterator_traits<DestIter>::value_type dest_t; typedef typename std::iterator_traits<DestIter>::value_type dest_t;
constexpr bool IS_32BIT = sizeof(dest_t) == sizeof(uint32_t); constexpr bool IS_32BIT = sizeof(dest_t) == sizeof(uint32_t);
generate_to_impl<size>(std::forward<SeedSeq>(generator), dest, generate_to_impl<size>(std::forward<SeedSeq>(generator), dest, std::integral_constant<bool, IS_32BIT>{});
std::integral_constant<bool, IS_32BIT>{});
} }
/* generate_one, produce a value of integral type using a SeedSeq /* generate_one, produce a value of integral type using a SeedSeq
@ -528,20 +473,16 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
*/ */
template <typename UInt, size_t i = 0UL, size_t N = i + 1UL, typename SeedSeq> template <typename UInt, size_t i = 0UL, size_t N = i + 1UL, typename SeedSeq>
inline UInt generate_one(SeedSeq&& generator) inline UInt generate_one(SeedSeq&& generator) {
{
UInt result[N]; UInt result[N];
generate_to<N>(std::forward<SeedSeq>(generator), result); generate_to<N>(std::forward<SeedSeq>(generator), result);
return result[i]; return result[i];
} }
template <typename RngType> template <typename RngType>
auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound) auto bounded_rand(RngType& rng, typename RngType::result_type upper_bound) -> typename RngType::result_type {
-> typename RngType::result_type
{
typedef typename RngType::result_type rtype; typedef typename RngType::result_type rtype;
rtype threshold = (RngType::max() - RngType::min() + rtype(1) - upper_bound) rtype threshold = (RngType::max() - RngType::min() + rtype(1) - upper_bound) % upper_bound;
% upper_bound;
for (;;) { for (;;) {
rtype r = rng() - RngType::min(); rtype r = rng() - RngType::min();
if (r >= threshold) if (r >= threshold)
@ -549,9 +490,7 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
} }
} }
template <typename Iter, typename RandType> template <typename Iter, typename RandType> void shuffle(Iter from, Iter to, RandType&& rng) {
void shuffle(Iter from, Iter to, RandType&& rng)
{
typedef typename std::iterator_traits<Iter>::difference_type delta_t; typedef typename std::iterator_traits<Iter>::difference_type delta_t;
typedef typename std::remove_reference<RandType>::type::result_type result_t; typedef typename std::remove_reference<RandType>::type::result_type result_t;
auto count = to - from; auto count = to - from;
@ -576,32 +515,24 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
* a problem in practice. * a problem in practice.
*/ */
template <typename RngType> template <typename RngType> class seed_seq_from {
class seed_seq_from {
private: private:
RngType rng_; RngType rng_;
typedef uint_least32_t result_type; typedef uint_least32_t result_type;
public: public:
template<typename... Args> template <typename... Args> seed_seq_from(Args&&... args) : rng_(std::forward<Args>(args)...) {
seed_seq_from(Args&&... args) :
rng_(std::forward<Args>(args)...)
{
// Nothing (else) to do... // Nothing (else) to do...
} }
template<typename Iter> template <typename Iter> void generate(Iter start, Iter finish) {
void generate(Iter start, Iter finish)
{
for (auto i = start; i != finish; ++i) for (auto i = start; i != finish; ++i)
*i = result_type(rng_()); *i = result_type(rng_());
} }
constexpr size_t size() const constexpr size_t size() const {
{ return (sizeof(typename RngType::result_type) > sizeof(result_type) && RngType::max() > ~size_t(0UL))
return (sizeof(typename RngType::result_type) > sizeof(result_type)
&& RngType::max() > ~size_t(0UL))
? ~size_t(0UL) ? ~size_t(0UL)
: size_t(RngType::max()); : size_t(RngType::max());
} }
@ -614,18 +545,14 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
* value. * value.
*/ */
template <typename IntType> template <typename IntType> struct static_arbitrary_seed {
struct static_arbitrary_seed {
private: private:
static constexpr IntType fnv(IntType hash, const char* pos) { static constexpr IntType fnv(IntType hash, const char* pos) {
return *pos == '\0' return *pos == '\0' ? hash : fnv((hash * IntType(16777619U)) ^ *pos, (pos + 1));
? hash
: fnv((hash * IntType(16777619U)) ^ *pos, (pos+1));
} }
public: public:
static constexpr IntType value = fnv(IntType(2166136261U ^ sizeof(IntType)), static constexpr IntType value = fnv(IntType(2166136261U ^ sizeof(IntType)), __DATE__ __TIME__ __FILE__);
__DATE__ __TIME__ __FILE__);
}; };
// Sometimes, when debugging or testing, it's handy to be able print the name // Sometimes, when debugging or testing, it's handy to be able print the name
@ -637,16 +564,13 @@ inline uint64_t rotr(uint64_t value, bitcount_t rot)
#if __cpp_rtti || __GXX_RTTI #if __cpp_rtti || __GXX_RTTI
template <typename T> template <typename T> struct printable_typename {};
struct printable_typename {};
template <typename T> template <typename T> std::ostream& operator<<(std::ostream& out, printable_typename<T>) {
std::ostream& operator<<(std::ostream& out, printable_typename<T>) {
const char* implementation_typename = typeid(T).name(); const char* implementation_typename = typeid(T).name();
#ifdef __GNUC__ #ifdef __GNUC__
int status; int status;
char* pretty_name = char* pretty_name = abi::__cxa_demangle(implementation_typename, nullptr, nullptr, &status);
abi::__cxa_demangle(implementation_typename, nullptr, nullptr, &status);
if (status == 0) if (status == 0)
out << pretty_name; out << pretty_name;
free(static_cast<void*>(pretty_name)); free(static_cast<void*>(pretty_name));

984
extern/pcg_random.hpp vendored
View File

File diff suppressed because it is too large Load Diff