=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/interval.h,v retrieving revision 1.1 retrieving revision 1.4 diff -u -p -r1.1 -r1.4 --- OpenXM_contrib2/asir2018/include/interval.h 2018/09/19 06:00:58 1.1 +++ OpenXM_contrib2/asir2018/include/interval.h 2019/11/12 10:53:23 1.4 @@ -1,5 +1,5 @@ /* - * $OpenXM$ + * $OpenXM: OpenXM_contrib2/asir2018/include/interval.h,v 1.3 2019/10/17 03:03:12 kondoh Exp $ */ #ifndef _INTERVAL_H #define _INTERVAL_H @@ -7,7 +7,14 @@ #define PRINTF_G 0 #define PRINTF_E 1 +#define INT_ASIR_VERSION 20191111 + #if defined(INTERVAL) +#if INTERVAL == 0 +#undef INTERVAL +#endif +#endif +#if defined(INTERVAL) #include @@ -30,6 +37,7 @@ static char *Interval_dummy; #endif #endif +#if 0 #ifdef linux #include #if 1 @@ -99,7 +107,15 @@ static char *Interval_dummy; #define FPMINUSINF _controlfp(_RC_DOWN,_MCW_RC); #define FPTOZERO _controlfp(_RC_CHOP,_MCW_RC); #endif +#endif +#include +#define FPNEAREST fesetround(FE_TONEAREST); +#define FPPLUSINF fesetround(FE_UPWARD); +#define FPMINUSINF fesetround(FE_DOWNWARD); +#define FPTOZERO fesetround(FE_TOWARDZERO); + + /* no control function of floating point rounding */ #ifndef FPNEAREST #define FPNEAREST fprintf(stderr, "Fpu control FPNEAREST is not supported in this machine yet.\n"); @@ -118,6 +134,8 @@ static char *Interval_dummy; #define MID_PRINTF_G 2 #define MID_PRINTF_E 3 +#define DEFAULTPREC 0 /* for mpfr */ + /* data structures */ struct oItv { short id; @@ -169,7 +187,10 @@ struct oIntervalBigFloat { typedef struct oIntervalBigFloat *IntervalBigFloat; extern int zerorewrite; +extern int zerorewriteCount; +#define ZEROREWRITE if (zerorewrite && initvp(0,c) ) { *rp = 0; zerorewriteCount++; } + /* general macros */ #define INF(p) ((p)->inf) #define SUP(p) ((p)->sup) @@ -183,13 +204,13 @@ extern int zerorewrite; #define NEWIntervalBigFloat(q) ((q)=(IntervalBigFloat)MALLOC(sizeof(struct oIntervalBigFloat)),\ OID(q)=O_N,NID(q)=N_IntervalBigFloat) #define MKItvP(a,b,c) (NEWItvP(c),(INF(c)=(a),SUP(c)=(b))) -#define MKIntervalDouble(a,b,c) if((zerorewrite) && ((a)<=0.0) && ((b)>=0.0)) (c)=0;\ - else (NEWIntervalDouble(c),(INF(c)=(a),SUP(c)=(b))) +#define MKIntervalDouble(a,b,c) if((zerorewrite) && ((a)<=0.0) && ((b)>=0.0)) {(c)=0;zerorewriteCount++;}\ + else (NEWIntervalDouble(c),(INF(c)=(a),SUP(c)=(b))) #define MKIntervalQuad(a,b,c) (NEWIntervalQuad(c),(INF(c)=(a),SUP(c)=(b))) #define MKIntervalBigFloat(a,b,c) (NEWIntervalBigFloat(c),(INF(c)=(a),SUP(c)=(b))) #define ToItvP(a,c) (NEWItvP(c),INF(c)=(a),SUP(c)=(a)) -#define ToIntervalDouble(a,c) (NEWIntervalDouble(c),INF(c)=(ToReal(a)),SUP(c)=(ToReal(a))) +#define ToIntervalDouble(a,c) (NEWIntervalDouble(c),INF(c)=(toRealDown(a)),SUP(c)=(toRealUp(a))) #define ToIntervalBigFloat(a,c) (NEWIntervalBigFloat(c),INF(c)=(a),SUP(c)=(a)) #define ITVP(a) (NID(a)==N_IP) @@ -197,19 +218,20 @@ extern int zerorewrite; #define ITVQ(a) (NID(a)==N_IntervalQuad) #define ITVF(a) (NID(a)==N_IntervalBigFloat) -/*** engine/itv.c ***/ +#define EvalIntervalDouble 0 +#define EvalIntervalQuad 1 +#define EvalIntervalBigFloat 2 + +#if 0 double ToRealSup(Num); double ToRealInf(Num); double RatnToRealUp(Q); -double NatToRealUp(Z, int *); +double NatToRealUp(N, int *); void double2bf(double, BF *); double bf2double(BF); -void itvtois(Itv, Num *, Num *); -void istoitv(Num, Num, Itv *); -#if 0 void additv(Num, Num, Num *); void subitv(Num, Num, Num *); void mulitv(Num, Num, Num *); @@ -218,7 +240,7 @@ int itvinitv(Itv, Itv); void divitv(Num, Num, Num *); void sqrtitv(Num, Num *); void pwritv(Num, Num, Num *); -void pwritv0(Itv, int, Itv *); +void pwritv0(Itv, long, Itv *); void chsgnitv(Num, Num *); void miditv(Itv, Num *); int cmpitv(Itv, Itv); @@ -228,37 +250,60 @@ void widthitv(Itv, Num *); void distanceitv(Itv, Itv, Num *); #endif +/*** engine/p-itv.c ***/ +void itvtois(Itv, Num *, Num *); +void istoitv(Num, Num, Itv *); + void additvp(Itv, Itv, Itv *); void subitvp(Itv, Itv, Itv *); void mulitvp(Itv, Itv, Itv *); void divitvp(Itv, Itv, Itv *); +void pwritvp(Itv, Num, Itv *); +void pwritv0p(Itv, long, Itv *); void chsgnitvp(Itv, Itv *); +int initvp(Num , Itv ); +int itvinitvp(Itv, Itv); int cmpitvp(Itv, Itv); -void pwritvp(Itv, Num, Itv *); -void pwritv0p(Itv, int, Itv *); +void miditvp(Itv, Num *); void cupitvp(Itv, Itv, Itv *); void capitvp(Itv, Itv, Itv *); void widthitvp(Itv, Num *); +void absitvp(Itv, Num *); +void absintvalp(Itv, Itv *); void distanceitvp(Itv, Itv, Num *); -void ToBf(Num, BF *); -void double2bf(double, BF *); -double bf2double(BF); -void addulp(IntervalBigFloat, IntervalBigFloat *); -void getulp(BF, BF *); +/*** engine/f-itv.c ***/ + +//void ToBf(Num, BF *); +//void double2bf(double, BF *); +//double bf2double(BF); +//void addulp(IntervalBigFloat, IntervalBigFloat *); +//void getulp(BF, BF *); +double mpfr2dblDown(mpfr_t); +double mpfr2dblUp(mpfr_t); +void toInterval(Num, int, int, Num *); + void additvf(IntervalBigFloat, IntervalBigFloat, IntervalBigFloat *); void subitvf(IntervalBigFloat, IntervalBigFloat, IntervalBigFloat *); void mulitvf(IntervalBigFloat, IntervalBigFloat, IntervalBigFloat *); void divitvf(IntervalBigFloat, IntervalBigFloat, IntervalBigFloat *); -void chsgnitvf(Itv, Itv *); +void chsgnitvf(IntervalBigFloat, IntervalBigFloat *); +int initvf(Num, Itv); +int itvinitvf(Itv, Itv); int cmpitvf(Itv, Itv); void pwritvf(Itv, Num, Itv *); -void pwritv0f(Itv, int, Itv *); +void pwritv0f(Itv, long, Itv *); +void miditvf(Itv, Num *); +void cupitvf(Itv, Itv, Itv *); +void capitvf(Itv, Itv, Itv *); +void widthitvf(Itv, Num *); +void absitvf(Itv, Num *); +void distanceitvf(Itv, Itv, Num *); /*** engine/d-itv.c ***/ -double ToRealDown(Num); -double ToRealUp(Num); +double toRealDown(Num); +double toRealUp(Num); void Num2double(Num, double *, double *); void additvd(Num, Num, IntervalDouble *); @@ -266,15 +311,85 @@ void subitvd(Num, Num, IntervalDouble *); void mulitvd(Num, Num, IntervalDouble *); void divitvd(Num, Num, IntervalDouble *); void chsgnitvd(IntervalDouble, IntervalDouble *); +int initvd(Num, IntervalDouble); int cmpitvd(IntervalDouble, IntervalDouble); void pwritvd(Num, Num, IntervalDouble *); -void pwritv0d(IntervalDouble, int, IntervalDouble *); +void pwritv0d(IntervalDouble, long, IntervalDouble *); void miditvd(IntervalDouble, Num *); void cupitvd(IntervalDouble, IntervalDouble, IntervalDouble *); void capitvd(IntervalDouble, IntervalDouble, IntervalDouble *); void widthitvd(IntervalDouble, Num *); void absitvd(IntervalDouble, Num *); +void absintvald(IntervalDouble, IntervalDouble *); void distanceitvd(IntervalDouble, IntervalDouble, Num *); + +/*** builtin/itvnum.c ***/ + +void evalitvr(VL ,Obj ,int , int , Obj *); +void evalitvp(VL ,P ,int , int , P *); +void evalitvv(VL ,V ,int , int , Obj *); +//void evalitvins(PFINS ,int , int , Obj *); +extern void (*pi_itv_ft[])(); +extern void (*e_itv_ft[])(); +extern void (*sin_itv_ft[])(); +extern void (*cos_itv_ft[])(); +extern void (*tan_itv_ft[])(); +extern void (*asin_itv_ft[])(); +extern void (*acos_itv_ft[])(); +extern void (*atan_itv_ft[])(); +extern void (*sinh_itv_ft[])(); +extern void (*cosh_itv_ft[])(); +extern void (*tanh_itv_ft[])(); +extern void (*asinh_itv_ft[])(); +extern void (*acosh_itv_ft[])(); +extern void (*atanh_itv_ft[])(); +extern void (*exp_itv_ft[])(); +extern void (*log_itv_ft[])(); +extern void (*abs_itv_ft[])(); +extern void (*pow_itv_ft[])(); +//void devalr(VL ,Obj ,Obj *); +//void devalp(VL ,P ,P *); +//void devalv(VL ,V ,Obj *); +//void devalins(PFINS ,Obj *); + +void Pitvbf_pi(NODE ,Obj *); +void Pitvbf_e(NODE ,Obj *); +void Pitvbf_sin(NODE ,Obj *); +void Pitvbf_cos(NODE ,Obj *); +void Pitvbf_tan(NODE ,Obj *); +void Pitvbf_asin(NODE ,Obj *); +void Pitvbf_acos(NODE ,Obj *); +void Pitvbf_atan(NODE ,Obj *); +void Pitvbf_sinh(NODE ,Obj *); +void Pitvbf_cosh(NODE ,Obj *); +void Pitvbf_tanh(NODE ,Obj *); +void Pitvbf_asinh(NODE ,Obj *); +void Pitvbf_acosh(NODE ,Obj *); +void Pitvbf_atanh(NODE ,Obj *); +void Pitvbf_exp(NODE ,Obj *); +void Pitvbf_log(NODE ,Obj *); +void Pitvbf_abs(NODE ,Obj *); +//void mp_factorial(NODE ,Num *); +void Pitvbf_pow(NODE ,Num *); + +void Pitvd_pi(NODE ,Obj *); +void Pitvd_e(NODE ,Obj *); +void Pitvd_sin(NODE ,Obj *); +void Pitvd_cos(NODE ,Obj *); +void Pitvd_tan(NODE ,Obj *); +void Pitvd_asin(NODE ,Obj *); +void Pitvd_acos(NODE ,Obj *); +void Pitvd_atan(NODE ,Obj *); +void Pitvd_sinh(NODE ,Obj *); +void Pitvd_cosh(NODE ,Obj *); +void Pitvd_tanh(NODE ,Obj *); +void Pitvd_asinh(NODE ,Obj *); +void Pitvd_acosh(NODE ,Obj *); +void Pitvd_atanh(NODE ,Obj *); +void Pitvd_exp(NODE ,Obj *); +void Pitvd_log(NODE ,Obj *); +void Pitvd_abs(NODE ,Obj *); +void Pitvd_pow(NODE ,Num *); #endif /* end of INTERVAL */ #endif /* end of _INTERVAL_H */