--- imach/src/imach.c 2006/03/20 10:52:43 1.123 +++ imach/src/imach.c 2006/03/22 17:13:53 1.124 @@ -1,6 +1,10 @@ -/* $Id: imach.c,v 1.123 2006/03/20 10:52:43 brouard Exp $ +/* $Id: imach.c,v 1.124 2006/03/22 17:13:53 lievre Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.124 2006/03/22 17:13:53 lievre + Parameters are printed with %lf instead of %f (more numbers after the comma). + The log-likelihood is printed in the log file + Revision 1.123 2006/03/20 10:52:43 brouard * imach.c (Module): changed, corresponds to .htm file name. <head> headers where missing. @@ -357,11 +361,11 @@ extern int errno; #define ODIRSEPARATOR '/' #endif -/* $Id: imach.c,v 1.123 2006/03/20 10:52:43 brouard Exp $ */ +/* $Id: imach.c,v 1.124 2006/03/22 17:13:53 lievre Exp $ */ /* $State: Exp $ */ char version[]="Imach version 0.98g, March 2006, INED-EUROREVES-Institut de longevite "; -char fullversion[]="$Revision: 1.123 $ $Date: 2006/03/20 10:52:43 $"; +char fullversion[]="$Revision: 1.124 $ $Date: 2006/03/22 17:13:53 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -1001,9 +1005,8 @@ void powell(double p[], double **xi, int last_time=curr_time; (void) gettimeofday(&curr_time,&tzp); printf("\nPowell iter=%d -2*LL=%.12f %ld sec. %ld sec.",*iter,*fret, curr_time.tv_sec-last_time.tv_sec, curr_time.tv_sec-start_time.tv_sec);fflush(stdout); - /* fprintf(ficlog,"\nPowell iter=%d -2*LL=%.12f %ld sec. %ld sec.",*iter,*fret, curr_time.tv_sec-last_time.tv_sec, curr_time.tv_sec-start_time.tv_sec); - fprintf(ficrespow,"%d %.12f %ld",*iter,*fret,curr_time.tv_sec-start_time.tv_sec); - */ + fprintf(ficlog,"\nPowell iter=%d -2*LL=%.12f %ld sec. %ld sec.",*iter,*fret, curr_time.tv_sec-last_time.tv_sec, curr_time.tv_sec-start_time.tv_sec); fflush(ficlog); +/* fprintf(ficrespow,"%d %.12f %ld",*iter,*fret,curr_time.tv_sec-start_time.tv_sec); */ for (i=1;i<=n;i++) { printf(" %d %.12f",i, p[i]); fprintf(ficlog," %d %.12lf",i, p[i]); @@ -2094,6 +2097,7 @@ void freqsummary(char fileres[], int ia for(i=iagemin; i <= iagemax+3; i++){ if(i==iagemax+3){ fprintf(ficlog,"Total"); + fprintf(fichtm,"<br>Total<br>"); }else{ if(first==1){ first=0; @@ -5357,9 +5361,9 @@ Interval (in months) between two waves: fprintf(ficlog,"%d%d ",i,k); fprintf(ficres,"%1d%1d ",i,k); for(j=1; j <=ncovmodel; j++){ - printf("%f ",p[jk]); - fprintf(ficlog,"%f ",p[jk]); - fprintf(ficres,"%f ",p[jk]); + printf("%lf ",p[jk]); + fprintf(ficlog,"%lf ",p[jk]); + fprintf(ficres,"%lf ",p[jk]); jk++; } printf("\n");