=================================================================== RCS file: /home/cvs/OpenXM/src/hgm/mh/src/wmain.c,v retrieving revision 1.4 retrieving revision 1.26 diff -u -p -r1.4 -r1.26 --- OpenXM/src/hgm/mh/src/wmain.c 2013/02/20 05:20:49 1.4 +++ OpenXM/src/hgm/mh/src/wmain.c 2016/02/01 11:37:14 1.26 @@ -1,16 +1,22 @@ /* -$OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.3 2013/02/20 01:06:38 takayama Exp $ -License: LGPL - */ + $OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.25 2015/04/02 01:31:18 takayama Exp $ + License: LGPL +*/ #include #include #include #include #include "sfile.h" +#include "mh.h" #define SMAX 4096 -#define inci(i) { i++; if (i >= argc) { fprintf(stderr,"Option argument is not given.\n"); return(NULL); }} +#define inci(i) { i++; if (i >= argc) { oxprintfe("Option argument is not given.\n"); return(NULL); }} int MH_deallocate=0; +/* + changelog + 2016.02.01 C_2F1 + 2014.03.15 --strategy 1 is default. A new parser in setParam() + */ extern char *MH_Gfname; extern char *MH_Dfname; @@ -30,7 +36,35 @@ int MH_Dp; /* Data sampling period */ static double Xng=0.0; /* the last point */ int MH_RawName = 0; static int Testrank=0; +/* If MH_success is set to 1, then strategy, MH_abserr, MH_relerr seem to + be properly set. +*/ +int MH_success=0; +/* + Estimation of the maximal coeff of A in y'=Ay. + This might be too rough estimate. + */ +double MH_coeff_max; +/* + Estimation of h by MH_coeff_max; + */ +double MH_estimated_start_step; + +#ifdef C_2F1 +int MH_P_pFq=2; +int MH_Q_pFq=1; +double MH_A_pFq[2]; +double MH_B_pFq[1]; +#else +int MH_P_pFq=1; +int MH_Q_pFq=1; +double MH_A_pFq[1]; +double MH_B_pFq[1]; +#endif extern int MH_Verbose; +extern int MH_strategy; +extern double MH_abserr; +extern double MH_relerr; extern int MH_P95; /* 95 % points */ int mh_gopen_file(void); @@ -38,7 +72,12 @@ static int setParamTest(void); static int setParamDefault(void); static int setParam(char *fname); static int showParam(void); +static int next(struct SFILE *fp,char *s, char *msg); +static double estimateHg(int m, double beta[],double x0); +#ifdef C_2F1 +void mh_setabc(double a,double b,double c); +#endif /* #define DEBUG */ #ifdef DEBUG char *MH_Dfname; char *MH_Gfname; double MH_Hg; @@ -55,33 +94,27 @@ void mh_freeWorkArea(void) { mh_rf(0.0, NULL, 0, NULL, 0); MH_deallocate=0; /* switch to the normal mode. */ } -void *mh_malloc(int s) { - void *p; - p = (void*)malloc(s); - if (p == NULL) { - fprintf(stderr,"No memory.\n"); mh_exit(-1); - } - return(p); -} -mh_free(void *p) { - free(p); - return(0); -} -static mypower(int x,int n) { +static int mypower(int x,int n) { int a,i; a = 1; for (i=0; i SIGDIGIT_DEFAULT*myabs(y0[0])) { + MH_success = 0; + oxprintfe("%%%%Warning, abserr seems not to be small enough, abserr=%lg, y[0]=%lg\n",MH_abserr,y0[0]); + }else{ + MH_success = 1; + } + }else{ + MH_success = 0; + } + MH_estimated_start_step = estimateHg(MH_Mg,MH_Beta,MH_X0g); + if (MH_Verbose) showParam(); + if (MH_Verbose) {for (i=0; it.txt\n"); + oxprintfe(" ./hgm_w-n --idata t.txt --gnuplotf test-g --verbose\n"); + oxprintfe(" gnuplot -persist 1) dmin = myabs(beta[1]-beta[0]); + else dmin=myabs(beta[0]); + for (i=0; i