lemon-0.x: comparison lemon/random.h

equal deleted inserted replaced

-:464f24c76fd7
+:48e75795eb44
 static const int bits = 64;
 static const int length = 312;
 static const int shift = 156;
-static const Word mul = (Word)0x5851F42Du << 32 | (Word)0x4C957F2Du;
+static const Word mul = Word(0x5851F42Du) << 32 | Word(0x4C957F2Du);
-static const Word arrayInit = (Word)0x00000000u << 32 |(Word)0x012BD6AAu;
+static const Word arrayInit = Word(0x00000000u) << 32 |Word(0x012BD6AAu);
-static const Word arrayMul1 = (Word)0x369DEA0Fu << 32 |(Word)0x31A53F85u;
+static const Word arrayMul1 = Word(0x369DEA0Fu) << 32 |Word(0x31A53F85u);
-static const Word arrayMul2 = (Word)0x27BB2EE6u << 32 |(Word)0x87B0B0FDu;
+static const Word arrayMul2 = Word(0x27BB2EE6u) << 32 |Word(0x87B0B0FDu);
-static const Word mask = (Word)0xB5026F5Au << 32 | (Word)0xA96619E9u;
+static const Word mask = Word(0xB5026F5Au) << 32 | Word(0xA96619E9u);
-static const Word loMask = ((Word)1u << 31) - 1;
+static const Word loMask = (Word(1u) << 31) - 1;
 static const Word hiMask = ~loMask;
 static Word tempering(Word rnd) {
-rnd ^= (rnd >> 29) & ((Word)0x55555555u << 32 | (Word)0x55555555u);
+rnd ^= (rnd >> 29) & (Word(0x55555555u) << 32 | Word(0x55555555u));
-rnd ^= (rnd << 17) & ((Word)0x71D67FFFu << 32 | (Word)0xEDA60000u);
+rnd ^= (rnd << 17) & (Word(0x71D67FFFu) << 32 | Word(0xEDA60000u));
-rnd ^= (rnd << 37) & ((Word)0xFFF7EEE0u << 32 | (Word)0x00000000u);
+rnd ^= (rnd << 37) & (Word(0xFFF7EEE0u) << 32 | Word(0x00000000u));
 rnd ^= (rnd >> 43);
 return rnd;
 }
 };
 curr = state + length - 1; curr[0] = state[0]; --curr;
 cnt = 1;
 }
 }
-state[length - 1] = (Word)1 << (bits - 1);
+state[length - 1] = Word(1) << (bits - 1);
 }
 void copyState(const RandomCore& other) {
 std::copy(other.state, other.state + length, state);
 current = state + (other.current - other.state);
 template <typename Result,
 int shift = (std::numeric_limits<Result>::digits + 1) / 2>
 struct Masker {
 static Result mask(const Result& result) {
 return Masker<Result, (shift + 1) / 2>::
-mask((Result)(result | (result >> shift)));
+mask(static_cast<Result>(result | (result >> shift)));
 }
 };
 template <typename Result>
 struct Masker<Result, 1> {
 static Result mask(const Result& result) {
-return (Result)(result | (result >> 1));
+return static_cast<Result>(result | (result >> 1));
 }
 };
 template <typename Result, typename Word,
 int rest = std::numeric_limits<Result>::digits, int shift = 0,
 bool last = rest <= std::numeric_limits<Word>::digits>
 struct IntConversion {
 static const int bits = std::numeric_limits<Word>::digits;
 static Result convert(RandomCore<Word>& rnd) {
-return (Result)(rnd() >> (bits - rest)) << shift;
+return static_cast<Result>(rnd() >> (bits - rest)) << shift;
 }
 };
 template <typename Result, typename Word, int rest, int shift>
 struct IntConversion<Result, Word, rest, shift, false> {
 static const int bits = std::numeric_limits<Word>::digits;
 static Result convert(RandomCore<Word>& rnd) {
-return ((Result)rnd() << shift) |
+return (static_cast<Result>(rnd()) << shift) |
 IntConversion<Result, Word, rest - bits, shift + bits>::convert(rnd);
 }
 };
 template <typename Result, typename Word,
 bool one_word = std::numeric_limits<Word>::digits <
 std::numeric_limits<Result>::digits>
 struct Mapping {
 static Result map(RandomCore<Word>& rnd, const Result& bound) {
-Word max = (Word)(bound - 1);
+Word max = Word(bound - 1);
 Result mask = Masker<Result>::mask(bound - 1);
 Result num;
 do {
 num = IntConversion<Result, Word>::convert(rnd) & mask;
 } while (num > max);
 };
 template <typename Result, typename Word>
 struct Mapping<Result, Word, false> {
 static Result map(RandomCore<Word>& rnd, const Result& bound) {
-Word max = (Word)(bound - 1);
+Word max = Word(bound - 1);
 Word mask = Masker<Word, (std::numeric_limits<Result>::digits + 1) / 2>
 ::mask(max);
 Word num;
 do {
 num = rnd() & mask;
 template <typename Result, int exp, bool pos = (exp >= 0)>
 struct ShiftMultiplier {
 static const Result multiplier() {
 Result res = ShiftMultiplier<Result, exp / 2>::multiplier();
 res *= res;
-if ((exp & 1) == 1) res *= (Result)2.0;
+if ((exp & 1) == 1) res *= static_cast<Result>(2.0);
 return res;
 }
 };
 template <typename Result, int exp>
 struct ShiftMultiplier<Result, exp, false> {
 static const Result multiplier() {
 Result res = ShiftMultiplier<Result, exp / 2>::multiplier();
 res *= res;
-if ((exp & 1) == 1) res *= (Result)0.5;
+if ((exp & 1) == 1) res *= static_cast<Result>(0.5);
 return res;
 }
 };
 template <typename Result>
 struct ShiftMultiplier<Result, 0, true> {
 static const Result multiplier() {
-return (Result)1.0;
+return static_cast<Result>(1.0);
 }
 };
 template <typename Result>
 struct ShiftMultiplier<Result, -20, true> {
 static const Result multiplier() {
-return (Result)(1.0/1048576.0);
+return static_cast<Result>(1.0/1048576.0);
 }
 };
 template <typename Result>
 struct ShiftMultiplier<Result, -32, true> {
 static const Result multiplier() {
-return (Result)(1.0/424967296.0);
+return static_cast<Result>(1.0/424967296.0);
 }
 };
 template <typename Result>
 struct ShiftMultiplier<Result, -53, true> {
 static const Result multiplier() {
-return (Result)(1.0/9007199254740992.0);
+return static_cast<Result>(1.0/9007199254740992.0);
 }
 };
 template <typename Result>
 struct ShiftMultiplier<Result, -64, true> {
 static const Result multiplier() {
-return (Result)(1.0/18446744073709551616.0);
+return static_cast<Result>(1.0/18446744073709551616.0);
 }
 };
 template <typename Result, int exp>
 struct Shifting {
 struct RealConversion{
 static const int bits = std::numeric_limits<Word>::digits;
 static Result convert(RandomCore<Word>& rnd) {
 return Shifting<Result, - shift - rest>::
-shift((Result)(rnd() >> (bits - rest)));
+shift(static_cast<Result>(rnd() >> (bits - rest)));
 }
 };
 template <typename Result, typename Word, int rest, int shift>
 struct RealConversion<Result, Word, rest, shift, false> {
 static const int bits = std::numeric_limits<Word>::digits;
 static Result convert(RandomCore<Word>& rnd) {
-return Shifting<Result, - shift - bits>::shift((Result)rnd()) +
+return Shifting<Result, - shift - bits>::
-RealConversion<Result, Word, rest-bits, shift + bits>::convert(rnd);
+shift(static_cast<Result>(rnd())) +
+RealConversion<Result, Word, rest-bits, shift + bits>::
+convert(rnd);
 }
 };
 template <typename Result, typename Word>
 struct Initializer {
 template <typename Iterator>
 static void init(RandomCore<Word>& rnd, Iterator begin, Iterator end) {
 std::vector<Word> ws;
 for (Iterator it = begin; it != end; ++it) {
-ws.push_back((Word)*it);
+ws.push_back(Word(*it));
 }
 rnd.initState(ws.begin(), ws.end());
 }
 static void init(RandomCore<Word>& rnd, Result seed) {

changeset 2386	81b47fc5c444
parent 2380	7b0558c52de3
child 2387	317b9a88c350