--- imach096d/src/imach.c 2002/03/29 15:27:27 1.36
+++ imach096d/src/imach.c 2002/04/03 12:19:36 1.38
@@ -1,4 +1,4 @@
-/* $Id: imach.c,v 1.36 2002/03/29 15:27:27 brouard Exp $
+/* $Id: imach.c,v 1.38 2002/04/03 12:19:36 lievre Exp $
Interpolated Markov Chain
Short summary of the programme:
@@ -1942,7 +1942,7 @@ void printinghtml(char fileres[], char t
printf("Problem with %s \n",optionfilehtm), exit(0);
}
- fprintf(fichtm," Imach, Version %s
\n
+ fprintf(fichtm," %s
\n
Title=%s
Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s
\n
\n
Total number of observations=%d
\n
@@ -1954,7 +1954,7 @@ Interval (in months) between two waves:
- Observed prevalence in each state: p%s
\n
- Stationary prevalence in each state: pl%s
\n
- Transition probabilities: pij%s
\n
- - Life expectancies by age and initial health status (estepm=%2d months): e%s
\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): e%s
\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
- Parameter file with estimated parameters and the covariance matrix: %s
\n
@@ -2511,7 +2511,7 @@ int main(int argc, char *argv[])
double dateprev1, dateprev2,jproj1,mproj1,anproj1,jproj2,mproj2,anproj2;
- char version[80]="Imach version 0.8a, March 2002, INED-EUROREVES ";
+ char version[80]="Imach version 0.8b, March 2002, INED-EUROREVES ";
char *alph[]={"a","a","b","c","d","e"}, str[4];
@@ -3312,9 +3312,9 @@ while((c=getc(ficpar))=='#' && c!= EOF){
for(i=1, vepp=0.;i <=nlstate;i++)
for(j=1;j <=nlstate;j++)
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++){
- 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");
}