boost/math
2
0
Fork 0
mirror of https://github.com/boostorg/math.git synced 2026-01-29 19:52:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix order of error checks.

Browse Source 
Fixes #9042.

[SVN r85601]
This commit is contained in:
John Maddock
2013-09-08 08:46:18 +00:00
parent a3e3e86eaf
commit eea2f238ed
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/math/distributions/normal.hpp
View File

@@ -109,15 +109,6 @@ inline RealType pdf(const normal_distribution<RealType, Policy>& dist, const Rea
RealType mean = dist.mean();
static const char* function = "boost::math::pdf(const normal_distribution<%1%>&, %1%)";
if((boost::math::isinf)(x))
{
return 0; // pdf + and - infinity is zero.
}
// Below produces MSVC 4127 warnings, so the above used instead.
//if(std::numeric_limits<RealType>::has_infinity && abs(x) == std::numeric_limits<RealType>::infinity())
//{ // pdf + and - infinity is zero.
// return 0;
//}
RealType result = 0;
if(false == detail::check_scale(function, sd, &result, Policy()))
@@ -128,6 +119,15 @@ inline RealType pdf(const normal_distribution<RealType, Policy>& dist, const Rea
{
return result;
}
if((boost::math::isinf)(x))
{
return 0; // pdf + and - infinity is zero.
}
// Below produces MSVC 4127 warnings, so the above used instead.
//if(std::numeric_limits<RealType>::has_infinity && abs(x) == std::numeric_limits<RealType>::infinity())
//{ // pdf + and - infinity is zero.
// return 0;
//}
if(false == detail::check_x(function, x, &result, Policy()))
{
return result;
@@ -217,6 +217,11 @@ inline RealType cdf(const complemented2_type<normal_distribution<RealType, Polic
RealType x = c.param;
static const char* function = "boost::math::cdf(const complement(normal_distribution<%1%>&), %1%)";
RealType result = 0;
if(false == detail::check_scale(function, sd, &result, Policy()))
return result;
if(false == detail::check_location(function, mean, &result, Policy()))
return result;
if((boost::math::isinf)(x))
{
if(x < 0) return 1; // cdf complement -infinity is unity.
@@ -231,11 +236,6 @@ inline RealType cdf(const complemented2_type<normal_distribution<RealType, Polic
//{ // cdf complement -infinity is unity.
// return 1;
//}
RealType result = 0;
if(false == detail::check_scale(function, sd, &result, Policy()))
return result;
if(false == detail::check_location(function, mean, &result, Policy()))
return result;
if(false == detail::check_x(function, x, &result, Policy()))
return result;