Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes incorrect rounding in rejection method. #1159

Merged
merged 15 commits into from
Oct 3, 2020
Merged

Fixes incorrect rounding in rejection method. #1159

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
63fdfc9
Fixes incorrect rounding in rejection method.
MattStephanson Aug 7, 2020
4353d43
Fix formatting
MattStephanson Aug 7, 2020
58883ed
Fix out-of-range casts from double to integer types
MattStephanson Aug 14, 2020
c575cb9
Tests for #1001 and #1123
MattStephanson Aug 17, 2020
4999c1c
Merge branch 'master' into random_rejection_rounding
MattStephanson Aug 17, 2020
d703774
clang-format
MattStephanson Aug 17, 2020
8e31f45
buildfix and code review comments
MattStephanson Aug 17, 2020
831f65f
buildfix - BSR for all integer widths
MattStephanson Aug 18, 2020
89c708e
Merge branch 'master' into random_rejection_rounding
MattStephanson Aug 18, 2020
1d8d743
Restore line endings from merge conflict
MattStephanson Aug 18, 2020
b260904
buildfix
MattStephanson Aug 21, 2020
f6d395a
Apply suggestions from code review
MattStephanson Aug 21, 2020
3fa04cc
suggestions from code review
MattStephanson Aug 22, 2020
13a2527
Apply suggestions from code review
StephanTLavavej Oct 2, 2020
4afbecc
Fix /clr:pure compiler error.
StephanTLavavej Oct 3, 2020
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
14 changes: 8 additions & 6 deletions stl/inc/random
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2290,9 +2290,10 @@ private:
_Ty _Res;
_Ty1 _Yx;
for (;;) { // generate a tentative value
_Yx = static_cast<_Ty1>(_CSTD tan(_Pi * _NRAND(_Eng, _Ty1)));
_Res = static_cast<_Ty>(_Par0._Sqrt * _Yx + _Par0._Mean);
if (_Ty{0} <= _Res) {
_Yx = static_cast<_Ty1>(_CSTD tan(_Pi * _NRAND(_Eng, _Ty1)));
const _Ty1 _Mx{_Par0._Sqrt * _Yx + _Par0._Mean};
if (0.0 <= _Mx) {
_Res = static_cast<_Ty>(_Mx);
break;
}
}
Expand Down Expand Up @@ -2472,9 +2473,10 @@ private:
for (;;) { // generate and reject
_Ty1 _Yx;
for (;;) { // generate a tentative value
_Yx = static_cast<_Ty1>(_CSTD tan(_Pi * _NRAND(_Eng, _Ty1)));
_Res = static_cast<_Ty>(_Par0._Sqrt * _Yx + _Par0._Mean);
if (_Ty{0} <= _Res && _Res <= _Par0._Tx) {
_Yx = static_cast<_Ty1>(_CSTD tan(_Pi * _NRAND(_Eng, _Ty1)));
const _Ty1 _Mx{_Par0._Sqrt * _Yx + _Par0._Mean};
if (0.0 <= _Mx && _Mx < _Par0._Tx + _Ty{1}) {
MattStephanson marked this conversation as resolved.
Show resolved Hide resolved
_Res = static_cast<_Ty>(_Mx);
break;
}
}
Expand Down