--- imach/src/imach.c 2006/03/14 17:16:22 1.117 +++ imach/src/imach.c 2006/03/14 18:20:07 1.118 @@ -1,6 +1,13 @@ -/* $Id: imach.c,v 1.117 2006/03/14 17:16:22 brouard Exp $ +/* $Id: imach.c,v 1.118 2006/03/14 18:20:07 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.118 2006/03/14 18:20:07 brouard + (Module): varevsij Comments added explaining the second + table of variances if popbased=1 . + (Module): Covariances of eij, ekl added, graphs fixed, new html link. + (Module): Function pstamp added + (Module): Version 0.98d + Revision 1.117 2006/03/14 17:16:22 brouard (Module): varevsij Comments added explaining the second table of variances if popbased=1 . @@ -315,11 +322,11 @@ extern int errno; #define ODIRSEPARATOR '/' #endif -/* $Id: imach.c,v 1.117 2006/03/14 17:16:22 brouard Exp $ */ +/* $Id: imach.c,v 1.118 2006/03/14 18:20:07 brouard Exp $ */ /* $State: Exp $ */ char version[]="Imach version 0.98d, March 2006, INED-EUROREVES-Institut de longevite "; -char fullversion[]="$Revision: 1.117 $ $Date: 2006/03/14 17:16:22 $"; +char fullversion[]="$Revision: 1.118 $ $Date: 2006/03/14 18:20:07 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -4689,8 +4696,8 @@ int main(int argc, char *argv[]) /*-------- data file ----------*/ if((fic=fopen(datafile,"r"))==NULL) { - printf("Problem with datafile: %s\n", datafile);goto end; - fprintf(ficlog,"Problem with datafile: %s\n", datafile);goto end; + printf("Problem while opening datafile: %s\n", datafile);goto end; + fprintf(ficlog,"Problem while opening datafile: %s\n", datafile);goto end; } n= lastobs; @@ -5748,7 +5755,7 @@ Interval (in months) between two waves: } pstamp(ficrest); - fprintf(ficrest,"# Total life expectancy with std error and decomposition into time to be expected in each health state ( e.. (std) "); + fprintf(ficrest,"# Total life expectancy with std error and decomposition into time to be expected in each health state\n# Age ( e.. (std) "); for (i=1;i<=nlstate;i++) fprintf(ficrest,"e.%d (std) ",i); fprintf(ficrest,"\n");