[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.105 and 1.106

version 1.105, 2006/01/05 20:23:19 version 1.106, 2006/01/19 13:24:36
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.106  2006/01/19 13:24:36  brouard
     Some cleaning and links added in html output
   
   Revision 1.105  2006/01/05 20:23:19  lievre    Revision 1.105  2006/01/05 20:23:19  lievre
   *** empty log message ***    *** empty log message ***
   
Line 221 Line 224
 #include <math.h>  #include <math.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
   #include <string.h>
 #include <unistd.h>  #include <unistd.h>
   
 /* #include <sys/time.h> */  /* #include <sys/time.h> */
Line 262 Line 266
 /* $Id$ */  /* $Id$ */
 /* $State$ */  /* $State$ */
   
 char version[]="Imach version 0.98, September 2005, INED-EUROREVES ";  char version[]="Imach version 0.98a, January 2006, INED-EUROREVES ";
 char fullversion[]="$Revision$ $Date$";   char fullversion[]="$Revision$ $Date$"; 
 int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */  int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings  */
 int nvar;  int nvar;
Line 2556  void varevsij(char optionfilefiname[], d Line 2560  void varevsij(char optionfilefiname[], d
   }      }  
   fprintf(ficresprobmorprev,"\n");    fprintf(ficresprobmorprev,"\n");
   fprintf(ficgp,"\n# Routine varevsij");    fprintf(ficgp,"\n# Routine varevsij");
  fprintf(fichtm, "#Local time at start: %s", strstart);    /* fprintf(fichtm, "#Local time at start: %s", strstart);*/
   fprintf(fichtm,"\n<li><h4> Computing probabilities of dying over estepm months as a weighted average (i.e global mortality independent of initial healh state)</h4></li>\n");    fprintf(fichtm,"\n<li><h4> Computing probabilities of dying over estepm months as a weighted average (i.e global mortality independent of initial healh state)</h4></li>\n");
   fprintf(fichtm,"\n<br>%s  <br>\n",digitp);    fprintf(fichtm,"\n<br>%s  <br>\n",digitp);
 /*   } */  /*   } */
Line 3199  void printinghtml(char fileres[], char t Line 3203  void printinghtml(char fileres[], char t
                   double jprev2, double mprev2,double anprev2){                    double jprev2, double mprev2,double anprev2){
   int jj1, k1, i1, cpt;    int jj1, k1, i1, cpt;
   
    fprintf(fichtm,"<ul><li><h4>Result files (first order: no variance)</h4>\n \     fprintf(fichtm,"<ul><li><a> href="#firstorder">Result files (first order: no variance)</a>\n \
      <li><a> href="#secondorder">Result files (second order (variance)</a>\n \
   </ul>");
      fprintf(fichtm,"<ul><li><h4><a name="firstorder">Result files (first order: no variance)</a></h4>\n \
  - Observed prevalence in each state (during the period defined between %.lf/%.lf/%.lf and %.lf/%.lf/%.lf): <a href=\"%s\">%s</a> <br>\n ",   - Observed prevalence in each state (during the period defined between %.lf/%.lf/%.lf and %.lf/%.lf/%.lf): <a href=\"%s\">%s</a> <br>\n ",
            jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,subdirf2(fileres,"p"),subdirf2(fileres,"p"));             jprev1, mprev1,anprev1,jprev2, mprev2,anprev2,subdirf2(fileres,"p"),subdirf2(fileres,"p"));
    fprintf(fichtm,"\     fprintf(fichtm,"\
Line 3250  fprintf(fichtm," \n<ul><li><b>Graphs</b> Line 3257  fprintf(fichtm," \n<ul><li><b>Graphs</b>
   
   
  fprintf(fichtm,"\   fprintf(fichtm,"\
 \n<br><li><h4> Result files (second order: variances)</h4>\n\  \n<br><li><h4> <a name="secondorder">Result files (second order: variances)</a></h4>\n\
  - Parameter file with estimated parameters and covariance matrix: <a href=\"%s\">%s</a> <br>\n", rfileres,rfileres);   - Parameter file with estimated parameters and covariance matrix: <a href=\"%s\">%s</a> <br>\n", rfileres,rfileres);
   
  fprintf(fichtm," - Variance of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",   fprintf(fichtm," - Variance of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",
Line 4009  void printinghtmlmort(char fileres[], ch Line 4016  void printinghtmlmort(char fileres[], ch
   
 fprintf(fichtm,"<ul><li><h4>Life table</h4>\n <br>");  fprintf(fichtm,"<ul><li><h4>Life table</h4>\n <br>");
   
  fprintf(fichtm,"\nAge   lx     qx    dx    Lx     Tx     e(x)<br>");   fprintf(fichtm,"\nAge   l<inf>x</inf>     q<inf>x</inf> d(x,x+1)    L<inf>x</inf>     T<inf>x</inf>     e<infx</inf><br>");
   
  for (k=agegomp;k<(agemortsup-2);k++)    for (k=agegomp;k<(agemortsup-2);k++) 
    fprintf(fichtm,"%d %.0lf %lf %.0lf %.0lf %.0lf %lf<br>\n",k,lsurv[k],p[1]*exp(p[2]*(k-agegomp)),(p[1]*exp(p[2]*(k-agegomp)))*lsurv[k],lpop[k],tpop[k],tpop[k]/lsurv[k]);     fprintf(fichtm,"%d %.0lf %lf %.0lf %.0lf %.0lf %lf<br>\n",k,lsurv[k],p[1]*exp(p[2]*(k-agegomp)),(p[1]*exp(p[2]*(k-agegomp)))*lsurv[k],lpop[k],tpop[k],tpop[k]/lsurv[k]);
Line 4504  int main(int argc, char *argv[]) Line 4511  int main(int argc, char *argv[])
      if (s[4][i]==9)  s[4][i]=-1;        if (s[4][i]==9)  s[4][i]=-1; 
      printf("%ld %.lf %.lf %.lf %.lf/%.lf %.lf/%.lf %.lf/%.lf %d %.lf/%.lf %d %.lf/%.lf %d %.lf/%.lf %d\n",num[i],(covar[1][i]), (covar[2][i]), (weight[i]), (moisnais[i]), (annais[i]), (moisdc[i]), (andc[i]), (mint[1][i]), (anint[1][i]), (s[1][i]),  (mint[2][i]), (anint[2][i]), (s[2][i]),  (mint[3][i]), (anint[3][i]), (s[3][i]),  (mint[4][i]), (anint[4][i]), (s[4][i]));}*/       printf("%ld %.lf %.lf %.lf %.lf/%.lf %.lf/%.lf %.lf/%.lf %d %.lf/%.lf %d %.lf/%.lf %d %.lf/%.lf %d\n",num[i],(covar[1][i]), (covar[2][i]), (weight[i]), (moisnais[i]), (annais[i]), (moisdc[i]), (andc[i]), (mint[1][i]), (anint[1][i]), (s[1][i]),  (mint[2][i]), (anint[2][i]), (s[2][i]),  (mint[3][i]), (anint[3][i]), (s[3][i]),  (mint[4][i]), (anint[4][i]), (s[4][i]));}*/
       
  for (i=1; i<=imx; i++)    /* for (i=1; i<=imx; i++) */
     
    /*if ((s[3][i]==3) ||  (s[4][i]==3)) weight[i]=0.08;     /*if ((s[3][i]==3) ||  (s[4][i]==3)) weight[i]=0.08;
      else weight[i]=1;*/       else weight[i]=1;*/
   
   /* Calculation of the number of parameter from char model*/    /* Calculation of the number of parameters from char model */
   Tvar=ivector(1,15); /* stores the number n of the covariates in Vm+Vn at 1 and m at 2 */    Tvar=ivector(1,15); /* stores the number n of the covariates in Vm+Vn at 1 and m at 2 */
   Tprod=ivector(1,15);     Tprod=ivector(1,15); 
   Tvaraff=ivector(1,15);     Tvaraff=ivector(1,15); 
Removed from v.1.105  
changed lines
  Added in v.1.106

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