===================================================================
RCS file: /home/cvs/OpenXM/src/hgm/mh/src/wmain.c,v
retrieving revision 1.4
retrieving revision 1.12
diff -u -p -r1.4 -r1.12
--- OpenXM/src/hgm/mh/src/wmain.c	2013/02/20 05:20:49	1.4
+++ OpenXM/src/hgm/mh/src/wmain.c	2013/03/08 04:54:01	1.12
@@ -1,12 +1,13 @@
 /*
-$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.11 2013/03/07 05:23:31 takayama Exp $
+  License: LGPL
+*/
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #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); }}
 int MH_deallocate=0;
@@ -38,6 +39,7 @@ 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);
 
 /* #define DEBUG */
 #ifdef DEBUG
@@ -55,29 +57,32 @@ 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<n; i++) a = a*x;
   return(a);
 }
-#ifdef STANDALONE
+#ifdef STANDALONE2
 main(int argc,char *argv[]) {
-/*  mh_main(argc,argv);
-  mh_freeWorkArea(); */
+  int strategy=STRATEGY_DEFAULT;
+  double err[2]={-1.0,-1.0};
+  int i;
+  for (i=1; i<argc; i++) {
+    if (strcmp(argv[i],"--strategy")==0) {
+      i++; sscanf(argv[i],"%d",&strategy);
+    }else if (strcmp(argv[i],"--abserr")==0) {
+      i++; sscanf(argv[i],"%lg",&(err[0]));
+    }else if (strcmp(argv[i],"--relerr")==0) {
+      i++; sscanf(argv[i],"%lg",&(err[1]));
+    }else ;
+  }
+  mh_set_strategy(strategy,err);
+  mh_exit(MH_RESET_EXIT); /* standalone mode */
+  /*  mh_main(argc,argv);
+      mh_freeWorkArea(); */
   mh_main(argc,argv);
+  /* showParam(); */
 }
 #endif
 struct MH_RESULT *mh_main(int argc,char *argv[]) {
@@ -92,42 +97,48 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
   if (MH_deallocate) { if (y0) mh_free(y0); return(rp); }
   setParam(NULL); MH_Gfname = MH_Dfname = NULL; MH_Verbose=1;
   for (i=1; i<argc; i++) {
-	if (strcmp(argv[i],"--idata")==0) {
-	  inci(i);
-	  setParam(argv[i]); MH_Verbose=0;
-	}else if (strcmp(argv[i],"--gnuplotf")==0) {
-	  inci(i);
-	  MH_Gfname = (char *)mh_malloc(SMAX);
-	  strcpy(MH_Gfname,argv[i]);
-	}else if (strcmp(argv[i],"--dataf")==0) {
-	  inci(i);
-	  MH_Dfname = (char *)mh_malloc(SMAX);
-	  strcpy(MH_Dfname,argv[i]);
-	}else if (strcmp(argv[i],"--xmax")==0) {
+    if (strcmp(argv[i],"--idata")==0) {
       inci(i);
-	  sscanf(argv[i],"%lf",&Xng);
-	}else if (strcmp(argv[i],"--step")==0) {
+      setParam(argv[i]); MH_Verbose=0;
+    }else if (strcmp(argv[i],"--gnuplotf")==0) {
       inci(i);
-	  sscanf(argv[i],"%lg",&MH_Hg);
-	}else if (strcmp(argv[i],"--help")==0) {
-	  mh_usage(); return(rp);
-	}else if (strcmp(argv[i],"--raw")==0) {
-	  MH_RawName = 1;
-	}else if (strcmp(argv[i],"--test")==0) {
-	  inci(i);
-	  sscanf(argv[i],"%d",&Testrank);
-	  setParamTest();
-	}else if (strcmp(argv[i],"--95")==0) {
-	  MH_P95=1;
-	}else if (strcmp(argv[i],"--verbose")==0) {
-	  MH_Verbose=1;
-	}else if (strcmp(argv[i],"--bystring")==0) {
-	  MH_byFile = 0;
-	}else {
-	  fprintf(stderr,"Unknown option %s\n",argv[i]);
-	  mh_usage();
-	  return(rp);
-	}
+      MH_Gfname = (char *)mh_malloc(SMAX);
+      strcpy(MH_Gfname,argv[i]);
+    }else if (strcmp(argv[i],"--dataf")==0) {
+      inci(i);
+      MH_Dfname = (char *)mh_malloc(SMAX);
+      strcpy(MH_Dfname,argv[i]);
+    }else if (strcmp(argv[i],"--xmax")==0) {
+      inci(i);
+      sscanf(argv[i],"%lf",&Xng);
+    }else if (strcmp(argv[i],"--step")==0) {
+      inci(i);
+      sscanf(argv[i],"%lg",&MH_Hg);
+    }else if (strcmp(argv[i],"--help")==0) {
+      mh_usage(); return(rp);
+    }else if (strcmp(argv[i],"--raw")==0) {
+      MH_RawName = 1;
+    }else if (strcmp(argv[i],"--test")==0) {
+      inci(i);
+      sscanf(argv[i],"%d",&Testrank);
+      setParamTest();
+    }else if (strcmp(argv[i],"--95")==0) {
+      MH_P95=1;
+    }else if (strcmp(argv[i],"--verbose")==0) {
+      MH_Verbose=1;
+    }else if (strcmp(argv[i],"--bystring")==0) {
+      MH_byFile = 0;
+	}else if (strcmp(argv[i],"--strategy")==0) {
+	  i++; /* ignore */
+	}else if (strcmp(argv[i],"--abserr")==0) {
+	  i++; /* ignore */
+	}else if (strcmp(argv[i],"--relerr")==0) {
+	  i++; /* ignore */
+    }else {
+      fprintf(stderr,"Unknown option %s\n",argv[i]);
+      mh_usage();
+      return(rp);
+    }
   }
   if (MH_Verbose) showParam();
   x0 = MH_X0g;
@@ -143,7 +154,7 @@ struct MH_RESULT *mh_main(int argc,char *argv[]) {
   return(rp);
 }
 
-mh_usage() {
+int mh_usage() {
   fprintf(stderr,"Usages:\n");
   fprintf(stderr,"w-m [--idata input_data_file --gnuplotf gnuplot_file_name\n");
   fprintf(stderr," --dataf output_data_file --raw --xmax xmax --test m --step h]\n");
@@ -157,7 +168,7 @@ mh_usage() {
   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_Dp: output data is stored in every MH_Dp steps when output_data_file is specified.\n");
-  fprintf(stderr," --95: output the 95% point. --verbose: verbose mode.\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,"\nExamples:\n");
@@ -173,7 +184,7 @@ mh_usage() {
   fprintf(stderr,"  tmp-graph is the table of x and the values of Pr({y | y<x}).\n");
 }
 
-static setParamTest() {
+static int setParamTest() {
   int rank;
   int i;
   extern int Testrank;
@@ -193,7 +204,7 @@ static setParamTest() {
   MH_Dp = 1;
   Xng = 10.0;
 }
-static setParamDefault() {
+static int setParamDefault() {
   int rank;
   MH_M=MH_Mg = 2 ;
   MH_RANK=rank = mypower(2,MH_Mg);
@@ -212,17 +223,17 @@ static setParamDefault() {
   Xng = 10.0;
 }
 
-next(struct SFILE *sfp,char *s,char *msg) {
+static int next(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);
-	  mh_exit(-1);
-	}
-	if (s[0] != '%') return(0);
+    if (!mh_fgets(s,SMAX,sfp)) {
+      fprintf(stderr,"Data format error at %s\n",msg);
+      mh_exit(-1);
+    }
+    if (s[0] != '%') return(0);
   }
 }
-static setParam(char *fname) {
+static int setParam(char *fname) {
   int rank;
   char s[SMAX];
   struct SFILE *fp;
@@ -230,16 +241,16 @@ static setParam(char *fname) {
   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);
-	return(0);
+    if (MH_Beta) mh_free(MH_Beta);
+    if (MH_Ng) mh_free(MH_Ng);
+    if (Iv) mh_free(Iv);
+    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);
-	mh_exit(-1);
+    fprintf(stderr,"File %s is not found.\n",fname);
+    mh_exit(-1);
   }
   next(fp,s,"MH_Mg(m)");
   sscanf(s,"%d",&MH_Mg); MH_M=MH_Mg;
@@ -248,7 +259,7 @@ static setParam(char *fname) {
   MH_Beta = (double *)mh_malloc(sizeof(double)*MH_Mg);
   for (i=0; i<MH_Mg; i++) {
     next(fp,s,"MH_Beta");
-	sscanf(s,"%lf",&(MH_Beta[i]));
+    sscanf(s,"%lf",&(MH_Beta[i]));
   }
 
   MH_Ng = (double *)mh_malloc(sizeof(double));
@@ -260,8 +271,8 @@ static setParam(char *fname) {
   
   Iv = (double *)mh_malloc(sizeof(double)*rank);
   for (i=0; i<rank; i++) {
-	next(fp,s,"Iv(initial values)");
-	sscanf(s,"%lg",&(Iv[i]));
+    next(fp,s,"Iv(initial values)");
+    sscanf(s,"%lg",&(Iv[i]));
   }
 
   next(fp,s,"Ef(exponential factor)");
@@ -278,29 +289,26 @@ static setParam(char *fname) {
   mh_fclose(fp);
 }
 
-showParam() {
+int showParam() {
   int rank,i;
+  extern int MH_strategy;
+  extern double MH_abserr;
+  extern double MH_relerr;
   rank = mypower(2,MH_Mg);
   printf("%%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]);
+    printf("%%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);
   for (i=0; i<rank; i++) {
-	printf("%%Iv[%d]=\n%lg\n",i,Iv[i]);
+    printf("%%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);
 }
 
-mh_exit(int n) {
-#ifdef STANDALONE
-  exit(n);
-#else
-  /* todo, use setjmp, longjmp */
-  fprintf(stderr,"Fatal error mh_exit(%d) in mh-w-n.\n",n);
-#endif  
-}