Summary: IMaCh version 0.99r10 bugs in gnuplot fixed

diff --git a/src/imach.c b/src/imach.c
index 2520bd6a4832220c5ccf5c7d354cb889cd5d4924..15cbc1dab607cd40331c5c8743d7954bda6479a0 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.254  2017/03/08 07:13:00  brouard
+  Summary: Fixing data parameter line
+
   Revision 1.253  2016/12/15 11:59:41  brouard
   Summary: 0.99 in progress
 
@@ -2397,8 +2400,8 @@ void powell(double p[], double **xi, int n, double ftol, int *iter, double *fret
            flatd++;
        }
        if(flatd >0){
-         printf("%d flat directions\n",flatd);
-         fprintf(ficlog,"%d flat directions\n",flatd);
+         printf("%d flat directions: ",flatd);
+         fprintf(ficlog,"%d flat directions :",flatd);
          for (j=1;j<=n;j++) { 
            if(flatdir[j]>0){
              printf("%d ",j);
@@ -6456,13 +6459,13 @@ divided by h: <sub>h</sub>P<sub>ij</sub>/h : <a href=\"%s_%d-3-%d.svg\">%s_%d-3-
      }
      /* Period (stable) prevalence in each health state */
      for(cpt=1; cpt<=nlstate;cpt++){
-       fprintf(fichtm,"<br>\n- Convergence to period (stable) prevalence in state %d. Or probability to be in state %d being in state (1 to %d) at different ages. <a href=\"%s_%d-%d-%d.svg\">%s_%d-%d-%d.svg</a><br> \
+       fprintf(fichtm,"<br>\n- Convergence to period (stable) prevalence in state %d. Or probability to be in state %d some years earlier, knowing that we will be in state (1 to %d) at different ages. <a href=\"%s_%d-%d-%d.svg\">%s_%d-%d-%d.svg</a><br> \
 <img src=\"%s_%d-%d-%d.svg\">", cpt, cpt, nlstate, subdirf2(optionfilefiname,"P_"),cpt,k1,nres,subdirf2(optionfilefiname,"P_"),cpt,k1,nres,subdirf2(optionfilefiname,"P_"),cpt,k1,nres);
      }
      if(backcast==1){
        /* Period (stable) back prevalence in each health state */
        for(cpt=1; cpt<=nlstate;cpt++){
-        fprintf(fichtm,"<br>\n- Convergence to period (stable) back prevalence in state %d. Or probability to be in state %d being in state (1 to %d) at different ages. <a href=\"%s_%d-%d-%d.svg\">%s_%d-%d-%d.svg</a><br> \
+        fprintf(fichtm,"<br>\n- Convergence to mixed (stable) back prevalence in state %d. Or probability to be in state %d at a younger age, knowing that we will be in state (1 to %d) at different older ages. <a href=\"%s_%d-%d-%d.svg\">%s_%d-%d-%d.svg</a><br> \
 <img src=\"%s_%d-%d-%d.svg\">", cpt, cpt, nlstate, subdirf2(optionfilefiname,"PB_"),cpt,k1,nres,subdirf2(optionfilefiname,"PB_"),cpt,k1,nres,subdirf2(optionfilefiname,"PB_"),cpt,k1,nres);
        }
      }
@@ -6926,7 +6929,7 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
   for(nres=1; nres <= nresult; nres++){ /* For each resultline */
     if(m != 1 && TKresult[nres]!= k1)
       continue;
-    for (cpt=1; cpt<=nlstate ; cpt ++) { /* For each life state */
+    for (cpt=1; cpt<=nlstate ; cpt ++) { /* For each life state of arrival */
       
       fprintf(ficgp,"\n#\n#\n#CV preval stable (period): 'pij' files, covariatecombination#=%d state=%d",k1, cpt);
       for (k=1; k<=cptcoveff; k++){    /* For each covariate and each value */
@@ -6950,12 +6953,12 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
       fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \n\
 set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar);
       k=3; /* Offset */
-      for (i=1; i<= nlstate ; i ++){
+      for (i=1; i<= nlstate ; i ++){ /* State of origin */
        if(i==1)
          fprintf(ficgp,"\"%s\"",subdirf2(fileresu,"PIJ_"));
        else
          fprintf(ficgp,", '' ");
-       l=(nlstate+ndeath)*(i-1)+1;
+       l=(nlstate+ndeath)*(i-1)+1; /* 1, 1+ nlstate+ndeath, 1+2*(nlstate+ndeath) */
        fprintf(ficgp," u ($1==%d ? ($3):1/0):($%d/($%d",k1,k+l+(cpt-1),k+l);
        for (j=2; j<= nlstate ; j ++)
          fprintf(ficgp,"+$%d",k+l+j-1);
@@ -6973,8 +6976,8 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
     for(nres=1; nres <= nresult; nres++){ /* For each resultline */
       if(m != 1 && TKresult[nres]!= k1)
        continue;
-      for (cpt=1; cpt<=nlstate ; cpt ++) { /* For each life state */
-       fprintf(ficgp,"\n#\n#\n#CV Back preval stable (period): 'pij' files, covariatecombination#=%d state=%d",k1, cpt);
+      for (cpt=1; cpt<=nlstate ; cpt ++) { /* For each life ending state */
+       fprintf(ficgp,"\n#\n#\n#CV Back preval stable (period): 'pijb' files, covariatecombination#=%d state=%d",k1, cpt);
        for (k=1; k<=cptcoveff; k++){    /* For each covariate and each value */
          lv= decodtabm(k1,k,cptcoveff); /* Should be the covariate number corresponding to k1 combination */
          /* decodtabm(1,1,4) = 1 because h=1  k= (1) 1  1  1 */
@@ -6996,16 +6999,16 @@ set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar)
        fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \n\
 set ter svg size 640, 480\nunset log y\nplot [%.f:%.f]  ", ageminpar, agemaxpar);
        k=3; /* Offset */
-       for (i=1; i<= nlstate ; i ++){
+       for (i=1; i<= nlstate ; i ++){ /* State of origin */
          if(i==1)
            fprintf(ficgp,"\"%s\"",subdirf2(fileresu,"PIJB_"));
          else
            fprintf(ficgp,", '' ");
          /* l=(nlstate+ndeath)*(i-1)+1; */
-         l=(nlstate+ndeath)*(cpt-1)+1;
+         l=(nlstate+ndeath)*(cpt-1)+1; /* fixed for i; cpt=1 1, cpt=2 1+ nlstate+ndeath, 1+2*(nlstate+ndeath) */
          /* fprintf(ficgp," u ($1==%d ? ($3):1/0):($%d/($%d",k1,k+l+(cpt-1),k+l); /\* a vérifier *\/ */
          /* fprintf(ficgp," u ($1==%d ? ($3):1/0):($%d/($%d",k1,k+l+(cpt-1),k+l+(cpt-1)+i-1); /\* a vérifier *\/ */
-         fprintf(ficgp," u ($1==%d ? ($3):1/0):($%d",k1,k+l+(cpt-1)+i-1); /* a vérifier */
+         fprintf(ficgp," u ($1==%d ? ($3):1/0):($%d",k1,k+l+i-1); /* To be verified */
          /* for (j=2; j<= nlstate ; j ++) */
          /*    fprintf(ficgp,"+$%d",k+l+j-1); */
          /*    /\* fprintf(ficgp,"+$%d",k+l+j-1); *\/ */
@@ -9563,6 +9566,7 @@ int back_prevalence_limit(double *p, double **bprlim, double ageminpar, double a
        fprintf(ficresplb," %.3f %d\n", tot, *ncvyearp);
       } /* Age */
       /* was end of cptcod */
+      /*fprintf(ficresplb,"\n");*/ /* Seems to be necessary for gnuplot only if two result lines and no covariate. */
     } /* end of any combination */
   } /* end of nres */  
   /* hBijx(p, bage, fage); */
@@ -9679,7 +9683,7 @@ int hPijx(double *p, int bage, int fage){
   
   /* hstepm=1;   aff par mois*/
   pstamp(ficrespijb);
-  fprintf(ficrespijb,"#****** h Pij x Back Probability to be in state i at age x-h being in j at x ");
+  fprintf(ficrespijb,"#****** h Bij x Back probability to be in state i at age x-h being in j at x: B1j+B2j+...=1 ");
   i1= pow(2,cptcoveff);
   /* for(cptcov=1,k=0;cptcov<=i1;cptcov++){ */
   /*    /\*for(cptcod=1;cptcod<=ncodemax[cptcov];cptcod++){*\/ */
@@ -9713,7 +9717,7 @@ int hPijx(double *p, int bage, int fage){
        /* hbxij(p3mat,nhstepm,agedeb,hstepm,p,nlstate,stepm,oldm,savm, k);   */
        hbxij(p3mat,nhstepm,agedeb,hstepm,p,prevacurrent,nlstate,stepm, k);
        /* hbxij(p3mat,nhstepm,agedeb,hstepm,p,prevacurrent,nlstate,stepm,oldm,savm, dnewm, doldm, dsavm, k); */
-       fprintf(ficrespijb,"# Cov Agex agex-h hpijx with i,j=");
+       fprintf(ficrespijb,"# Cov Agex agex-h hbijx with i,j=");
        for(i=1; i<=nlstate;i++)
          for(j=1; j<=nlstate+ndeath;j++)
            fprintf(ficrespijb," %1d-%1d",i,j);