===================================================================
RCS file: /home/cvs/OpenXM/src/hgm/mh/src/wmain.c,v
retrieving revision 1.20
retrieving revision 1.37
diff -u -p -r1.20 -r1.37
--- OpenXM/src/hgm/mh/src/wmain.c	2014/03/15 00:43:47	1.20
+++ OpenXM/src/hgm/mh/src/wmain.c	2020/02/06 23:58:02	1.37
@@ -1,5 +1,5 @@
 /*
-  $OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.19 2014/03/14 05:58:16 takayama Exp $
+  $OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.36 2016/06/06 04:49:11 takayama Exp $
   License: LGPL
 */
 #include <stdio.h>
@@ -9,11 +9,15 @@
 #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;
@@ -48,6 +52,14 @@ 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;
@@ -62,6 +74,7 @@ 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;
@@ -75,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) {
@@ -85,7 +98,7 @@ 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;
@@ -105,6 +118,8 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
   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;
@@ -147,7 +162,7 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
     }else if (strcmp(argv[i],"--relerr")==0) {
       i++; sscanf(argv[i],"%lg",&MH_relerr);
     }else {
-      fprintf(stderr,"Unknown option %s\n",argv[i]);
+      oxprintfe("Unknown option %s\n",argv[i]);
       mh_usage();
       return(rp);
     }
@@ -164,7 +179,7 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
   if (MH_strategy) {
     if (MH_abserr > SIGDIGIT_DEFAULT*myabs(y0[0])) {
       MH_success = 0;
-      fprintf(stderr,"%%%%Warning, abserr seems not to be small enough, abserr=%lg, y[0]=%lg\n",MH_abserr,y0[0]);
+      oxprintfe("%%%%Warning, abserr seems not to be small enough, abserr=%lg, y[0]=%lg. Increasing the starting point (q0 or X0g(standalone case)) may or making abserr (err[1] or abserror(standalone case))  smaller will help, e.g., err=c(%lg,1e-10)\n",MH_abserr,y0[0],y0[0]*(1e-6));
     }else{
       MH_success = 1;
     }
@@ -173,47 +188,17 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
   }
   MH_estimated_start_step = estimateHg(MH_Mg,MH_Beta,MH_X0g);
   if (MH_Verbose) showParam();
-  if (MH_Verbose) {for (i=0; i<rank; i++) printf("%lf\n",y0[i]); }
+  if (MH_Verbose) {for (i=0; i<rank; i++) oxprintf("%lf\n",y0[i]); }
 
   *rp=mh_rkmain(x0,y0,xn);
   return(rp);
 }
 
 int mh_usage() {
-  fprintf(stderr,"Usages:\n");
-  fprintf(stderr,"hgm_w-n [--idata input_data_file --gnuplotf gnuplot_file_name\n");
-  fprintf(stderr," --dataf output_data_file --raw --xmax xmax --test m --step h]\n");
-  fprintf(stderr,"[ --95 --verbose] \n");
-  fprintf(stderr,"[ --strategy s --abserr ae --relerr re] \n");
-  fprintf(stderr,"s:0 rk, s:1 adaptive, s:2 adaptive&multiply, see rk.c for the default value of ae and re.\n");
-  fprintf(stderr,"strategy default = %d\n",MH_strategy);
-  fprintf(stderr,"--raw does not add data parameters to the output_data_file.\n");
-  fprintf(stderr,"\nThe command hgm_w-n [options] evaluates Pr({y | y<xmax}), which is the cumulative distribution function of the largest root of the m by m Wishart matrix with n degrees of freedom and the covariantce matrix sigma.\n");
-  fprintf(stderr,"All the eigenvalues of sigma must be simple.\n");
-  fprintf(stderr,"Parameters are specified by the input_data_file.\n");
-  fprintf(stderr,"Parameters are redefined when they appear more than once in the idata file and the command line options.\n");
-  fprintf(stderr,"The format of the input_data_file, which should be generated by the command hgm_jack-n.\n");
-  fprintf(stderr," MH_Mg: m, MH_Beta: beta=sigma^(-1)/2 (diagonized), MH_Ng: n, MH_X0g: starting value of x,\n");
-  fprintf(stderr," Iv: initial values at MH_X0g*MH_Beta (see our paper how to order them), \n");
-  fprintf(stderr," Ef: a scalar factor to the initial value. It may set to 1.\n");
-  fprintf(stderr," MH_Hg: h (step size),\n");
-  fprintf(stderr," MH_Dp: output data is stored in every MH_Dp steps when output_data_file is specified.\n");
-  fprintf(stderr," Xng: terminating value of x.\n");
-  fprintf(stderr," --95: output the 95%% point. --verbose: verbose mode.\n");
-  fprintf(stderr," The line started with %% is a comment line.\n");
-  fprintf(stderr," An example format of the input_data_file can be obtained by executing hgm_jack-n with no option.\n");
-  fprintf(stderr,"When --idata option is used, this command is quiet. Use --verbose option if you want to see some messages.\n");
-  fprintf(stderr,"\nExamples:\n");
-  fprintf(stderr,"[1] ./hgm_w-n \n");
-  fprintf(stderr,"[2] ./hgm_w-n --xmax 20\n");
-  fprintf(stderr,"[3] ./hgm_w-n --test 6\n");
-  fprintf(stderr,"   A test run in Mg=6.\n");
-  fprintf(stderr,"[4] ./hgm_jack-n --idata Testdata/tmp-idata3.txt --degree 15 >t.txt\n");
-  fprintf(stderr,"    ./hgm_w-n --idata t.txt --gnuplotf test-g --verbose\n");
-  fprintf(stderr,"    gnuplot -persist <test-g-gp.txt\n");
-  fprintf(stderr,"  tmp-idata3.txt is a sample input data distributed with this file.\n");
-  fprintf(stderr,"  test-g-gp.txt is an input file of the gnuplot\n");
-  fprintf(stderr,"  test-g is the table of x and the values of Pr({y | y<x}).\n");
+
+#include "usage-w-n.h"
+
+  return(0);
 }
 
 static int setParamTest() {
@@ -234,15 +219,21 @@ static int setParamTest() {
   MH_X0g = 0.3;
   MH_Hg = 0.001;
   MH_Dp = 1;
-  Xng = 10.0;
+  Xng = 10.0; return(0);
 }
 static int setParamDefault() {
   int rank;
+  double a[1];
+  double b[1];
   MH_M=MH_Mg = 2 ;
   MH_RANK=rank = mypower(2,MH_Mg);
   MH_Beta = (double *)mh_malloc(sizeof(double)*MH_Mg);
   MH_Beta[0] = 1.0; MH_Beta[1] = 2.0;
   MH_Ng = (double *)mh_malloc(sizeof(double)); *MH_Ng = 3.0;
+  a[0] = (MH_M+1.0)/2.0;
+  b[0] = a[0]+(*MH_Ng)/2.0;
+  mh_setA(a,1); mh_setB(b,1);
+  mh_rf = & mh_rf_ef_type_1;
   Iv = (double *)mh_malloc(sizeof(double)*rank);
   Iv[0] = 1.58693;
   Iv[1] = 0.811369;
@@ -251,41 +242,86 @@ static int setParamDefault() {
   Ef = 0.01034957388338225707;
   MH_X0g = 0.3;
   MH_Hg = 0.001;
-  MH_Dp = 1;
-  Xng = 10.0;
+  MH_Dp = 1000;
+  Xng = 10.0; return(0);
 }
-
-static int next(struct SFILE *sfp,char *s,char *msg) {
+#ifdef STANDALONE
+/* may remove */
+static int next_old1(struct SFILE *sfp,char *s,char *msg) {
   s[0] = '%';
   while (s[0] == '%') {
     if (!mh_fgets(s,SMAX,sfp)) {
-      fprintf(stderr,"Data format error at %s\n",msg);
+      oxprintfe("Data format error at %s\n",msg);
       mh_exit(-1);
     }
     if (s[0] != '%') return(0);
+  } return(0);
+}
+#endif
+static int next(struct SFILE *sfp,char *s,char *msg) {
+  static int check=1;
+  char *ng="%%Ng=";
+  // int i;
+  s[0] = '%';
+  while ((s[0] == '%') || (s[0] == '#')) {
+    if (!mh_fgets(s,SMAX,sfp)) {
+      oxprintfe("Data format error at %s\n",msg);
+      oxprintfe("Is it version 2.0 format? If so, add\n%s\nat the top.\n",VSTRING);
+      mh_exit(-1);
+    }
+	if ((s[0] == '%') && (s[1] == '%')) continue;
+    if (s[0] == '#') continue;
+    if (strncmp(s,VSTRING,strlen(VSTRING)) == 0) {
+	  return(2);
+	}
+    if (check && (strncmp(msg,ng,4)==0)) {
+      if (strncmp(s,ng,5) != 0) {
+        oxprintfe("Warning, there is no %%Ng= at the border of Beta's and Ng, s=%s\n",s);
+      }
+      /* check=0; */
+    }
+    if (s[0] != '%') return(0);
   }
+  return(0);
 }
+
 static int setParam(char *fname) {
-  int rank;
+  int rank=2;
   char s[SMAX];
   struct SFILE *fp;
   int i;
+  int version;
+  double a[1]; double b[1]; /* for old inputs */
   struct mh_token tk;
   extern int MH_deallocate;
   extern int MH_byFile;
   if (MH_deallocate) {
-    if (MH_Beta) mh_free(MH_Beta);
-    if (MH_Ng) mh_free(MH_Ng);
-    if (Iv) mh_free(Iv);
+    if (MH_Beta) {mh_free(MH_Beta); MH_Beta=NULL;}
+    if (MH_Ng) {mh_free(MH_Ng); MH_Ng=NULL;}
+    if (Iv) {mh_free(Iv); Iv = NULL;}
+	if (MH_A_pFq) {mh_free(MH_A_pFq); MH_A_pFq=NULL; MH_P_pFq = 0;}
+	if (MH_B_pFq) {mh_free(MH_B_pFq); MH_B_pFq=NULL; MH_Q_pFq = 0;}
     return(0);
   }
   if (fname == NULL) return(setParamDefault());
 
   if ((fp=mh_fopen(fname,"r",MH_byFile)) == NULL) {
-    fprintf(stderr,"File %s is not found.\n",fname);
+    oxprintfe("File %s is not found.\n",fname);
     mh_exit(-1);
   }
-  next(fp,s,"MH_Mg(m)");
+  /* set default initial values */
+  MH_Mg=MH_M=-1;  /* number of variables */
+  MH_Ng=(double *) mh_malloc(sizeof(double)); *MH_Ng=-1; /* *Ng is the degree of freedom 1F1 */
+  MH_X0g=0.1;   /* evaluation point */
+  Ef=1.0;    /* exponential factor */
+  MH_Ef_type=1;
+  MH_Hg=0.01;   /* step size for RK */
+  MH_Dp = -1;   /* sampling rate */
+  Xng = 10.0; /* terminal point for RK */
+
+  /* Parser for the old style (version <2.0) input */
+  version=next(fp,s,"Mg(m)");
+  if (version == 2) goto mh_myparse;
   sscanf(s,"%d",&MH_Mg); MH_M=MH_Mg;
   MH_RANK=rank = mypower(2,MH_Mg);
 
@@ -295,10 +331,16 @@ static int setParam(char *fname) {
     sscanf(s,"%lf",&(MH_Beta[i]));
   }
 
-  MH_Ng = (double *)mh_malloc(sizeof(double));
   next(fp,s,"MH_Ng(freedom parameter n)");
   sscanf(s,"%lf",MH_Ng);
+  /* for old style input only for 1F1 ef_type==1. */
+  MH_P_pFq = 1; MH_Q_pFq = 1;
+  a[0] = (MH_M+1.0)/2.0;
+  b[0] = a[0]+(*MH_Ng)/2.0;
+  mh_setA(a,1); mh_setB(b,1);
+  mh_rf = & mh_rf_ef_type_1;
   
+  
   next(fp,s,"MH_X0g(initial point)");
   sscanf(s,"%lf",&MH_X0g);
   
@@ -321,45 +363,244 @@ static int setParam(char *fname) {
   sscanf(s,"%lf",&Xng);
 
   /* Reading the optional parameters */
+ mh_myparse:
   while ((tk = mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_EOF) {
     /* expect ID */
     if (tk.type != MH_TOKEN_ID) {
-      fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+      oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
     }
     if ((strcmp(s,"abserr")==0) || (strcmp(s,"abserror")==0)) {
       if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
-        fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
       }
-      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_DOUBLE) {
-        fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+	MH_abserr = tk.dval;
+      }else if (tk.type == MH_TOKEN_INT) {
+	MH_abserr = tk.ival;
+      }else{
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
       }
-      MH_abserr = tk.dval;
       continue;
     }
     if ((strcmp(s,"relerr")==0) || (strcmp(s,"relerror")==0)) {
       if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
-        fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
       }
-      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_DOUBLE) {
-        fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+	MH_relerr = tk.dval;
+      }else if (tk.type == MH_TOKEN_INT) {
+	MH_relerr = tk.dval;
+      }else{
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
       }
-      MH_relerr = tk.dval;
       continue;
     }
     if (strcmp(s,"strategy")==0) {
       if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
-        fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
       }
       if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_INT) {
-        fprintf(stderr,"Syntax error at %s\n",s); mh_exit(-1);
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
       }
       MH_strategy = tk.ival;
       continue;
     }
-    fprintf(stderr,"Unknown ID at %s\n",s); mh_exit(-1);
+    // Format: #p_pFq=2  1.5  3.2   override by new input format.
+    if (strcmp(s,"p_pFq")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_INT) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      MH_P_pFq = tk.ival;
+	  mh_setA(NULL,tk.ival); /* allocate mem */
+      for (i=0; i<MH_P_pFq; i++) { 
+	if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+	  MH_A_pFq[i] = tk.dval;
+	}else if (tk.type == MH_TOKEN_INT) {
+	  MH_A_pFq[i] = tk.ival;
+	}else{
+	  oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+	}
+      }
+      continue;
+    }
+    if (strcmp(s,"q_pFq")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_INT) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      MH_Q_pFq = tk.ival;
+	  mh_setB(NULL,tk.ival); /* allocate mem */
+      for (i=0; i<MH_Q_pFq; i++) { 
+	if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+	  MH_B_pFq[i] = tk.dval;
+	}else if (tk.type == MH_TOKEN_INT) {
+	  MH_B_pFq[i] = tk.ival;
+	}else{
+	  oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+	}
+      }
+      continue;
+    }
+    if (strcmp(s,"ef_type")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_INT) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      MH_Ef_type = tk.ival;
+      continue;
+    }
+
+    if (strcmp(s,"Mg")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_INT) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      MH_Mg = tk.ival;  MH_M = MH_Mg;
+      MH_RANK = rank = mypower(2,MH_Mg);  
+      continue;
+    }
+    if (strcmp(s,"Beta")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+	  if (MH_Mg <= 0) {
+        oxprintfe("Mg should be set before reading Beta.\n"); mh_exit(-1);
+      }
+      MH_Beta = (double *)mh_malloc(sizeof(double)*MH_Mg);
+	  for (i=0; i<MH_Mg; i++) {
+        if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+           MH_Beta[i] = tk.dval;
+        }else if (tk.type == MH_TOKEN_INT) {
+           MH_Beta[i] = tk.ival;
+        }else {
+          oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+        }
+      }
+      Iv = (double *)mh_malloc(sizeof(double)*rank);
+	  for (i=0; i<rank; i++) {
+		Iv[i] = 0.0;
+	  }
+      continue;
+    }
+    if (strcmp(s,"Ng")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type== MH_TOKEN_DOUBLE) {
+		*MH_Ng = tk.dval;
+      }else if (tk.type == MH_TOKEN_INT) {
+        *MH_Ng = tk.ival;
+      }else{
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      continue;
+    }
+    if (strcmp(s,"X0g")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+		MH_X0g = tk.dval;
+	  }else if (tk.type == MH_TOKEN_INT) {
+		MH_X0g = tk.ival;
+      }else{
+		oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+	  }			
+      continue;
+    }
+	if (strcmp(s,"Iv")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+	  for (i=0; i<rank; i++) {
+        if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+		  Iv[i] = tk.dval;
+		}else if (tk.type == MH_TOKEN_INT) {
+		  Iv[i] = tk.ival;
+        }else{
+          oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+		}
+      }
+      continue;
+    }
+    if (strcmp(s,"Ef")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+		Ef = tk.dval;
+	  }else if (tk.type == MH_TOKEN_INT) {
+		Ef = tk.ival;
+      }else{
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+	  }
+      continue;
+    }
+    if (strcmp(s,"Hg")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+		MH_Hg = tk.dval;
+	  }else if (tk.type == MH_TOKEN_INT) {
+		MH_Hg = tk.ival;
+      }else{
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      continue;
+    }
+    if (strcmp(s,"Dp")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type != MH_TOKEN_INT) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      MH_Dp = tk.dval;
+      continue;
+    }
+    if (strcmp(s,"Xng")==0) {
+      if (mh_getoken(s,SMAX-1,fp).type != MH_TOKEN_EQ) {
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+      }
+      if ((tk=mh_getoken(s,SMAX-1,fp)).type == MH_TOKEN_DOUBLE) {
+		Xng = tk.dval;
+	  }else if (tk.type == MH_TOKEN_INT) {
+		Xng = tk.ival;
+      }else{
+        oxprintfe("Syntax error at %s\n",s); mh_exit(-1);
+	  }
+      continue;
+    }
+
+    oxprintfe("Unknown ID for wmain.c (old...) at %s.\n",s);  mh_exit(-1);
   }
+  if (MH_Ef_type == 1) {
+	mh_rf = &mh_rf_ef_type_1;
+  }else if (MH_Ef_type == 2) {
+	mh_rf = &mh_rf_ef_type_2;
+  }else{
+	oxprintfe("Ef_type = %d is not implemented.\n",MH_Ef_type); mh_exit(-1);
+  }
+  if ((MH_M < 0) || (MH_A_pFq==NULL)) {
+	oxprintfe("MH_M and p_pFq, q_pFq are compulsory parameters.\n"); mh_exit(-1);
+  }
+  if (MH_Dp < 0) MH_Dp = (int) floor(1/MH_Hg);
+  if (MH_P95 && (MH_Dp*MH_Hg < 2.0)) {
+	oxprintfe("%%%%Warning, the resolution to find 95 percent point is less than 2.0. Decrease Dp\n");
+  }
 
-  mh_fclose(fp);
+  mh_fclose(fp); return(0);
 }
 
 static int showParam() {
@@ -368,24 +609,36 @@ static int showParam() {
   extern double MH_abserr;
   extern double MH_relerr;
   rank = mypower(2,MH_Mg);
-  printf("%%MH_Mg=\n%d\n",MH_Mg);
+  oxprintf("%%MH_Mg=\n%d\n",MH_Mg);
   for (i=0; i<MH_Mg; i++) {
-    printf("%%MH_Beta[%d]=\n%lf\n",i,MH_Beta[i]);
+    oxprintf("%%MH_Beta[%d]=\n%lf\n",i,MH_Beta[i]);
   }
-  printf("%%MH_Ng=\n%lf\n",*MH_Ng);
-  printf("%%MH_X0g=\n%lf\n",MH_X0g);
+  oxprintf("%%MH_Ng=\n%lf\n",*MH_Ng);
+  oxprintf("%%MH_X0g=\n%lf\n",MH_X0g);
   for (i=0; i<rank; i++) {
-    printf("%%Iv[%d]=\n%lg\n",i,Iv[i]);
+    oxprintf("%%Iv[%d]=\n%lg\n",i,Iv[i]);
   }
-  printf("%%Ef=\n%lf\n",Ef);
-  printf("%%MH_Hg=\n%lf\n",MH_Hg);
-  printf("%%MH_Dp=\n%d\n",MH_Dp);
-  printf("%%Xng=\n%lf\n",Xng);
-  printf("%%strategy=%d\n",MH_strategy);
-  printf("%%abserr=%lg, %%relerr=%lg\n",MH_abserr,MH_relerr);
-  printf("#MH_success=%d\n",MH_success);
-  printf("#MH_coeff_max=%lg\n",MH_coeff_max);
-  printf("#MH_estimated_start_step=%lg\n",MH_estimated_start_step);
+  oxprintf("%%Ef=\n%lf\n",Ef);
+  oxprintf("%%MH_Hg=\n%lf\n",MH_Hg);
+  oxprintf("%%MH_Dp=\n%d\n",MH_Dp);
+  oxprintf("%%Xng=\n%lf\n",Xng);
+  oxprintf("%%strategy=%d\n",MH_strategy);
+  oxprintf("%%abserr=%lg, %%relerr=%lg\n",MH_abserr,MH_relerr);
+  oxprintf("#MH_success=%d\n",MH_success);
+  oxprintf("#MH_coeff_max=%lg\n",MH_coeff_max);
+  oxprintf("#MH_estimated_start_step=%lg\n",MH_estimated_start_step); 
+  oxprintf("%%ef_type=%d\n",MH_Ef_type);
+  oxprintf("%%q_pFq=%d, ",MH_P_pFq);
+  for (i=0; i<MH_P_pFq; i++) {
+    if (i != MH_P_pFq-1) oxprintf(" %lg,",MH_A_pFq[i]); 
+    else oxprintf(" %lg\n",MH_A_pFq[i]); 
+  }
+  oxprintf("%%q_pFq=%d, ",MH_Q_pFq); 
+  for (i=0; i<MH_Q_pFq; i++) {
+    if (i != MH_Q_pFq-1) oxprintf(" %lg,",MH_B_pFq[i]); 
+    else oxprintf(" %lg\n",MH_B_pFq[i]); 
+  }
+  return(0);
 }
 
 static double estimateHg(int m, double beta[],double x0) {
@@ -409,4 +662,43 @@ static double estimateHg(int m, double beta[],double x
   h = exp(log(MH_abserr/cmax)/5.0);
   MH_estimated_start_step = h;
   return h;
+}
+
+void mh_setA(double a[],int alen) {
+  int i;
+  if (alen < 0) {
+	if (MH_A_pFq != NULL) mh_free(MH_A_pFq);
+	MH_A_pFq=NULL; MH_P_pFq=-1;
+	return;
+  }
+  if (alen == 0) {
+	MH_P_pFq=0; return;
+  }
+  MH_P_pFq=alen;
+  MH_A_pFq = (double *)mh_malloc(MH_P_pFq*sizeof(double));
+  if (a != NULL) {
+	for (i=0; i<alen; i++) MH_A_pFq[i] = a[i];
+  }else{
+	for (i=0; i<alen; i++) MH_A_pFq[i] = 0.0;
+  }
+  return;
+}
+void mh_setB(double b[],int blen) {
+  int i;
+  if (blen < 0) {
+	if (MH_B_pFq != NULL) mh_free(MH_B_pFq);
+	MH_B_pFq=NULL; MH_Q_pFq=-1;
+	return;
+  }
+  if (blen == 0) {
+	MH_Q_pFq=0; return;
+  }
+  MH_Q_pFq=blen;
+  MH_B_pFq = (double *)mh_malloc(MH_Q_pFq*sizeof(double));
+  if (b != NULL) {
+	for (i=0; i<blen; i++) MH_B_pFq[i] = b[i];
+  }else{
+	for (i=0; i<blen; i++) MH_B_pFq[i] = 0.0;
+  }
+  return;
 }