Summary: Graphs improvements

diff --git a/src/imach.c b/src/imach.c
index 256f6e37568d80c0646b6ba9870af4858546cd94..ccba45cabf54603bd96a6140183b4c16f3a1413b 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.275  2017/06/30 13:39:33  brouard
+  Summary: Saito's color
+
   Revision 1.274  2017/06/29 09:47:08  brouard
   Summary: Version 0.99r14
 
@@ -7049,7 +7052,8 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
       
        fprintf(ficgp,"\nset out \"%s_%d-%d-%d.svg\" \n",subdirf2(optionfilefiname,"V_"),cpt,k1,nres);
        fprintf(ficgp,"\n#set out \"V_%s_%d-%d-%d.svg\" \n",optionfilefiname,cpt,k1,nres);
-       fprintf(ficgp,"set label \"Alive state %d %s\" at graph 0.98,0.5 center rotate font \"Helvetica,12\"\n",cpt,gplotlabel);
+       /* fprintf(ficgp,"set label \"Alive state %d %s\" at graph 0.98,0.5 center rotate font \"Helvetica,12\"\n",cpt,gplotlabel); */
+       fprintf(ficgp,"set title \"Alive state %d %s\" font \"Helvetica,12\"\n",cpt,gplotlabel);
        fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter svg size 640, 480\nplot [%.f:%.f] \"%s\" every :::%d::%d u 1:($2==%d ? $3:1/0) \"%%lf %%lf",ageminpar,fage,subdirf2(fileresu,"VPL_"),nres-1,nres-1,nres);
        /* fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter svg size 640, 480\nplot [%.f:%.f] \"%s\" every :::%d::%d u 1:($2==%d ? $3:1/0) \"%%lf %%lf",ageminpar,fage,subdirf2(fileresu,"VPL_"),k1-1,k1-1,nres); */
       /* k1-1 error should be nres-1*/
@@ -7134,7 +7138,7 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
              if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
              else fprintf(ficgp," %%*lf (%%*lf)");
            } 
-           fprintf(ficgp,"\" t\"95%% CI\" w l lt 5,\"%s\" every :::%d::%d u 1:($2==%d ? $3-1.96*$4 : 1/0) \"%%lf %%lf",subdirf2(fileresu,"VBL_"),nres-1,nres-1,nres); 
+           fprintf(ficgp,"\" t\"95%% CI\" w l lt 4,\"%s\" every :::%d::%d u 1:($2==%d ? $3-1.96*$4 : 1/0) \"%%lf %%lf",subdirf2(fileresu,"VBL_"),nres-1,nres-1,nres); 
            for (i=1; i<= nlstate ; i ++) {
              if (i==cpt) fprintf(ficgp," %%lf (%%lf)");
              else fprintf(ficgp," %%*lf (%%*lf)");
@@ -7142,7 +7146,8 @@ void printinggnuplot(char fileresu[], char optionfilefiname[], double ageminpar,
            fprintf(ficgp,"\" t\"\" w l lt 4");
          } /* end if backprojcast */
        } /* end if backcast */
-       fprintf(ficgp,"\nset out ;unset label;\n");
+       /* fprintf(ficgp,"\nset out ;unset label;\n"); */
+       fprintf(ficgp,"\nset out ;unset title;\n");
       } /* nres */
     } /* k1 */
   } /* cpt */
@@ -7756,7 +7761,7 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
        continue;
       fprintf(ficgp,"\n\n# Combination of dummy  k1=%d which is ",k1);
       strcpy(gplotlabel,"(");
-      sprintf(gplotlabel+strlen(gplotlabel)," Dummy combination %d ",k1);
+      /*sprintf(gplotlabel+strlen(gplotlabel)," Dummy combination %d ",k1);*/
       for (k=1; k<=cptcoveff; k++){    /* For each correspondig covariate value  */
        lv= decodtabm(k1,k,cptcoveff); /* Should be the covariate value corresponding to k1 combination and kth covariate */
        /* decodtabm(1,1,4) = 1 because h=1  k= (1) 1  1  1 */
@@ -7773,7 +7778,9 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
       strcpy(gplotlabel+strlen(gplotlabel),")");
       fprintf(ficgp,"\n#\n");
       fprintf(ficgp,"\nset out \"%s_%d-%d-%d.svg\" ",subdirf2(optionfilefiname,"PE_"),k1,ng,nres);
-      fprintf(ficgp,"\nset label \"%s\" at graph 0.98,0.5 center rotate font \"Helvetica,12\"\n",gplotlabel);
+      fprintf(ficgp,"\nset key outside ");
+      /* fprintf(ficgp,"\nset label \"%s\" at graph 1.2,0.5 center rotate font \"Helvetica,12\"\n",gplotlabel); */
+      fprintf(ficgp,"\nset title \"%s\" font \"Helvetica,12\"\n",gplotlabel);
       fprintf(ficgp,"\nset ter svg size 640, 480 ");
       if (ng==1){
        fprintf(ficgp,"\nset ylabel \"Value of the logit of the model\"\n"); /* exp(a12+b12*x) could be nice */
@@ -7893,12 +7900,12 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
            }
            fprintf(ficgp,")");
            if(ng ==2)
-             fprintf(ficgp," w l lt (%d*%d+%d)%%%d+1 dt %d t \"p%d%d\" ", nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k);
+             fprintf(ficgp," w l lw 2 lt (%d*%d+%d)%%%d+1 dt %d t \"p%d%d\" ", nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k);
            else /* ng= 3 */
-             fprintf(ficgp," w l lt (%d*%d+%d)%%%d+1 dt %d t \"i%d%d\" ",  nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k);
+             fprintf(ficgp," w l lw 2 lt (%d*%d+%d)%%%d+1 dt %d t \"i%d%d\" ",  nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k);
          }else{ /* end ng <> 1 */
            if( k !=k2) /* logit p11 is hard to draw */
-             fprintf(ficgp," w l lt (%d*%d+%d)%%%d+1 dt %d t \"logit(p%d%d)\" ",  nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k);
+             fprintf(ficgp," w l lw 2 lt (%d*%d+%d)%%%d+1 dt %d t \"logit(p%d%d)\" ",  nlstate+ndeath, k2, k, nlstate+ndeath, k2, k2,k);
          }
          if ((k+k2)!= (nlstate*2+ndeath) && ng != 1)
            fprintf(ficgp,",");
@@ -7907,7 +7914,8 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
          i=i+ncovmodel;
        } /* end k */
       } /* end k2 */
-      fprintf(ficgp,"\n set out; unset label;\n");
+      /* fprintf(ficgp,"\n set out; unset label;set key default;\n"); */
+      fprintf(ficgp,"\n set out; unset title;set key default;\n");
     } /* end k1 */
   } /* end ng */
   /* avoid: */