===================================================================
RCS file: /home/cvs/OpenXM/src/hgm/mh/src/wmain.c,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM/src/hgm/mh/src/wmain.c	2013/02/19 08:03:14	1.2
+++ OpenXM/src/hgm/mh/src/wmain.c	2013/02/23 06:01:15	1.7
@@ -1,17 +1,21 @@
 /*
-$OpenXM$
+$OpenXM: OpenXM/src/hgm/mh/src/wmain.c,v 1.6 2013/02/21 07:30:56 takayama Exp $
 License: LGPL
  */
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+#include "sfile.h"
 #define SMAX 4096
-#define inci(i) { i++; if (i >= argc) { fprintf(stderr,"Option argument is not given.\n"); return(-1); }}
+#define inci(i) { i++; if (i >= argc) { fprintf(stderr,"Option argument is not given.\n"); return(NULL); }}
+int MH_deallocate=0;
+
 extern char *MH_Gfname;
 extern char *MH_Dfname;
 
 /* global variables. They are set in setParam() */
+int MH_byFile=1;
 int MH_RANK;
 int MH_M;
 
@@ -30,31 +34,28 @@ extern int MH_Verbose;
 
 extern int MH_P95;  /* 95 % points */
 int mh_gopen_file(void);
-double mh_rkmain(double x0,double y0[],double xn);
 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
 char *MH_Dfname; char *MH_Gfname; double MH_Hg;
 int mh_gopen_file(void) { }
-double mh_rkmain(double x0,double y0[],double xn) { }
+struct MH_RESULT mh_rkmain(double x0,double y0[],double xn) { }
 #endif
 
-void *mh_malloc(int s) {
-  void *p;
-  p = (void*)malloc(s);
-  if (p == NULL) {
-	fprintf(stderr,"No memory.\n"); mh_exit(-1);
-  }
-  return(p);
+void mh_freeWorkArea(void) {
+  extern int MH_deallocate;
+  MH_deallocate=1; /* switch to deallocation mode. */
+  mh_main(0,NULL); 
+  setParam(NULL);  
+  mh_rkmain(0.0, NULL, 0.0);
+  mh_rf(0.0, NULL, 0, NULL, 0);
+  MH_deallocate=0; /* switch to the normal mode. */
 }
-mh_free(void *p) {
-  free(p);
-  return(0);
-}
 static mypower(int x,int n) {
   int a,i;
   a = 1;
@@ -63,14 +64,22 @@ static mypower(int x,int n) {
 }
 #ifdef STANDALONE
 main(int argc,char *argv[]) {
-  return mh_main(argc,char *argv[]);
+  mh_exit(MH_RESET_EXIT); /* standalone mode */
+/*  mh_main(argc,argv);
+  mh_freeWorkArea(); */
+  mh_main(argc,argv);
 }
 #endif
-mh_main(int argc,char *argv[]) {
-  double *y0;
+struct MH_RESULT *mh_main(int argc,char *argv[]) {
+  static double *y0;
   double x0,xn;
   double ef;
   int i,rank;
+  struct MH_RESULT *rp=NULL;
+  extern int MH_deallocate;
+  extern int MH_byFile;
+  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<argc; i++) {
 	if (strcmp(argv[i],"--idata")==0) {
@@ -79,11 +88,11 @@ mh_main(int argc,char *argv[]) {
 	}else if (strcmp(argv[i],"--gnuplotf")==0) {
 	  inci(i);
 	  MH_Gfname = (char *)mh_malloc(SMAX);
-	  strncpy(MH_Gfname,argv[i],SMAX-1);
+	  strcpy(MH_Gfname,argv[i]);
 	}else if (strcmp(argv[i],"--dataf")==0) {
 	  inci(i);
 	  MH_Dfname = (char *)mh_malloc(SMAX);
-	  strncpy(MH_Dfname,argv[i],SMAX-1);
+	  strcpy(MH_Dfname,argv[i]);
 	}else if (strcmp(argv[i],"--xmax")==0) {
       inci(i);
 	  sscanf(argv[i],"%lf",&Xng);
@@ -91,7 +100,7 @@ mh_main(int argc,char *argv[]) {
       inci(i);
 	  sscanf(argv[i],"%lg",&MH_Hg);
 	}else if (strcmp(argv[i],"--help")==0) {
-	  mh_usage(); return(0);
+	  mh_usage(); return(rp);
 	}else if (strcmp(argv[i],"--raw")==0) {
 	  MH_RawName = 1;
 	}else if (strcmp(argv[i],"--test")==0) {
@@ -102,10 +111,12 @@ mh_main(int argc,char *argv[]) {
 	  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(-1);
+	  return(rp);
 	}
   }
   if (MH_Verbose) showParam();
@@ -117,7 +128,9 @@ mh_main(int argc,char *argv[]) {
   for (i=0; i<rank; i++) y0[i] = ef*Iv[i];
   mh_gopen_file();
   if (MH_Verbose) {for (i=0; i<rank; i++) printf("%lf\n",y0[i]); }
-  mh_rkmain(x0,y0,xn);
+  rp = (struct MH_RESULT*) mh_malloc(sizeof(struct MH_RESULT));
+  *rp=mh_rkmain(x0,y0,xn);
+  return(rp);
 }
 
 mh_usage() {
@@ -134,7 +147,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");
@@ -189,10 +202,10 @@ static setParamDefault() {
   Xng = 10.0;
 }
 
-next(FILE *fp,char *s,char *msg) {
+static next(struct SFILE *sfp,char *s,char *msg) {
   s[0] = '%';
   while (s[0] == '%') {
-	if (!fgets(s,SMAX,fp)) {
+	if (!mh_fgets(s,SMAX,sfp)) {
 	  fprintf(stderr,"Data format error at %s\n",msg);
 	  mh_exit(-1);
 	}
@@ -202,11 +215,19 @@ next(FILE *fp,char *s,char *msg) {
 static setParam(char *fname) {
   int rank;
   char s[SMAX];
-  FILE *fp;
+  struct SFILE *fp;
   int i;
+  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 (fname == NULL) return(setParamDefault());
 
-  if ((fp=fopen(fname,"r")) == NULL) {
+  if ((fp=mh_fopen(fname,"r",MH_byFile)) == NULL) {
 	fprintf(stderr,"File %s is not found.\n",fname);
 	mh_exit(-1);
   }
@@ -244,7 +265,7 @@ static setParam(char *fname) {
 
   next(fp,s,"Xng (the last point, cf. --xmax)");
   sscanf(s,"%lf",&Xng);
-  fclose(fp);
+  mh_fclose(fp);
 }
 
 showParam() {
@@ -265,10 +286,3 @@ showParam() {
   printf("%%Xng=\n%lf\n",Xng);
 }
 
-mh_exit(int n) {
-#ifdef STANDALONE
-  exit(n);
-#else
-  fprintf(stderr,"Fatal error mh_exit(%d) in mh-w-n.\n",n);
-#endif  
-}