=================================================================== RCS file: /home/cvs/OpenXM/src/hgm/mh/src/wmain.c,v retrieving revision 1.9 retrieving revision 1.30 diff -u -p -r1.9 -r1.30 --- OpenXM/src/hgm/mh/src/wmain.c 2013/03/05 05:26:07 1.9 +++ OpenXM/src/hgm/mh/src/wmain.c 2016/02/13 05:55:09 1.30 @@ -1,16 +1,25 @@ /* -$OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.8 2013/03/01 05:26:25 takayama Exp $ -License: LGPL - */ + $OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.29 2016/02/13 02:34:20 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); }} +#define VSTRING "%!version2.0" int MH_deallocate=0; +/* + changelog + 2016.02.13 code-n.c and code-n-2f1.c are linked together. New idata format. + 2016.02.04 MH_Ef_type exponential or scalar factor + 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 +39,31 @@ 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; + +int MH_P_pFq=1; +int MH_Q_pFq=1; +double *MH_A_pFq=NULL; +double *MH_B_pFq=NULL; +int MH_Ef_type=1; +MH_RF mh_rf=NULL; /* function pointer to mh_rf */ + 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); @@ -39,7 +72,9 @@ 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); + /* #define DEBUG */ #ifdef DEBUG char *MH_Dfname; char *MH_Gfname; double MH_Hg; @@ -53,7 +88,7 @@ void mh_freeWorkArea(void) { mh_main(0,NULL); setParam(NULL); mh_rkmain(0.0, NULL, 0.0); - mh_rf(0.0, NULL, 0, NULL, 0); + if (mh_rf) (*mh_rf)(0.0, NULL, 0, NULL, 0); MH_deallocate=0; /* switch to the normal mode. */ } static int mypower(int x,int n) { @@ -63,63 +98,75 @@ static int mypower(int x,int n) { return(a); } #ifdef STANDALONE2 -main(int argc,char *argv[]) { +int main(int argc,char *argv[]) { + int strategy=STRATEGY_DEFAULT; + double err[2]={-1.0,-1.0}; + int i; mh_exit(MH_RESET_EXIT); /* standalone mode */ -/* mh_main(argc,argv); - mh_freeWorkArea(); */ + /* mh_main(argc,argv); + mh_freeWorkArea(); */ mh_main(argc,argv); + /* showParam(); */ + return(0); } #endif struct MH_RESULT *mh_main(int argc,char *argv[]) { - static double *y0; + static double *y0=NULL; double x0,xn; double ef; int i,rank; struct MH_RESULT *rp=NULL; extern int MH_deallocate; extern int MH_byFile; + extern double Ef; + Ef = 1; MH_byFile=1; if (MH_deallocate) { if (y0) mh_free(y0); return(rp); } setParam(NULL); MH_Gfname = MH_Dfname = NULL; MH_Verbose=1; for (i=1; 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; i1) dmin = myabs(beta[1]-beta[0]); + else dmin=myabs(beta[0]); + for (i=0; i