Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/mersenne_twister.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class MersenneTwister : public PseudoRandomNumberGenerator {
uint64_t m_upper_bit_mask;
uint64_t m_lower_bit_mask;
std::vector<uint64_t> m_recurrence_state;
int m_state_index;
int m_state_index = 0;


std::vector<uint64_t> initializeRecurrenceState(const uint64_t seed);
Expand Down
57 changes: 27 additions & 30 deletions src/prngs/mersenne_twister.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,42 @@


MersenneTwister::MersenneTwister()
: PseudoRandomNumberGenerator() {
m_w = Default_w;
m_n = Default_n;
m_m = Default_m;
m_r = Default_r;
m_a = Default_a;
m_u = Default_u;
m_d = Default_d;
m_s = Default_s;
m_b = Default_b;
m_t = Default_t;
m_c = Default_c;
m_l = Default_l;
m_f = Default_f;
: m_w(Default_w),
m_n(Default_n),
m_m(Default_m),
m_r(Default_r),
m_a(Default_a),
m_u(Default_u),
m_d(Default_d),
m_s(Default_s),
m_b(Default_b),
m_t(Default_t),
m_c(Default_c),
m_l(Default_l),
m_f(Default_f) {
m_lower_bit_mask = std::numeric_limits<uint64_t>::max() >> (m_w - m_r);
m_upper_bit_mask = std::numeric_limits<uint64_t>::max() << (m_r);
m_recurrence_state = initializeRecurrenceState(m_seed);
m_state_index = 0;
}

MersenneTwister::MersenneTwister(const uint64_t seed)
: PseudoRandomNumberGenerator(seed) {
m_w = Default_w;
m_n = Default_n;
m_m = Default_m;
m_r = Default_r;
m_a = Default_a;
m_u = Default_u;
m_d = Default_d;
m_s = Default_s;
m_b = Default_b;
m_t = Default_t;
m_c = Default_c;
m_l = Default_l;
m_f = Default_f;
: PseudoRandomNumberGenerator(seed),
m_w(Default_w),
m_n(Default_n),
m_m(Default_m),
m_r(Default_r),
m_a(Default_a),
m_u(Default_u),
m_d(Default_d),
m_s(Default_s),
m_b(Default_b),
m_t(Default_t),
m_c(Default_c),
m_l(Default_l),
m_f(Default_f) {
m_lower_bit_mask = std::numeric_limits<uint64_t>::max() >> (m_w - m_r);
m_upper_bit_mask = std::numeric_limits<uint64_t>::max() << (m_r);
m_recurrence_state = initializeRecurrenceState(m_seed);
m_state_index = 0;
}

std::vector<uint64_t> MersenneTwister::initializeRecurrenceState(const uint64_t seed) {
Expand Down
3 changes: 1 addition & 2 deletions src/prngs/xorshift.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

// Default constructor
XORShift::XORShift()
: PseudoRandomNumberGenerator(),
m_a(DefaultA),
: m_a(DefaultA),
m_b(DefaultB),
m_c(DefaultC),
m_current_value(m_seed) {}
Expand Down