--- imach/src/imach.c	2016/09/02 06:45:35	1.243
+++ imach/src/imach.c	2016/09/02 08:49:22	1.246
@@ -1,6 +1,15 @@
-/* $Id: imach.c,v 1.243 2016/09/02 06:45:35 brouard Exp $
+/* $Id: imach.c,v 1.246 2016/09/02 08:49:22 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.246  2016/09/02 08:49:22  brouard
+  *** empty log message ***
+
+  Revision 1.245  2016/09/02 07:25:01  brouard
+  *** empty log message ***
+
+  Revision 1.244  2016/09/02 07:17:34  brouard
+  *** empty log message ***
+
   Revision 1.243  2016/09/02 06:45:35  brouard
   *** empty log message ***
 
@@ -931,12 +940,12 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.243 2016/09/02 06:45:35 brouard Exp $ */
+/* $Id: imach.c,v 1.246 2016/09/02 08:49:22 brouard Exp $ */
 /* $State: Exp $ */
 #include "version.h"
 char version[]=__IMACH_VERSION__;
 char copyright[]="February 2016,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2018";
-char fullversion[]="$Revision: 1.243 $ $Date: 2016/09/02 06:45:35 $"; 
+char fullversion[]="$Revision: 1.246 $ $Date: 2016/09/02 08:49:22 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -3643,7 +3652,7 @@ double funcone( double *x)
       ll[s[mw[mi][i]][i]] += 2*weight[i]*lli;
       /*printf("i=%6d s1=%1d s2=%1d mi=%1d mw=%1d dh=%3d prob=%10.6f w=%6.4f out=%10.6f sav=%10.6f\n",i,s1,s2,mi,mw[mi][i],dh[mi][i],exp(lli),weight[i],out[s1][s2],savm[s1][s2]); */
       if(globpr){
-	fprintf(ficresilk,"%9ld %6.1f %6.1f %6d %2d %2d %2d %2d %3d %15.6f %8.4f %8.3f\
+	fprintf(ficresilk,"%09ld %6.1f %6.1f %6d %2d %2d %2d %2d %3d %15.6f %8.4f %8.3f\
  %11.6f %11.6f %11.6f ", \
 		num[i], agebegin, ageend, i,s1,s2,mi,mw[mi][i],dh[mi][i],exp(lli),weight[i],weight[i]*gipmx/gsw,
 		2*weight[i]*lli,out[s1][s2],savm[s1][s2]);
@@ -4001,8 +4010,8 @@ double hessij( double x[], double **hess
       kmax=kmax+10;
     }
     if(kmax >=10 || firstime ==1){
-      printf("Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you may increase ftol=%.2e\n",thetai,thetaj, ftol);
-      fprintf(ficlog,"Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you may increase ftol=%.2e\n",thetai,thetaj, ftol);
+      printf("Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you could increase ftol=%.2e\n",thetai,thetaj, ftol);
+      fprintf(ficlog,"Warning: directions %d-%d, you are not estimating the Hessian at the exact maximum likelihood; you could increase ftol=%.2e\n",thetai,thetaj, ftol);
       printf("%d %d k=%d, k1=%.12e k2=%.12e k3=%.12e k4=%.12e delti*k=%.12e deltj*k=%.12e, xi-de*k=%.12e xj-de*k=%.12e  res=%.12e k1234=%.12e,k1-2=%.12e,k3-4=%.12e\n",thetai,thetaj,k,k1,k2,k3,k4,delti[thetai]/k,delti[thetaj]/k,x[thetai]-delti[thetai]/k,x[thetaj]-delti[thetaj]/k, res,k1-k2-k3+k4,k1-k2,k3-k4);
       fprintf(ficlog,"%d %d k=%d, k1=%.12e k2=%.12e k3=%.12e k4=%.12e delti*k=%.12e deltj*k=%.12e, xi-de*k=%.12e xj-de*k=%.12e  res=%.12e k1234=%.12e,k1-2=%.12e,k3-4=%.12e\n",thetai,thetaj,k,k1,k2,k3,k4,delti[thetai]/k,delti[thetaj]/k,x[thetai]-delti[thetai]/k,x[thetaj]-delti[thetaj]/k, res,k1-k2-k3+k4,k1-k2,k3-k4);
     }
@@ -6395,7 +6404,7 @@ void printinggnuplot(char fileresu[], ch
 	if(TKresult[nres]!= k1)
 	  continue;
 	/* We are interested in selected combination by the resultline */
-	printf("\n# 1st: Period (stable) prevalence with CI: 'VPL_' files and live state =%d ", cpt);
+	/* printf("\n# 1st: Period (stable) prevalence with CI: 'VPL_' files and live state =%d ", cpt); */
 	fprintf(ficgp,"\n# 1st: Period (stable) prevalence with CI: 'VPL_' files  and live state =%d ", cpt);
 	for (k=1; k<=cptcoveff; k++){    /* For each covariate k get corresponding value lv for combination k1 */
 	  lv= decodtabm(k1,k,cptcoveff); /* Should be the value of the covariate corresponding to k1 combination */
@@ -6404,14 +6413,14 @@ void printinggnuplot(char fileresu[], ch
 	  /* decodtabm(13,3,4)= 2 because h=13 k=  1  1 (2) 2 */
 	  vlv= nbcode[Tvaraff[k]][lv]; /* vlv is the value of the covariate lv, 0 or 1 */
 	  /* For each combination of covariate k1 (V1=1, V3=0), we printed the current covariate k and its value vlv */
-	  printf(" V%d=%d ",Tvaraff[k],vlv);
+	  /* printf(" V%d=%d ",Tvaraff[k],vlv); */
 	  fprintf(ficgp," V%d=%d ",Tvaraff[k],vlv);
 	}
 	for (k4=1; k4<= nsq; k4++){ /* For each selected (single) quantitative value */
-	  printf(" V%d=%f ",Tvqresult[nres][k4],Tqresult[nres][k4]);
+	  /* printf(" V%d=%f ",Tvqresult[nres][k4],Tqresult[nres][k4]); */
 	  fprintf(ficgp," V%d=%f ",Tvqresult[nres][k4],Tqresult[nres][k4]);
 	}	
-	printf("\n#\n");
+	/* printf("\n#\n"); */
 	fprintf(ficgp,"\n#\n");
 	if(invalidvarcomb[k1]){
 	  fprintf(ficgp,"#Combination (%d) ignored because no cases \n",k1); 
@@ -6441,7 +6450,7 @@ void printinggnuplot(char fileresu[], ch
 	  /* fprintf(ficgp,",\"%s\" every :::%d::%d u 1:($%d) t\"Backward stable prevalence\" w l lt 3",subdirf2(fileresu,"PLB_"),k1-1,k1-1,1+cpt); */
 	  fprintf(ficgp,",\"%s\" u 1:((",subdirf2(fileresu,"PLB_")); /* Age is in 1, nres in 2 to be fixed */
 	  if(cptcoveff ==0){
-	    fprintf(ficgp,"$%d)) t 'Backward prevalence in state %d' with line ",	 2+(cpt-1),  cpt );
+	    fprintf(ficgp,"$%d)) t 'Backward prevalence in state %d' with line lt 3",	 2+(cpt-1),  cpt );
 	  }else{
 	    kl=0;
 	    for (k=1; k<=cptcoveff; k++){    /* For each combination of covariate  */
@@ -6456,7 +6465,7 @@ void printinggnuplot(char fileresu[], ch
 	      /*6+1+(i-1)+(nlstate+1)*nlstate; 6+1+(1-1) +(2+1)*2=13 */ 
 	      /* ''  u 6:(($1==1 && $2==0 && $3==2 && $4==0)? $9/(1.-$15) : 1/0):($5==2000? 3:2) t 'p.1' with line lc variable*/
 	      if(k==cptcoveff){
-		fprintf(ficgp,"$%d==%d && $%d==%d)? $%d : 1/0) t 'Backward prevalence in state %d' ",kl+1, Tvaraff[k],kl+1+1,nbcode[Tvaraff[k]][lv], \
+		fprintf(ficgp,"$%d==%d && $%d==%d)? $%d : 1/0) t 'Backward prevalence in state %d' w l lt 3",kl+1, Tvaraff[k],kl+1+1,nbcode[Tvaraff[k]][lv], \
 			2+cptcoveff*2+(cpt-1),  cpt );  /* 4 or 6 ?*/
 	      }else{
 		fprintf(ficgp,"$%d==%d && $%d==%d && ",kl+1, Tvaraff[k],kl+1+1,nbcode[Tvaraff[k]][lv]);
@@ -6526,7 +6535,7 @@ void printinggnuplot(char fileresu[], ch
 	  else fprintf(ficgp,"\" t\"\" w l lt 0,\\\n");
 	} /* state */
       } /* vpopbased */
-      fprintf(ficgp,"\nset out;set out \"%s_%d.svg\"; replot; set out; \n",subdirf2(optionfilefiname,"E_"),k1); /* Buggy gnuplot */
+      fprintf(ficgp,"\nset out;set out \"%s_%d-%d.svg\"; replot; set out; \n",subdirf2(optionfilefiname,"E_"),k1,nres); /* Buggy gnuplot */
     } /* end nres */
   } /* k1 end 2 eme*/