--- imach/src/imach.c	2014/12/22 23:08:31	1.169
+++ imach/src/imach.c	2014/12/23 11:17:12	1.170
@@ -1,13 +1,18 @@
-/* $Id: imach.c,v 1.169 2014/12/22 23:08:31 brouard Exp $
+/* $Id: imach.c,v 1.170 2014/12/23 11:17:12 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.170  2014/12/23 11:17:12  brouard
+  Summary: Cleaning some \%% back to %%
+
+  The escape was mandatory for a specific compiler (which one?), but too many warnings.
+
   Revision 1.169  2014/12/22 23:08:31  brouard
   Summary: 0.98p
 
   Outputs some informations on compiler used, OS etc. Testing on different platforms.
 
   Revision 1.168  2014/12/22 15:17:42  brouard
-  Summary: udate
+  Summary: update
 
   Revision 1.167  2014/12/22 13:50:56  brouard
   Summary: Testing uname and compiler version and if compiled 32 or 64
@@ -595,11 +600,11 @@ typedef struct {
 #define ODIRSEPARATOR '\\'
 #endif
 
-/* $Id: imach.c,v 1.169 2014/12/22 23:08:31 brouard Exp $ */
+/* $Id: imach.c,v 1.170 2014/12/23 11:17:12 brouard Exp $ */
 /* $State: Exp $ */
 
 char version[]="Imach version 0.98p, December 2014,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";
-char fullversion[]="$Revision: 1.169 $ $Date: 2014/12/22 23:08:31 $"; 
+char fullversion[]="$Revision: 1.170 $ $Date: 2014/12/23 11:17:12 $"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
 int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
@@ -3628,7 +3633,7 @@ void varevsij(char optionfilefiname[], d
 /*   fprintf(ficgp,"\n replot \"%s\"  u 1:(($3+1.96*$4)*%6.3f) t \"95\%% interval\" w l 2 ",fileresprobmorprev,YEARM/estepm); */
 /*   fprintf(ficgp,"\n replot \"%s\"  u 1:(($3-1.96*$4)*%6.3f) not w l 2 ",fileresprobmorprev,YEARM/estepm); */
   fprintf(ficgp,"\n plot \"%s\"  u 1:($3) not w l lt 1 ",subdirf(fileresprobmorprev));
-  fprintf(ficgp,"\n replot \"%s\"  u 1:(($3+1.96*$4)) t \"95\%% interval\" w l lt 2 ",subdirf(fileresprobmorprev));
+  fprintf(ficgp,"\n replot \"%s\"  u 1:(($3+1.96*$4)) t \"95%% interval\" w l lt 2 ",subdirf(fileresprobmorprev));
   fprintf(ficgp,"\n replot \"%s\"  u 1:(($3-1.96*$4)) not w l lt 2 ",subdirf(fileresprobmorprev));
   fprintf(fichtm,"\n<br> File (multiple files are possible if covariates are present): <A href=\"%s\">%s</a>\n",subdirf(fileresprobmorprev),subdirf(fileresprobmorprev));
   fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months. <br> <img src=\"%s%s.png\"> <br>\n", estepm,subdirf3(optionfilefiname,"varmuptjgr",digitp),digit);
@@ -4226,21 +4231,21 @@ void printinggnuplot(char fileres[], cha
      fprintf(ficgp,"set xlabel \"Age\" \n\
 set ylabel \"Probability\" \n\
 set ter png small size 320, 240\n\
-plot [%.f:%.f] \"%s\" every :::%d::%d u 1:2 \"\%%lf",ageminpar,fage,subdirf2(fileres,"vpl"),k1-1,k1-1);
+plot [%.f:%.f] \"%s\" every :::%d::%d u 1:2 \"%%lf",ageminpar,fage,subdirf2(fileres,"vpl"),k1-1,k1-1);
 
      for (i=1; i<= nlstate ; i ++) {
-       if (i==cpt) fprintf(ficgp," \%%lf (\%%lf)");
-       else        fprintf(ficgp," \%%*lf (\%%*lf)");
+       if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
+       else        fprintf(ficgp," %%*lf (%%*lf)");
      }
-     fprintf(ficgp,"\" t\"Period (stable) prevalence\" w l lt 0,\"%s\" every :::%d::%d u 1:($2+1.96*$3) \"\%%lf",subdirf2(fileres,"vpl"),k1-1,k1-1);
+     fprintf(ficgp,"\" t\"Period (stable) prevalence\" w l lt 0,\"%s\" every :::%d::%d u 1:($2+1.96*$3) \"%%lf",subdirf2(fileres,"vpl"),k1-1,k1-1);
      for (i=1; i<= nlstate ; i ++) {
-       if (i==cpt) fprintf(ficgp," \%%lf (\%%lf)");
-       else fprintf(ficgp," \%%*lf (\%%*lf)");
+       if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
+       else fprintf(ficgp," %%*lf (%%*lf)");
      } 
-     fprintf(ficgp,"\" t\"95\%% CI\" w l lt 1,\"%s\" every :::%d::%d u 1:($2-1.96*$3) \"\%%lf",subdirf2(fileres,"vpl"),k1-1,k1-1); 
+     fprintf(ficgp,"\" t\"95%% CI\" w l lt 1,\"%s\" every :::%d::%d u 1:($2-1.96*$3) \"%%lf",subdirf2(fileres,"vpl"),k1-1,k1-1); 
      for (i=1; i<= nlstate ; i ++) {
-       if (i==cpt) fprintf(ficgp," \%%lf (\%%lf)");
-       else fprintf(ficgp," \%%*lf (\%%*lf)");
+       if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
+       else fprintf(ficgp," %%*lf (%%*lf)");
      }  
      fprintf(ficgp,"\" t\"\" w l lt 1,\"%s\" every :::%d::%d u 1:($%d) t\"Observed prevalence \" w l lt 2",subdirf2(fileres,"p"),k1-1,k1-1,2+4*(cpt-1));
    }
@@ -4253,23 +4258,23 @@ plot [%.f:%.f] \"%s\" every :::%d::%d u
     
     for (i=1; i<= nlstate+1 ; i ++) {
       k=2*i;
-      fprintf(ficgp,"\"%s\" every :::%d::%d u 1:2 \"\%%lf",subdirf2(fileres,"t"),k1-1,k1-1);
+      fprintf(ficgp,"\"%s\" every :::%d::%d u 1:2 \"%%lf",subdirf2(fileres,"t"),k1-1,k1-1);
       for (j=1; j<= nlstate+1 ; j ++) {
-	if (j==i) fprintf(ficgp," \%%lf (\%%lf)");
-	else fprintf(ficgp," \%%*lf (\%%*lf)");
+	if (j==i) fprintf(ficgp," %%lf (%%lf)");
+	else fprintf(ficgp," %%*lf (%%*lf)");
       }   
       if (i== 1) fprintf(ficgp,"\" t\"TLE\" w l ,");
       else fprintf(ficgp,"\" t\"LE in state (%d)\" w l ,",i-1);
-      fprintf(ficgp,"\"%s\" every :::%d::%d u 1:($2-$3*2) \"\%%lf",subdirf2(fileres,"t"),k1-1,k1-1);
+      fprintf(ficgp,"\"%s\" every :::%d::%d u 1:($2-$3*2) \"%%lf",subdirf2(fileres,"t"),k1-1,k1-1);
       for (j=1; j<= nlstate+1 ; j ++) {
-	if (j==i) fprintf(ficgp," \%%lf (\%%lf)");
-	else fprintf(ficgp," \%%*lf (\%%*lf)");
+	if (j==i) fprintf(ficgp," %%lf (%%lf)");
+	else fprintf(ficgp," %%*lf (%%*lf)");
       }   
       fprintf(ficgp,"\" t\"\" w l lt 0,");
-      fprintf(ficgp,"\"%s\" every :::%d::%d u 1:($2+$3*2) \"\%%lf",subdirf2(fileres,"t"),k1-1,k1-1);
+      fprintf(ficgp,"\"%s\" every :::%d::%d u 1:($2+$3*2) \"%%lf",subdirf2(fileres,"t"),k1-1,k1-1);
       for (j=1; j<= nlstate+1 ; j ++) {
-	if (j==i) fprintf(ficgp," \%%lf (\%%lf)");
-	else fprintf(ficgp," \%%*lf (\%%*lf)");
+	if (j==i) fprintf(ficgp," %%lf (%%lf)");
+	else fprintf(ficgp," %%*lf (%%*lf)");
       }   
       if (i== (nlstate+1)) fprintf(ficgp,"\" t\"\" w l lt 0");
       else fprintf(ficgp,"\" t\"\" w l lt 0,");