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

Diff for /imach/src/imach.c between versions 1.37 and 1.38

version 1.37, 2002/03/29 15:31:59 version 1.38, 2002/04/03 12:19:36
Line 1954  Interval (in months) between two waves: Line 1954  Interval (in months) between two waves:
  - Observed prevalence in each state: <a href=\"p%s\">p%s</a> <br>\n   - Observed prevalence in each state: <a href=\"p%s\">p%s</a> <br>\n
  - Stationary prevalence in each state: <a href=\"pl%s\">pl%s</a> <br>\n   - Stationary prevalence in each state: <a href=\"pl%s\">pl%s</a> <br>\n
  - Transition probabilities: <a href=\"pij%s\">pij%s</a><br>\n   - Transition probabilities: <a href=\"pij%s\">pij%s</a><br>\n
  - Life expectancies by age and initial health status (estepm=%2d months): <a href=\"e%s\">e%s</a> <br>\n",version,title,datafile,firstpass,lastpass,stepm, weightopt,model,imx,jmin,jmax,jmean,fileres,fileres,optionfilegnuplot,optionfilegnuplot,fileres,fileres,fileres,fileres,fileres,fileres,fileres,fileres,estepm);   - Life expectancies by age and initial health status (estepm=%2d months): <a href=\"e%s\">e%s</a> <br>\n",version,title,datafile,firstpass,lastpass,stepm, weightopt,model,imx,jmin,jmax,jmean,fileres,fileres,optionfilegnuplot,optionfilegnuplot,fileres,fileres,fileres,fileres,fileres,fileres,estepm,fileres,fileres);
   
  fprintf(fichtm,"\n   fprintf(fichtm,"\n
  - Parameter file with estimated parameters and the covariance matrix: <a href=\"%s\">%s</a> <br>\n   - Parameter file with estimated parameters and the covariance matrix: <a href=\"%s\">%s</a> <br>\n
Line 3312  while((c=getc(ficpar))=='#' && c!= EOF){ Line 3312  while((c=getc(ficpar))=='#' && c!= EOF){
         for(i=1, vepp=0.;i <=nlstate;i++)          for(i=1, vepp=0.;i <=nlstate;i++)
           for(j=1;j <=nlstate;j++)            for(j=1;j <=nlstate;j++)
             vepp += vareij[i][j][(int)age];              vepp += vareij[i][j][(int)age];
         fprintf(ficrest," %7.2f (%7.2f)", epj[nlstate+1],sqrt(vepp));          fprintf(ficrest," %7.3f (%7.3f)", epj[nlstate+1],sqrt(vepp));
         for(j=1;j <=nlstate;j++){          for(j=1;j <=nlstate;j++){
           fprintf(ficrest," %7.2f (%7.2f)", epj[j],sqrt(vareij[j][j][(int)age]));            fprintf(ficrest," %7.3f (%7.3f)", epj[j],sqrt(vareij[j][j][(int)age]));
         }          }
         fprintf(ficrest,"\n");          fprintf(ficrest,"\n");
       }        }
Removed from v.1.37  
changed lines
  Added in v.1.38

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