=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/real.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- OpenXM_contrib2/asir2000/engine/real.c 2016/06/29 08:16:11 1.11 +++ OpenXM_contrib2/asir2000/engine/real.c 2018/03/29 01:32:52 1.12 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/engine/real.c,v 1.10 2015/08/14 13:51:55 fujimoto Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/real.c,v 1.11 2016/06/29 08:16:11 ohara Exp $ */ #include "ca.h" #include "base.h" @@ -54,190 +54,190 @@ double RatnToReal(a) Q a; { - double nm,dn,man; - int enm,edn,e; + double nm,dn,man; + int enm,edn,e; - nm = NatToReal(NM(a),&enm); - if ( INT(a) ) - if ( enm >= 1 ) { - error("RatnToReal : Overflow"); - /* NOTREACHED */ - return 0; - } else - return SGN(a)>0 ? nm : -nm; - else { - dn = NatToReal(DN(a),&edn); - man = nm/dn; - if ( SGN(a) < 0 ) - man = -man; - if ( ((e = enm - edn) >= 1024) || (e <= -1023) ) { - error("RatnToReal : Overflow"); /* XXX */ - /* NOTREACHED */ - return 0; - } else if ( !e ) - return man; - else - return man*pow(2,e); - } + nm = NatToReal(NM(a),&enm); + if ( INT(a) ) + if ( enm >= 1 ) { + error("RatnToReal : Overflow"); + /* NOTREACHED */ + return 0; + } else + return SGN(a)>0 ? nm : -nm; + else { + dn = NatToReal(DN(a),&edn); + man = nm/dn; + if ( SGN(a) < 0 ) + man = -man; + if ( ((e = enm - edn) >= 1024) || (e <= -1023) ) { + error("RatnToReal : Overflow"); /* XXX */ + /* NOTREACHED */ + return 0; + } else if ( !e ) + return man; + else + return man*pow(2,e); + } } double NatToReal(a,expo) N a; int *expo; { - unsigned int *p; - int l,all,i,j,s,tb,top,tail; - unsigned int t,m[2]; - - p = BD(a); l = PL(a) - 1; - for ( top = 0, t = p[l]; t; t >>= 1, top++ ); - all = top + BSH*l; tail = (53-top)%BSH; i = l-(53-top)/BSH-1; - m[1] = i < 0 ? 0 : p[i]>>(BSH-tail); - for ( j = 1, i++, tb = tail; i <= l; i++ ) { - s = 32-tb; t = i < 0 ? 0 : p[i]; - if ( BSH > s ) { - m[j] |= ((t&((1<>s; tb = BSH-s; - } - } else { - m[j] |= (t<>= 1, top++ ); + all = top + BSH*l; tail = (53-top)%BSH; i = l-(53-top)/BSH-1; + m[1] = i < 0 ? 0 : p[i]>>(BSH-tail); + for ( j = 1, i++, tb = tail; i <= l; i++ ) { + s = 32-tb; t = i < 0 ? 0 : p[i]; + if ( BSH > s ) { + m[j] |= ((t&((1<>s; tb = BSH-s; + } + } else { + m[j] |= (t< 1) ) { - t = (double)pow((double)ToReal(a),(double)ToReal(b)); + if ( !b ) + MKReal(1.0,*c); + else if ( !a ) + *c = 0; + else if ( !RATN(b) || !INT(b) || (PL(NM((Q)b)) > 1) ) { + t = (double)pow((double)ToReal(a),(double)ToReal(b)); #if 0 - if ( !t ) - error("pwrreal : Underflow"); /* XXX */ - else + if ( !t ) + error("pwrreal : Underflow"); /* XXX */ + else #endif - MKReal(t,*c); - } else { - t = pwrreal0(BDY((Real)a),BD(NM((Q)b))[0]); - t = SGN((Q)b)>0?t:1/t; + MKReal(t,*c); + } else { + t = pwrreal0(BDY((Real)a),BD(NM((Q)b))[0]); + t = SGN((Q)b)>0?t:1/t; #if 0 - if ( !t ) - error("pwrreal : Underflow"); /* XXX */ - else + if ( !t ) + error("pwrreal : Underflow"); /* XXX */ + else #endif - MKReal(t,*c); - } + MKReal(t,*c); + } } double pwrreal0(n,e) double n; int e; { - double t; + double t; - if ( e == 1 ) - return n; - else { - t = pwrreal0(n,e / 2); - return e%2 ? t*t*n : t*t; - } + if ( e == 1 ) + return n; + else { + t = pwrreal0(n,e / 2); + return e%2 ? t*t*n : t*t; + } } int cmpreal(a,b) Real a,b; { - double t; + double t; - t = ToReal(a)-ToReal(b); - return t>0.0 ? 1 : t<0.0?-1 : 0; + t = ToReal(a)-ToReal(b); + return t>0.0 ? 1 : t<0.0?-1 : 0; }