Diff for /imach/src/imach.c between versions 1.115 and 1.116

version 1.115, 2006/02/27 12:17:45 version 1.116, 2006/03/06 10:29:27
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     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    Revision 1.115  2006/02/27 12:17:45  brouard
   (Module): One freematrix added in mlikeli! 0.98c    (Module): One freematrix added in mlikeli! 0.98c
   
Line 3280  void printinghtml(char fileres[], char t Line 3284  void printinghtml(char fileres[], char t
  - Stable prevalence in each health state: <a href=\"%s\">%s</a> <br>\n",   - Stable prevalence in each health state: <a href=\"%s\">%s</a> <br>\n",
            subdirf2(fileres,"pl"),subdirf2(fileres,"pl"));             subdirf2(fileres,"pl"),subdirf2(fileres,"pl"));
    fprintf(fichtm,"\     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>",     <a href=\"%s\">%s</a> <br>\n</li>",
            estepm,subdirf2(fileres,"e"),subdirf2(fileres,"e"));             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>");  fprintf(fichtm," \n<ul><li><b>Graphs</b></li><p>");
   
Line 3334  fprintf(fichtm," \n<ul><li><b>Graphs</b> Line 3347  fprintf(fichtm," \n<ul><li><b>Graphs</b>
  - Correlation matrix of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",   - Correlation matrix of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",
          subdirf2(fileres,"probcor"),subdirf2(fileres,"probcor"));           subdirf2(fileres,"probcor"),subdirf2(fileres,"probcor"));
  fprintf(fichtm,"\   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"));           estepm, subdirf2(fileres,"v"),subdirf2(fileres,"v"));
  fprintf(fichtm,"\   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"));           subdirf2(fileres,"t"),subdirf2(fileres,"t"));
  fprintf(fichtm,"\   fprintf(fichtm,"\
  - Standard deviation of stable prevalences: <a href=\"%s\">%s</a> <br>\n",\   - Standard deviation of stable prevalences: <a href=\"%s\">%s</a> <br>\n",\

Removed from v.1.115  
changed lines
  Added in v.1.116


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>