===================================================================
RCS file: /home/cvs/OpenXM/src/hgm/mh/src/wmain.c,v
retrieving revision 1.12
retrieving revision 1.19
diff -u -p -r1.12 -r1.19
--- OpenXM/src/hgm/mh/src/wmain.c	2013/03/08 04:54:01	1.12
+++ OpenXM/src/hgm/mh/src/wmain.c	2014/03/14 05:58:16	1.19
@@ -1,5 +1,5 @@
 /*
-  $OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.11 2013/03/07 05:23:31 takayama Exp $
+  $OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.18 2014/03/14 02:21:40 takayama Exp $
   License: LGPL
 */
 #include <stdio.h>
@@ -33,6 +33,7 @@ int MH_RawName = 0;
 static int Testrank=0;
 extern int MH_Verbose;
 
+
 extern int MH_P95;  /* 95 % points */
 int mh_gopen_file(void);
 static int setParamTest(void);
@@ -83,10 +84,11 @@ main(int argc,char *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;
@@ -150,38 +152,48 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
   mh_gopen_file();
   if (MH_Verbose) {for (i=0; i<rank; i++) printf("%lf\n",y0[i]); }
   rp = (struct MH_RESULT*) mh_malloc(sizeof(struct MH_RESULT));
+  rp->message = NULL;
+  rp->t_success = 0;
+  rp->series_error = 1.0e+10;
+  rp->recommended_abserr = 1.0e-10;
+
   *rp=mh_rkmain(x0,y0,xn);
   return(rp);
 }
 
 int mh_usage() {
   fprintf(stderr,"Usages:\n");
-  fprintf(stderr,"w-m [--idata input_data_file --gnuplotf gnuplot_file_name\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,"--raw does not add data parameters to the output_data_file.\n");
-  fprintf(stderr,"\nThe command w-m [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,"\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,"The format of the input_data_file.\n");
-  fprintf(stderr," MH_Mg: m, MH_Beta: beta=sigma^(-1)/2 (diagonized), MH_Ng: n, Iv: initial values at MH_X0g*MH_Beta (see our paper how to order them), \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), MH_X0g: starting value of x, Xng: terminating value of x\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 w-2 with no option.\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] ./w-2 \n");
-  fprintf(stderr,"[2] ./w-2 --xmax 20\n");
-  fprintf(stderr,"[3] ./w-6 --test 6\n");
-  fprintf(stderr,"   A test run of w-6.\n");
-  fprintf(stderr,"   The number m and mm must agree for  ./w-m --test mm.\n");
-  fprintf(stderr,"[4] ./w-5 --idata tmp-inm-m5* --gnuplot tmp-graph\n");
-  fprintf(stderr,"  tmp-inm-m5* is a sample input data distributed with this file.\n");
-  fprintf(stderr,"  tmp-graph-gp.txt is an input file of the gnuplot\n");
-  fprintf(stderr,"  It can be executed with the load command in the gnuplot.\n");
-  fprintf(stderr,"  tmp-graph is the table of x and the values of Pr({y | y<x}).\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\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");
 }
 
 static int setParamTest() {