bigdecimal 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c97cb6ce62111804b296b14c294e00833500b5d9
-  data.tar.gz: d6c8d262b5acb0d1e5ff652ffc2b63a5acad8c21
+  metadata.gz: 60d3dce1a57a777beadceb1451b2e0972b60181a
+  data.tar.gz: 65e7f3cab117bbbdc380fa3680187fa666b2ce9e
 SHA512:
-  metadata.gz: d69e3aa32a795c3ff76b080198867a7cff700a87ad373be151ead80f9035168216139c0db73d5c1bce8fd044cd863ef21cac7351b0d49b30fe35829b7696404a
-  data.tar.gz: ca5224f1997fb8c31decf7b41a26a05134efd6b6f5284dc576c89c6d51061eb58d51d72b5f05c008e063c5c73646aab167c4ef4fc226981b99ebf4ba0ac84070
+  metadata.gz: 7c9dbd7e5132491e100390193c623310c24f24b65dfd5dbb351dd8254e353d0748f5c5fffb3c868fb0f889095d60080d5e2b026f74caf30eae8925a23c912c0a
+  data.tar.gz: 827e65f0a6ad81a6a2d499aa4d53fd566f3d67338b9294d1bf17642e24dedcd3e9c5ad562064f32ab9b5ee256d6d5f24b355bd3f094cef6ecf6d668aa21ca532

data/bigdecimal.c

@@ -190,13 +190,13 @@ cannot_be_coerced_into_BigDecimal(VALUE exc_class, VALUE v)
     rb_exc_raise(rb_exc_new3(exc_class, str));
 }
 
-static VALUE BigDecimal_div2(int, VALUE*, VALUE);
+static inline VALUE BigDecimal_div2(VALUE, VALUE, VALUE);
 
 static Real*
 GetVpValueWithPrec(VALUE v, long prec, int must)
 {
     Real *pv;
-    VALUE num, bg, args[2];
+    VALUE num, bg;
     char szD[128];
     VALUE orig = Qundef;
 
@@ -215,9 +215,7 @@ again:
 	    pv = GetVpValueWithPrec(num, -1, must);
 	    if (pv == NULL) goto SomeOneMayDoIt;
 
-	    args[0] = RRATIONAL(v)->den;
-	    args[1] = LONG2NUM(prec);
-	    v = BigDecimal_div2(2, args, ToValue(pv));
+	    v = BigDecimal_div2(ToValue(pv), RRATIONAL(v)->den, LONG2NUM(prec));
 	    goto again;
 	}
 
@@ -1456,42 +1454,55 @@ BigDecimal_divmod(VALUE self, VALUE r)
 /*
  * See BigDecimal#quo
  */
-static VALUE
-BigDecimal_div2(int argc, VALUE *argv, VALUE self)
+static inline VALUE
+BigDecimal_div2(VALUE self, VALUE b, VALUE n)
 {
     ENTER(5);
-    VALUE b,n;
-    int na = rb_scan_args(argc, argv, "11", &b, &n);
-    if (na == 1) { /* div in Float sense */
-	Real *div = NULL;
-	Real *mod;
-	if (BigDecimal_DoDivmod(self, b, &div, &mod)) {
-	    return BigDecimal_to_i(ToValue(div));
-	}
-	return DoSomeOne(self, b, rb_intern("div"));
-    } else {    /* div in BigDecimal sense */
-	SIGNED_VALUE ix = GetPositiveInt(n);
-	if (ix == 0) return BigDecimal_div(self, b);
-	else {
-	    Real *res = NULL;
-	    Real *av = NULL, *bv = NULL, *cv = NULL;
-	    size_t mx = ix + VpBaseFig()*2;
-	    size_t pl = VpSetPrecLimit(0);
+    SIGNED_VALUE ix;
 
-	    GUARD_OBJ(cv, VpCreateRbObject(mx, "0"));
-	    GUARD_OBJ(av, GetVpValue(self, 1));
-	    GUARD_OBJ(bv, GetVpValue(b, 1));
-	    mx = av->Prec + bv->Prec + 2;
-	    if (mx <= cv->MaxPrec) mx = cv->MaxPrec + 1;
-	    GUARD_OBJ(res, VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
-	    VpDivd(cv, res, av, bv);
-	    VpSetPrecLimit(pl);
-	    VpLeftRound(cv, VpGetRoundMode(), ix);
-	    return ToValue(cv);
-	}
+    if (NIL_P(n)) { /* div in Float sense */
+        Real *div = NULL;
+        Real *mod;
+        if (BigDecimal_DoDivmod(self, b, &div, &mod)) {
+            return BigDecimal_to_i(ToValue(div));
+        }
+        return DoSomeOne(self, b, rb_intern("div"));
+    }
+
+    /* div in BigDecimal sense */
+    ix = GetPositiveInt(n);
+    if (ix == 0) {
+        return BigDecimal_div(self, b);
+    }
+    else {
+        Real *res = NULL;
+        Real *av = NULL, *bv = NULL, *cv = NULL;
+        size_t mx = ix + VpBaseFig()*2;
+        size_t pl = VpSetPrecLimit(0);
+
+        GUARD_OBJ(cv, VpCreateRbObject(mx, "0"));
+        GUARD_OBJ(av, GetVpValue(self, 1));
+        GUARD_OBJ(bv, GetVpValue(b, 1));
+        mx = av->Prec + bv->Prec + 2;
+        if (mx <= cv->MaxPrec) mx = cv->MaxPrec + 1;
+        GUARD_OBJ(res, VpCreateRbObject((mx * 2  + 2)*VpBaseFig(), "#0"));
+        VpDivd(cv, res, av, bv);
+        VpSetPrecLimit(pl);
+        VpLeftRound(cv, VpGetRoundMode(), ix);
+        return ToValue(cv);
     }
 }
 
+static VALUE
+BigDecimal_div3(int argc, VALUE *argv, VALUE self)
+{
+    VALUE b,n;
+
+    rb_scan_args(argc, argv, "11", &b, &n);
+
+    return BigDecimal_div2(self, b, n);
+}
+
 static VALUE
 BigDecimal_add2(VALUE self, VALUE b, VALUE n)
 {
@@ -2183,7 +2194,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	return ToValue(y);
     }
 
-retry:
+  retry:
     switch (TYPE(vexp)) {
       case T_FIXNUM:
 	break;
@@ -2370,7 +2381,7 @@ retry:
 	}
     }
 
-    int_exp = FIX2INT(vexp);
+    int_exp = FIX2LONG(vexp);
     ma = int_exp;
     if (ma <  0) ma = -ma;
     if (ma == 0) ma = 1;
@@ -2383,7 +2394,7 @@ retry:
 	GUARD_OBJ(y, VpCreateRbObject(1, "0"));
     }
     VpPower(y, x, int_exp);
-    if (VpIsDef(y)) {
+    if (!NIL_P(prec) && VpIsDef(y)) {
 	VpMidRound(y, VpGetRoundMode(), n);
     }
     return ToValue(y);
@@ -2664,7 +2675,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 {
     ssize_t prec, n, i;
     Real* vx = NULL;
-    VALUE one, d, x1, y, z;
+    VALUE one, d, y;
     int negative = 0;
     int infinite = 0;
     int nan = 0;
@@ -2740,14 +2751,11 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
     }
 
     one = ToValue(VpCreateRbObject(1, "1"));
-    x1  = one;
     y   = one;
     d   = y;
-    z   = one;
-    i   = 0;
+    i   = 1;
 
     while (!VpIsZero((Real*)DATA_PTR(d))) {
-	VALUE argv[2];
 	SIGNED_VALUE const ey = VpExponent10(DATA_PTR(y));
 	SIGNED_VALUE const ed = VpExponent10(DATA_PTR(d));
 	ssize_t m = n - vabs(ey - ed);
@@ -2761,20 +2769,14 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 	    m = rmpd_double_figures();
 	}
 
-	x1 = BigDecimal_mult2(x1, x, SSIZET2NUM(n));
-	++i;
-	z = BigDecimal_mult(z, SSIZET2NUM(i));
-	argv[0] = z;
-	argv[1] = SSIZET2NUM(m);
-	d = BigDecimal_div2(2, argv, x1);
-	y = BigDecimal_add(y, d);
+	d = BigDecimal_mult(d, x);                             /* d <- d * x */
+	d = BigDecimal_div2(d, SSIZET2NUM(i), SSIZET2NUM(m));  /* d <- d / i */
+	y = BigDecimal_add(y, d);                              /* y <- y + d  */
+	++i;                                                   /* i  <- i + 1 */
     }
 
     if (negative) {
-	VALUE argv[2];
-	argv[0] = y;
-	argv[1] = vprec;
-	return BigDecimal_div2(2, argv, one);
+	return BigDecimal_div2(one, y, vprec);
     }
     else {
 	vprec = SSIZET2NUM(prec - VpExponent10(DATA_PTR(y)));
@@ -2783,10 +2785,8 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 
     RB_GC_GUARD(one);
     RB_GC_GUARD(x);
-    RB_GC_GUARD(x1);
     RB_GC_GUARD(y);
     RB_GC_GUARD(d);
-    RB_GC_GUARD(z);
 }
 
 /* call-seq:
@@ -2807,7 +2807,7 @@ BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
     ssize_t prec, n, i;
     SIGNED_VALUE expo;
     Real* vx = NULL;
-    VALUE argv[2], vn, one, two, w, x2, y, d;
+    VALUE vn, one, two, w, x2, y, d;
     int zero = 0;
     int negative = 0;
     int infinite = 0;
@@ -2913,9 +2913,7 @@ get_vp_value:
 	expo = 0;
     }
     w = BigDecimal_sub(x, one);
-    argv[0] = BigDecimal_add(x, one);
-    argv[1] = vn;
-    x = BigDecimal_div2(2, argv, w);
+    x = BigDecimal_div2(w, BigDecimal_add(x, one), vn);
     RB_GC_GUARD(x2) = BigDecimal_mult2(x, x, vn);
     RB_GC_GUARD(y)  = x;
     RB_GC_GUARD(d)  = y;
@@ -2933,9 +2931,7 @@ get_vp_value:
 
 	x = BigDecimal_mult2(x2, x, vn);
 	i += 2;
-	argv[0] = SSIZET2NUM(i);
-	argv[1] = SSIZET2NUM(m);
-	d = BigDecimal_div2(2, argv, x);
+	d = BigDecimal_div2(x, SSIZET2NUM(i), SSIZET2NUM(m));
 	y = BigDecimal_add(y, d);
     }
 
@@ -3214,7 +3210,7 @@ Init_bigdecimal(void)
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
     rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
     rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
-    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div2, -1);
+    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div3, -1);
     rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
     rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
     rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);

data/bigdecimal.gemspec

@@ -1,10 +1,9 @@
 # -*- ruby -*-
-_VERSION = "1.2.2"
+_VERSION = "1.2.3"
 
 Gem::Specification.new do |s|
   s.name = "bigdecimal"
   s.version = _VERSION
-  s.date = "2012-02-19"
   s.summary = "Arbitrary-precision decimal floating-point number library."
   s.homepage = "http://www.ruby-lang.org"
   s.email = "mrkn@mrkn.jp"

data/lib/bigdecimal/math.rb

@@ -226,19 +226,6 @@ module BigMath
   #
   def E(prec)
     raise ArgumentError, "Zero or negative precision for E" if prec <= 0
-    n    = prec + BigDecimal.double_fig
-    one  = BigDecimal("1")
-    y  = one
-    d  = y
-    z  = one
-    i  = 0
-    while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
-      m = BigDecimal.double_fig if m < BigDecimal.double_fig
-      i += 1
-      z *= i
-      d  = one.div(z,m)
-      y += d
-    end
-    y
+    BigMath.exp(1, prec)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bigdecimal
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Kenta Murata
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-19 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies: []
 description: This library provides arbitrary-precision decimal floating-point number
   class.
@@ -20,10 +20,10 @@ extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
-- bigdecimal.gemspec
+- README
 - bigdecimal.c
+- bigdecimal.gemspec
 - bigdecimal.h
-- README
 - depend
 - extconf.rb
 - lib/bigdecimal/jacobian.rb
@@ -40,22 +40,21 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- .
+- "."
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0.preview.2
 signing_key: 
 specification_version: 4
 summary: Arbitrary-precision decimal floating-point number library.
 test_files: []
-has_rdoc: