Some improvments

diff --git a/src/imach.c b/src/imach.c
index 57287d605d42941985beadc7f08707d3eaf1cf6f..60b179e10a696ef499a4c322e8228f1e38c8be40 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1862,7 +1862,7 @@ void varevsij(char optionfilefiname[], double ***vareij, double **matcov, double
     exit(0);\r
   }\r
   else{\r
-    fprintf(fichtm,"\n<li><h4> Computing step probabilities of dying and weighted average (i.e global mortality independent of initial healh state)</h4></li>\n");\r
+    fprintf(fichtm,"\n<li><h4> Computing probabilities of dying as a weighted average (i.e global mortality independent of initial healh state)</h4></li>\n");\r
   }\r
   varppt = matrix(nlstate+1,nlstate+ndeath,nlstate+1,nlstate+ndeath);\r
 \r
@@ -2013,7 +2013,7 @@ void varevsij(char optionfilefiname[], double ***vareij, double **matcov, double
     /* This for computing force of mortality (h=1)as a weighted average */\r
     for(j=nlstate+1,gmp[j]=0.;j<=nlstate+ndeath;j++){\r
       for(i=1; i<= nlstate; i++)\r
-       gmp[j] += prlim[i][i]*p3mat[i][j][1];\r
+       gmp[j] += prlim[i][i]*p3mat[i][j][1]; \r
     }    \r
     /* end force of mortality */\r
 \r
@@ -2049,7 +2049,9 @@ void varevsij(char optionfilefiname[], double ***vareij, double **matcov, double
   fprintf(ficgp,"\n replot \"%s\"  u 1:(($3+1.96*$4)*%6.3f) t \"95\%% interval\" w l 2 ",fileresprobmorprev,YEARM/estepm);\r
   fprintf(ficgp,"\n replot \"%s\"  u 1:(($3-1.96*$4)*%6.3f) not w l 2 ",fileresprobmorprev,YEARM/estepm);\r
   fprintf(fichtm,"\n<br> File (multiple files are possible if covariates are present): <A href=\"%s\">%s</a>\n",fileresprobmorprev,fileresprobmorprev);\r
-  fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months and then divided by estepm and multiplied by %.0f in order to have the probability to die over a year <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", stepm,YEARM,digitp,digit);\r
+  fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months. <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", stepm,digitp,digit);\r
+  /*  fprintf(fichtm,"\n<br> Probability is computed over estepm=%d months and then divided by estepm and multiplied by %.0f in order to have the probability to die over a year <br> <img src=\"varmuptjgr%s%s.png\"> <br>\n", stepm,YEARM,digitp,digit);\r
+*/\r
   fprintf(ficgp,"\nset out \"varmuptjgr%s%s.png\";replot;",digitp,digit);\r
 \r
   free_vector(xp,1,npar);\r
@@ -2420,6 +2422,7 @@ void varprob(char optionfilefiname[], double **matcov, double x[], double delti[
                    fprintf(ficgp,"\nset ter png small\nset size 0.65,0.65");\r
                    fprintf(fichtm,"\n<br>Ellipsoids of confidence cov(p%1d%1d,p%1d%1d) expressed in year<sup>-1</sup> :<a href=\"varpijgr%s%d%1d%1d-%1d%1d.png\">varpijgr%s%d%1d%1d-%1d%1d.png</A>, ",k1,l1,k2,l2,optionfilefiname, j1,k1,l1,k2,l2,optionfilefiname, j1,k1,l1,k2,l2);\r
                    fprintf(fichtm,"\n<br><img src=\"varpijgr%s%d%1d%1d-%1d%1d.png\"> ",optionfilefiname, j1,k1,l1,k2,l2);\r
+                   fprintf(fichtm,"\n<br> Correlation at age %d (%.3f),",(int) age, c12);\r
                    fprintf(ficgp,"\nset out \"varpijgr%s%d%1d%1d-%1d%1d.png\"",optionfilefiname, j1,k1,l1,k2,l2);\r
                    fprintf(ficgp,"\nset label \"%d\" at %11.3e,%11.3e center",(int) age, mu1,mu2);\r
                    fprintf(ficgp,"\n# Age %d, p%1d%1d - p%1d%1d",(int) age, k1,l1,k2,l2);\r
@@ -2428,6 +2431,7 @@ void varprob(char optionfilefiname[], double **matcov, double x[], double delti[
                            mu2,std,v21,sqrt(lc1),v22,sqrt(lc2));\r
                  }else{\r
                    first=0;\r
+                   fprintf(fichtm," %d (%.3f),",(int) age, c12);\r
                    fprintf(ficgp,"\n# Age %d, p%1d%1d - p%1d%1d",(int) age, k1,l1,k2,l2);\r
                    fprintf(ficgp,"\nset label \"%d\" at %11.3e,%11.3e center",(int) age, mu1,mu2);\r
                    fprintf(ficgp,"\nreplot %11.3e+ %.3f*(%11.3e*%11.3e*cos(t)+%11.3e*%11.3e*sin(t)), %11.3e +%.3f*(%11.3e*%11.3e*cos(t)+%11.3e*%11.3e*sin(t)) not",\\r