Skip to content

Commit

Permalink
Specs adjusted for FLoat.
Browse files Browse the repository at this point in the history 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
shigek committed Aug 1, 2003
1 parent fd5bdcd commit 5d8f361
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 74 deletions.
76 changes: 60 additions & 16 deletions ext/bigdecimal/bigdecimal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@
*
*/

#include "ruby.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <float.h>
#include <math.h>
#include "ruby.h"
#include "math.h"
#include "version.h"

/* #define ENABLE_NUMERIC_STRING */
Expand Down Expand Up @@ -720,6 +721,17 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
if(!b) return DoSomeOne(self,r);
SAVE(b);

if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
if(VpIsInf(a) || VpIsInf(b)) goto NaN;
if(VpIsZero(b)) goto NaN;
if(VpIsZero(a)) {
GUARD_OBJ(c,VpCreateRbObject(1, "0"));
GUARD_OBJ(d,VpCreateRbObject(1, "0"));
*div = d;
*mod = c;
return (VALUE)0;
}

mx = a->Prec;
if(mx<b->Prec) mx = b->Prec;
mx =(mx + 1) * VpBaseFig();
Expand All @@ -728,9 +740,23 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
VpDivd(c, res, a, b);
mx = c->Prec *(VpBaseFig() + 1);
GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
VpActiveRound(d,c,VP_ROUND_FLOOR,0);
VpActiveRound(d,c,VP_ROUND_DOWN,0);
VpMult(res,d,b);
VpAddSub(c,a,res,-1);
if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
VpAddSub(res,d,VpOne(),-1);
VpAddSub(d ,c,b, 1);
*div = res;
*mod = d;
} else {
*div = d;
*mod = c;
}
return (VALUE)0;

NaN:
GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
GUARD_OBJ(d,VpCreateRbObject(1, "NaN"));
*div = d;
*mod = c;
return (VALUE)0;
Expand Down Expand Up @@ -813,22 +839,32 @@ BigDecimal_divmod(VALUE self, VALUE r)
}

static VALUE
BigDecimal_div2(VALUE self, VALUE b, VALUE n)
BigDecimal_div2(int argc, VALUE *argv, VALUE self)
{
ENTER(10);
VALUE obj;
Real *res=NULL;
Real *av=NULL, *bv=NULL, *cv=NULL;
U_LONG ix = (U_LONG)GetPositiveInt(n);
U_LONG mx = (ix+VpBaseFig()*2);
GUARD_OBJ(cv,VpCreateRbObject(mx,"0"));
GUARD_OBJ(av,GetVpValue(self,1));
GUARD_OBJ(bv,GetVpValue(b,1));
mx = cv->MaxPrec+1;
GUARD_OBJ(res,VpCreateRbObject((mx * 2 + 2)*VpBaseFig(), "#0"));
VpDivd(cv,res,av,bv);
VpLeftRound(cv,VpGetRoundMode(),ix);
return ToValue(cv);
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;
obj = BigDecimal_DoDivmod(self,b,&div,&mod);
if(obj!=(VALUE)0) return obj;
return ToValue(div);
} else { /* div in BigDecimal sense */
Real *res=NULL;
Real *av=NULL, *bv=NULL, *cv=NULL;
U_LONG ix = (U_LONG)GetPositiveInt(n);
U_LONG mx = (ix+VpBaseFig()*2);
GUARD_OBJ(cv,VpCreateRbObject(mx,"0"));
GUARD_OBJ(av,GetVpValue(self,1));
GUARD_OBJ(bv,GetVpValue(b,1));
mx = cv->MaxPrec+1;
GUARD_OBJ(res,VpCreateRbObject((mx * 2 + 2)*VpBaseFig(), "#0"));
VpDivd(cv,res,av,bv);
VpLeftRound(cv,VpGetRoundMode(),ix);
return ToValue(cv);
}
}

static VALUE
Expand Down Expand Up @@ -1318,17 +1354,19 @@ 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, 2);
rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -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);
rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
rb_define_method(rb_cBigDecimal, "+@", BigDecimal_uplus, 0);
rb_define_method(rb_cBigDecimal, "-@", BigDecimal_neg, 0);
rb_define_method(rb_cBigDecimal, "*", BigDecimal_mult, 1);
rb_define_method(rb_cBigDecimal, "/", BigDecimal_div, 1);
rb_define_method(rb_cBigDecimal, "quo", BigDecimal_div, 1);
rb_define_method(rb_cBigDecimal, "%", BigDecimal_mod, 1);
rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
Expand Down Expand Up @@ -1820,6 +1858,12 @@ VpInit(U_LONG BaseVal)
return DBLE_FIG;
}

VP_EXPORT Real *
VpOne()
{
return VpConstOne;
}

/* If exponent overflows,then raise exception or returns 0 */
static int
AddExponent(Real *a,S_INT n)
Expand Down
7 changes: 6 additions & 1 deletion ext/bigdecimal/bigdecimal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,16 @@ VP_EXPORT void VpMidRound(Real *y, int f, int nf);
VP_EXPORT void VpLeftRound(Real *y, int f, int nf);
VP_EXPORT void VpFrac(Real *y,Real *x);
VP_EXPORT int VpPower(Real *y,Real *x,S_INT n);

/* VP constants */
VP_EXPORT Real *VpOne();

#ifdef ENABLE_TRIAL_METHOD
VP_EXPORT void VpPi(Real *y);
VP_EXPORT void VpExp1(Real *y);
VP_EXPORT void VpExp(Real *y,Real *x);
VP_EXPORT void VpSinCos(Real *psin,Real *pcos,Real *x);

#endif /* ENABLE_TRIAL_METHOD */
/*
* ------------------
* MACRO definitions.
Expand Down
42 changes: 11 additions & 31 deletions ext/bigdecimal/bigdecimal_en.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,40 +233,35 @@ <H4><U>Instance methods</U></H4>
For the resulting number of significant digits of c,see <A HREF="#PREC">Resulting number of significant digits</A>.
</BLOCKQUOTE>

<LI><B>add</B></LI><BLOCKQUOTE>
<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
c = a.add(b,n)<BR>
c = a.add(b,n) performs c = a + b.
If n is less than the actual significant digits of a + b,
then c is rounded properly according to the BigDecimal.limit.

</BLOCKQUOTE>
<LI><B>sub</B></LI><BLOCKQUOTE>
<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
c = a.sub(b,n)<BR>
c = a.sub(b,n) performs c = a - b.
If n is less than the actual significant digits of a - b,
then c is rounded properly according to the BigDecimal.limit.

</BLOCKQUOTE>
<LI><B>mult</B></LI><BLOCKQUOTE>
<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
c = a.mult(b,n)<BR>
c = a.mult(b,n) performs c = a * b.
If n is less than the actual significant digits of a * b,
then c is rounded properly according to the BigDecimal.limit.

</BLOCKQUOTE>
<LI><B>div</B></LI><BLOCKQUOTE>
<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
c = a.div(b,n)<BR>
c = a.div(b,n) performs c = a / b.
If n is less than the actual significant digits of a / b,
then c is rounded properly according to the BigDecimal.limit.

then c is rounded properly according to the BigDecimal.limit.<BR>
If n is not given,then the result will be an integer(BigDecimal) like Float#div.
</BLOCKQUOTE>
<LI><B>%</B></LI><BLOCKQUOTE>
r = a%b <BR>
is the same as:<BR>
r = a-((a/b).floor)*b<BR>

</BLOCKQUOTE>
<LI><B>fix</B></LI><BLOCKQUOTE>
c = a.fix<BR>
returns integer part of a.<BR>
Expand Down Expand Up @@ -350,26 +345,6 @@ <H4><U>Instance methods</U></H4>
c = BigDecimal::new("1.23456").truncate(4) # ==> 1.2345
c = BigDecimal::new("15.23456").truncate(-1) # ==> 10.0
</PRE></CODE>

</BLOCKQUOTE>
<LI><B>divmod</B></LI><BLOCKQUOTE>
c,r = a.divmod(b) # a = c*b + r<BR>
returns the quotient and remainder of a/b.<BR>
a = c * b + r is always satisfied.<BR>
where c is the integer satisfying
c = (a/b).floor <BR>
and,therefore
r = a - c*b<BR>

</BLOCKQUOTE>
<LI><B>remainder</B></LI><BLOCKQUOTE>
r=a.remainder(b)<BR>
returns the remainder of a/b.<BR>
where c is the integer satisfying
c = (a/b).fix <BR>
and,therefore:
r = a - c*b<BR>

</BLOCKQUOTE>
<LI><B>abs</B></LI><BLOCKQUOTE>
c = a.abs<BR>
Expand Down Expand Up @@ -483,6 +458,11 @@ <H4><U>Instance methods</U></H4>
c = a.power(n)<BR>
returns the value of a powered by n(c=a**n).
n must be an integer.<BR>
</BLOCKQUOTE>

<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
See,corresponding methods in Float class.
</BLOCKQUOTE>

</BLOCKQUOTE>
<LI><B>&lt;=&gt;</B></LI><BLOCKQUOTE>
Expand Down
36 changes: 10 additions & 26 deletions ext/bigdecimal/bigdecimal_ja.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,39 +247,35 @@

</BLOCKQUOTE>

<LI><B>add</B></LI><BLOCKQUOTE>
<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
以下のように使用します。<BR>
c = a.add(b,n)<BR>
c = a + b を最大で n 桁まで計算します。
a + b の精度が n より大きいときは BigDecimal.mode で指定された方法で丸められます。

</BLOCKQUOTE>
<LI><B>sub</B></LI><BLOCKQUOTE>
<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
以下のように使用します。<BR>
c = a.sub(b,n)<BR>
c = a - b を最大で n 桁まで計算します。
a - b の精度が n より大きいときは BigDecimal.mode で指定された方法で丸められます。

</BLOCKQUOTE>
<LI><B>mult</B></LI><BLOCKQUOTE>
<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
以下のように使用します。<BR>
c = a.mult(b,n)<BR>
c = a * b を最大で n 桁まで計算します。
a * b の精度が n より大きいときは BigDecimal.mode で指定された方法で丸められます。

</BLOCKQUOTE>
<LI><B>div</B></LI><BLOCKQUOTE>
<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
以下のように使用します。<BR>
c = a.div(b,n)<BR>
c = a / b を最大で n 桁まで計算します。
a / b の精度が n より大きいときは BigDecimal.mode で指定された方法で丸められます。
a / b の精度が n より大きいときは BigDecimal.mode で指定された方法で丸められます。<BR>
n が省略されたときは Float#div と同様に結果が整数(BigDecimal)になります。
</BLOCKQUOTE>

<LI><B>%</B></LI><BLOCKQUOTE>
r = a%b <BR>
a/b の余りを計算します。以下の計算と同じものです。<BR>
r = a-((a/b).floor)*b<BR>
</BLOCKQUOTE>
<LI><B>fix</B></LI><BLOCKQUOTE>
a の小数点以下の切り捨て。<BR>
c = a.fix
Expand Down Expand Up @@ -359,23 +355,7 @@
c = BigDecimal("1.23456").truncate(4) # ==> 1.2345
c = BigDecimal("15.23456").truncate(-1) # ==> 10.0
</PRE></CODE>

</BLOCKQUOTE>
<LI><B>divmod</B></LI><BLOCKQUOTE>
商と剰余の配列を返します。<BR>
c,r = a.divmod(b) # a = c*b + r<BR>
divmodメソッドは a = c * b + r となる a / b の浮動小数点型の商 c と剰余 r を
計算します。ここで c は整数（少数部分のない実数）になります。<BR>
c = (a/b).floor <BR>
r = a - c*b<BR>
で計算されます。
</BLOCKQUOTE>
<LI><B>remainder</B></LI><BLOCKQUOTE>
r=a.remainder(b)<BR>
a/b の剰余 r を計算します。<BR>
c = (a/b).fix <BR>
r = a - c*b<BR>
で計算されます。

</BLOCKQUOTE>
<LI><B>abs</B></LI><BLOCKQUOTE>
Expand Down Expand Up @@ -482,6 +462,10 @@
c = a.sqrt(n)<BR>
</BLOCKQUOTE>

<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
詳細は対応する Float の各メソッドを参照して下さい。
</BLOCKQUOTE>

<LI><B>&lt=&gt</B></LI><BLOCKQUOTE>
a==b なら 0、a &gt b なら 1、a &lt b なら -1 になります。<BR>
c = a &lt=&gt b
Expand Down

0 comments on commit 5d8f361

Please sign in to comment.