Commit b9b20c8b authored by Paolo Bosetti's avatar Paolo Bosetti

Tested under MSVC by nkshigeru. Minor code formatting

parent 4bc48072
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
mrb_raise(mrb, E_RANGE_ERROR, "Numerical argument is out of domain - " #msg); mrb_raise(mrb, E_RANGE_ERROR, "Numerical argument is out of domain - " #msg);
/* math functions not provided under Microsoft Visual C++ */ /* math functions not provided under Microsoft Visual C++ */
#define _MSC_VER
#ifdef _MSC_VER #ifdef _MSC_VER
#define asinh(x) log(x + sqrt(pow(x,2.0) + 1)) #define asinh(x) log(x + sqrt(pow(x,2.0) + 1))
#define acosh(x) log(x + sqrt(pow(x,2.0) - 1)) #define acosh(x) log(x + sqrt(pow(x,2.0) - 1))
...@@ -30,18 +31,20 @@ erfc(double x); ...@@ -30,18 +31,20 @@ erfc(double x);
double double
erf(double x) erf(double x)
{ {
static const double two_sqrtpi= 1.128379167095512574; static const double two_sqrtpi = 1.128379167095512574;
double sum= x, term= x, xsqr= x*x; double sum = x;
double term = x;
double xsqr = x*x;
int j= 1; int j= 1;
if (fabs(x) > 2.2) { if (fabs(x) > 2.2) {
return 1.0 - erfc(x); return 1.0 - erfc(x);
} }
do { do {
term*= xsqr/j; term *= xsqr/j;
sum-= term/(2*j+1); sum -= term/(2*j+1);
++j; ++j;
term*= xsqr/j; term *= xsqr/j;
sum+= term/(2*j+1); sum += term/(2*j+1);
++j; ++j;
} while (fabs(term)/sum > REL_ERROR); } while (fabs(term)/sum > REL_ERROR);
return two_sqrtpi*sum; return two_sqrtpi*sum;
...@@ -52,10 +55,13 @@ double ...@@ -52,10 +55,13 @@ double
erfc(double x) erfc(double x)
{ {
static const double one_sqrtpi= 0.564189583547756287; static const double one_sqrtpi= 0.564189583547756287;
double a=1, b=x; double a = 1;
double c=x, d=x*x+0.5; double b = x;
double q1,q2; double c = x;
double n= 1.0, t; double d = x*x+0.5;
double q1, q2;
double n = 1.0;
double t;
if (fabs(x) < 2.2) { if (fabs(x) < 2.2) {
return 1.0 - erf(x); return 1.0 - erf(x);
} }
...@@ -63,15 +69,15 @@ erfc(double x) ...@@ -63,15 +69,15 @@ erfc(double x)
return 2.0 - erfc(-x); return 2.0 - erfc(-x);
} }
do { do {
t= a*n+b*x; t = a*n+b*x;
a= b; a = b;
b= t; b = t;
t= c*n+d*x; t = c*n+d*x;
c= d; c = d;
d= t; d = t;
n+= 0.5; n += 0.5;
q1= q2; q1 = q2;
q2= b/d; q2 = b/d;
} while (fabs(q1-q2)/q2 > REL_ERROR); } while (fabs(q1-q2)/q2 > REL_ERROR);
return one_sqrtpi*exp(-x*x)*q2; return one_sqrtpi*exp(-x*x)*q2;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment