Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/random.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

• lemon/random.h (modified) (18 diffs)

lemon/random.h

@@ -122 +122 @@
       static const int shift = 156;
 
-      static const Word mul = (Word)0x5851F42Du << 32 | (Word)0x4C957F2Du;
-      static const Word arrayInit = (Word)0x00000000u << 32 |(Word)0x012BD6AAu;
-      static const Word arrayMul1 = (Word)0x369DEA0Fu << 32 |(Word)0x31A53F85u;
-      static const Word arrayMul2 = (Word)0x27BB2EE6u << 32 |(Word)0x87B0B0FDu;
-
-      static const Word mask = (Word)0xB5026F5Au << 32 | (Word)0xA96619E9u;
-      static const Word loMask = ((Word)1u << 31) - 1;
+      static const Word mul = Word(0x5851F42Du) << 32 | Word(0x4C957F2Du);
+      static const Word arrayInit = Word(0x00000000u) << 32 |Word(0x012BD6AAu);
+      static const Word arrayMul1 = Word(0x369DEA0Fu) << 32 |Word(0x31A53F85u);
+      static const Word arrayMul2 = Word(0x27BB2EE6u) << 32 |Word(0x87B0B0FDu);
+
+      static const Word mask = Word(0xB5026F5Au) << 32 | Word(0xA96619E9u);
+      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 << 17) & ((Word)0x71D67FFFu << 32 | (Word)0xEDA60000u);
-        rnd ^= (rnd << 37) & ((Word)0xFFF7EEE0u << 32 | (Word)0x00000000u);
+        rnd ^= (rnd >> 29) & (Word(0x55555555u) << 32 | Word(0x55555555u));
+        rnd ^= (rnd << 17) & (Word(0x71D67FFFu) << 32 | Word(0xEDA60000u));
+        rnd ^= (rnd << 37) & (Word(0xFFF7EEE0u) << 32 | Word(0x00000000u));
         rnd ^= (rnd >> 43);
         return rnd;
@@ -217 +217 @@
         }
         
-        state[length - 1] = (Word)1 << (bits - 1);
+        state[length - 1] = Word(1) << (bits - 1);
       }
       
@@ -274 +274 @@
       static Result mask(const Result& result) {
         return Masker<Result, (shift + 1) / 2>::
-          mask((Result)(result | (result >> shift)));
+          mask(static_cast<Result>(result | (result >> shift)));
       }
     };
@@ -281 +281 @@
     struct Masker<Result, 1> {
       static Result mask(const Result& result) {
-        return (Result)(result | (result >> 1));
+        return static_cast<Result>(result | (result >> 1));
       }
     };
@@ -292 +292 @@
     
       static Result convert(RandomCore<Word>& rnd) {
-        return (Result)(rnd() >> (bits - rest)) << shift;
+        return static_cast<Result>(rnd() >> (bits - rest)) << shift;
       }
       
@@ -302 +302 @@
 
       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);
       }
@@ -313 +313 @@
     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;
@@ -326 +326 @@
     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);
@@ -342 +342 @@
         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; 
       }
@@ -352 +352 @@
         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; 
       }
@@ -360 +360 @@
     struct ShiftMultiplier<Result, 0, true> {
       static const Result multiplier() {
-        return (Result)1.0; 
+        return static_cast<Result>(1.0); 
       }
     };
@@ -367 +367 @@
     struct ShiftMultiplier<Result, -20, true> {
       static const Result multiplier() {
-        return (Result)(1.0/1048576.0); 
+        return static_cast<Result>(1.0/1048576.0); 
       }
     };
@@ -374 +374 @@
     struct ShiftMultiplier<Result, -32, true> {
       static const Result multiplier() {
-        return (Result)(1.0/424967296.0); 
+        return static_cast<Result>(1.0/424967296.0); 
       }
     };
@@ -381 +381 @@
     struct ShiftMultiplier<Result, -53, true> {
       static const Result multiplier() {
-        return (Result)(1.0/9007199254740992.0); 
+        return static_cast<Result>(1.0/9007199254740992.0); 
       }
     };
@@ -388 +388 @@
     struct ShiftMultiplier<Result, -64, true> {
       static const Result multiplier() {
-        return (Result)(1.0/18446744073709551616.0); 
+        return static_cast<Result>(1.0/18446744073709551616.0); 
       }
     };
@@ -407 +407 @@
       static Result convert(RandomCore<Word>& rnd) {
         return Shifting<Result, - shift - rest>::
-          shift((Result)(rnd() >> (bits - rest)));
+          shift(static_cast<Result>(rnd() >> (bits - rest)));
       }
     };
@@ -416 +416 @@
 
       static Result convert(RandomCore<Word>& rnd) {
-        return Shifting<Result, - shift - bits>::shift((Result)rnd()) +
-          RealConversion<Result, Word, rest-bits, shift + bits>::convert(rnd);
+        return Shifting<Result, - shift - bits>::
+          shift(static_cast<Result>(rnd())) +
+          RealConversion<Result, Word, rest-bits, shift + bits>::
+          convert(rnd);
       }
     };
@@ -428 +430 @@
         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());