git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

random.tcc (mersenne_twister<>::operator()()): Reload the last position of the _M_x vector too. 

2006-06-15  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/random.tcc (mersenne_twister<>::operator()()):
	Reload the last position of the _M_x vector too.

From-SVN: r114695
This commit is contained in:
Paolo Carlini 2006-06-16 00:04:43 +00:00 committed by Paolo Carlini
parent 92a36a4a45
commit f28e0f4526
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2006-06-15 Paolo Carlini <pcarlini@suse.de>
* include/tr1/random.tcc (mersenne_twister<>::operator()()):
Reload the last position of the _M_x vector too.
2006-06-15 Paolo Carlini <pcarlini@suse.de> 2006-06-15 Paolo Carlini <pcarlini@suse.de>
* include/tr1/random (class xor_combine): Fix result_type typedef. * include/tr1/random (class xor_combine): Fix result_type typedef.

6
libstdc++-v3/include/tr1/random.tcc
View File

@ -298,7 +298,7 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
for (int __k = 0; __k < (__n - __m); ++__k) for (int __k = 0; __k < (__n - __m); ++__k)
{ {
_UIntType __y = ((_M_x[__k] & __upper_mask) _UIntType __y = ((_M_x[__k] & __upper_mask)
|(_M_x[__k + 1] & __lower_mask)); | (_M_x[__k + 1] & __lower_mask));
_M_x[__k] = (_M_x[__k + __m] ^ (__y >> 1) _M_x[__k] = (_M_x[__k + __m] ^ (__y >> 1)
^ ((__y & 0x01) ? __a : 0)); ^ ((__y & 0x01) ? __a : 0));
} }
@ -311,6 +311,10 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1)
^ ((__y & 0x01) ? __a : 0)); ^ ((__y & 0x01) ? __a : 0));
} }
_UIntType __y = ((_M_x[__n - 1] & __upper_mask)
| (_M_x[0] & __lower_mask));
_M_x[__n - 1] = (_M_x[__m - 1] ^ (__y >> 1)
^ ((__y & 0x01) ? __a : 0));
_M_p = 0; _M_p = 0;
} }