diff options
| author | Paolo Bosetti <[email protected]> | 2012-05-17 17:40:21 -0700 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-05-17 17:40:21 -0700 |
| commit | 5760ad7d594b731e17954674dda448dfd4c1b7aa (patch) | |
| tree | b104ff95adb355e6b2341413574513bca1aa6eda | |
| parent | 5d5d189dee7cd28e9811cef460b3c7ffc1da315d (diff) | |
| download | mruby-5760ad7d594b731e17954674dda448dfd4c1b7aa.tar.gz mruby-5760ad7d594b731e17954674dda448dfd4c1b7aa.zip | |
Minor edits in tests for Math module
| -rw-r--r-- | src/math.c | 9 | ||||
| -rw-r--r-- | test/assert.rb | 2 | ||||
| -rw-r--r-- | test/t/math.rb | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/math.c b/src/math.c index 73bcf5e2a..b0d911573 100644 --- a/src/math.c +++ b/src/math.c @@ -10,6 +10,8 @@ #define domain_error(msg) \ mrb_raise(mrb, E_RANGE_ERROR, "Numerical argument is out of domain - " #msg); +#define MATH_TOLERANCE 1E-12 + /* math functions not provided under Microsoft Visual C++ */ #ifdef _MSC_VER #define asinh(x) log(x + sqrt(pow(x,2.0) + 1)) @@ -25,7 +27,7 @@ erfc(double x); ** Implementations of error functions ** credits to http://www.digitalmars.com/archives/cplusplus/3634.html */ -#define REL_ERROR 1E-12 + /* Implementation of Error function */ double erf(double x) @@ -45,7 +47,7 @@ erf(double x) term *= xsqr/j; sum += term/(2*j+1); ++j; - } while (fabs(term)/sum > REL_ERROR); + } while (fabs(term)/sum > MATH_TOLERANCE); return two_sqrtpi*sum; } @@ -77,7 +79,7 @@ erfc(double x) n += 0.5; q1 = q2; q2 = b/d; - } while (fabs(q1-q2)/q2 > REL_ERROR); + } while (fabs(q1-q2)/q2 > MATH_TOLERANCE); return one_sqrtpi*exp(-x*x)*q2; } @@ -610,6 +612,7 @@ mrb_init_math(mrb_state *mrb) struct RClass *mrb_math; mrb_math = mrb_define_module(mrb, "Math"); + mrb_define_const(mrb, mrb_math, "TOLERANCE", mrb_float_value(MATH_TOLERANCE)); #ifdef M_PI mrb_define_const(mrb, mrb_math, "PI", mrb_float_value(M_PI)); #else diff --git a/test/assert.rb b/test/assert.rb index afc39fc24..54b50138e 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -22,7 +22,7 @@ end # iso : The ISO reference code of the feature # which will be tested by this # assertion -def assert(str = 'Assertion failed', iso = '') +def assert(str = 'Assertion failed', iso = 'No ISO') begin if(!yield) $asserts.push([str, iso]) diff --git a/test/t/math.rb b/test/t/math.rb index 0f42e7d49..eb4cebabc 100644 --- a/test/t/math.rb +++ b/test/t/math.rb @@ -1,12 +1,11 @@ ## # Math Test -MATH_TOLERANCE = 1E-12 def check(a,b) a = a.to_f b = b.to_f if a.finite? and b.finite? - (a-b).abs < MATH_TOLERANCE + (a-b).abs < Math::TOLERANCE else true end @@ -14,7 +13,7 @@ end assert('Math.sin 0') do - check(Math.sin(0), 0) + check(Math.sin(0), 1) end assert('Math.sin PI/2') do |
