--- imach/src/imach.c	2006/02/27 12:17:45	1.115
+++ imach/src/imach.c	2006/03/06 10:29:27	1.116
@@ -1,6 +1,10 @@
-/* $Id: imach.c,v 1.115 2006/02/27 12:17:45 brouard Exp $
+/* $Id: imach.c,v 1.116 2006/03/06 10:29:27 brouard Exp $
   $State: Exp $
   $Log: imach.c,v $
+  Revision 1.116  2006/03/06 10:29:27  brouard
+  (Module): Variance-covariance wrong links and
+  varian-covariance of ej. is needed (Saito).
+
   Revision 1.115  2006/02/27 12:17:45  brouard
   (Module): One freematrix added in mlikeli! 0.98c
 
@@ -304,11 +308,11 @@ extern int errno;
 #define ODIRSEPARATOR '/'
 #endif
 
-/* $Id: imach.c,v 1.115 2006/02/27 12:17:45 brouard Exp $ */
+/* $Id: imach.c,v 1.116 2006/03/06 10:29:27 brouard Exp $ */
 /* $State: Exp $ */
 
 char version[]="Imach version 0.98c, February 2006, INED-EUROREVES ";
-char fullversion[]="$Revision: 1.115 $ $Date: 2006/02/27 12:17:45 $"; 
+char fullversion[]="$Revision: 1.116 $ $Date: 2006/03/06 10:29:27 $"; 
 int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
 int nvar;
 int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;
@@ -3280,9 +3284,18 @@ void printinghtml(char fileres[], char t
  - Stable prevalence in each health state: <a href=\"%s\">%s</a> <br>\n",
 	   subdirf2(fileres,"pl"),subdirf2(fileres,"pl"));
    fprintf(fichtm,"\
- - Life expectancies by age and initial health status (estepm=%2d months): \
+ - Life expectancies by age and initial health status (estepm=%2d months) WRONG LINK (to be made): \
+   <a href=\"%s\">%s</a> <br>\n</li>",
+	   estepm,subdirf2(fileres,"le"),subdirf2(fileres,"le"));
+   fprintf(fichtm,"\
+ - Health expectancies by age and initial health status with standard errors (estepm=%2d months): \
    <a href=\"%s\">%s</a> <br>\n</li>",
 	   estepm,subdirf2(fileres,"e"),subdirf2(fileres,"e"));
+   fprintf(fichtm,"\
+ - Variances and covariances of health expectancies by age and initial health status (estepm=%2d months) TO BE MADE: \
+   <a href=\"%s\">%s</a> <br>\n</li>",
+	   estepm,subdirf2(fileres,"vch"),subdirf2(fileres,"vch"));
+
 
 fprintf(fichtm," \n<ul><li><b>Graphs</b></li><p>");
 
@@ -3334,10 +3347,10 @@ fprintf(fichtm," \n<ul><li><b>Graphs</b>
  - Correlation matrix of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",
 	 subdirf2(fileres,"probcor"),subdirf2(fileres,"probcor"));
  fprintf(fichtm,"\
- - Variances and covariances of life expectancies by age and initial health status (estepm=%d months): <a href=\"%s\">%s</a><br>\n",
+ - Variances and covariances of health expectancies by age (estepm=%d months): <a href=\"%s\">%s</a><br>\n",
 	 estepm, subdirf2(fileres,"v"),subdirf2(fileres,"v"));
  fprintf(fichtm,"\
- - Health expectancies with their variances (no covariance): <a href=\"%s\">%s</a> <br>\n",
+ - Life and health expectancies with their standard errors: <a href=\"%s\">%s</a> <br>\n",
 	 subdirf2(fileres,"t"),subdirf2(fileres,"t"));
  fprintf(fichtm,"\
  - Standard deviation of stable prevalences: <a href=\"%s\">%s</a> <br>\n",\