From ec510d392afa8e5dc93afadee9ee36e1da020e06 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Agn=C3=A8s=20Li=C3=A8vre?= Date: Wed, 22 Mar 2006 17:13:53 +0000 Subject: [PATCH] Parameters are printed with %lf instead of %f (more numbers after the comma). The log-likelihood is printed in the log file --- src/imach.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/imach.c b/src/imach.c index 47ee83f..9923c3d 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,17 @@ /* $Id$ $State$ $Log$ + Revision 1.123 2006/03/20 10:52:43 brouard + * imach.c (Module): changed, corresponds to .htm file + name. <head> headers where missing. + + * imach.c (Module): Weights can have a decimal point as for + English (a comma might work with a correct LC_NUMERIC environment, + otherwise the weight is truncated). + Modification of warning when the covariates values are not 0 or + 1. + Version 0.98g + Revision 1.122 2006/03/20 09:45:41 brouard (Module): Weights can have a decimal point as for English (a comma might work with a correct LC_NUMERIC environment, @@ -990,9 +1001,8 @@ void powell(double p[], double **xi, int n, double ftol, int *iter, double *fret 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]); @@ -2083,6 +2093,7 @@ void freqsummary(char fileres[], int iagemin, int iagemax, int **s, double **ag 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; @@ -5346,9 +5357,9 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf<br>\n",\ 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"); -- 2.43.0