changed, corresponds to .htm file X-Git-Tag: imach-099s7~483 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=8671a33c7bafc049263f7ca57e3160272199ea33;p=.git * imach.c (Module): <title> 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 --- diff --git a/src/imach.c b/src/imach.c index 48445d6..47ee83f 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,14 @@ /* $Id$ $State$ $Log$ + 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, + otherwise the weight is truncated). + Modification of warning when the covariates values are not 0 or + 1. + Version 0.98g + Revision 1.121 2006/03/16 17:45:01 lievre * imach.c (Module): Comments concerning covariates added @@ -4560,6 +4568,7 @@ int main(int argc, char *argv[]) free_ma3x(delti3,1,nlstate,1, nlstate+ndeath-1,1,ncovmodel); fclose (ficparo); fclose (ficlog); + goto end; exit(0); } else if(mle==-3) { @@ -4590,7 +4599,9 @@ int main(int argc, char *argv[]) j++; fscanf(ficpar,"%1d%1d",&i1,&j1); if ((i1 != i) && (j1 != j)){ - printf("Error in line parameters number %d, %1d%1d instead of %1d%1d \n",numlinepar, i,j, i1, j1); + printf("Error in line parameters number %d, %1d%1d instead of %1d%1d \n \ +It might be a problem of design; if ncovcol and the model are correct\n \ +run imach with mle=-1 to get a correct template of the parameter file.\n",numlinepar, i,j, i1, j1); exit(1); } fprintf(ficparo,"%1d%1d",i1,j1); @@ -5135,13 +5146,13 @@ int main(int argc, char *argv[]) printf("Problem with %s \n",optionfilehtmcov), exit(0); } else{ - fprintf(fichtmcov,"<body>\n<title>IMaCh Cov %s

From: N. Brouard Date: Mon, 20 Mar 2006 10:52:43 +0000 (+0000) Subject: * imach.c (Module): changed, corresponds to .htm file X-Git-Tag: imach-099s7~483 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=8671a33c7bafc049263f7ca57e3160272199ea33;p=.git * imach.c (Module): <title> 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 --- diff --git a/src/imach.c b/src/imach.c index 48445d6..47ee83f 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,14 @@ /* $Id$ $State$ $Log$ + 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, + otherwise the weight is truncated). + Modification of warning when the covariates values are not 0 or + 1. + Version 0.98g + Revision 1.121 2006/03/16 17:45:01 lievre * imach.c (Module): Comments concerning covariates added @@ -4560,6 +4568,7 @@ int main(int argc, char *argv[]) free_ma3x(delti3,1,nlstate,1, nlstate+ndeath-1,1,ncovmodel); fclose (ficparo); fclose (ficlog); + goto end; exit(0); } else if(mle==-3) { @@ -4590,7 +4599,9 @@ int main(int argc, char *argv[]) j++; fscanf(ficpar,"%1d%1d",&i1,&j1); if ((i1 != i) && (j1 != j)){ - printf("Error in line parameters number %d, %1d%1d instead of %1d%1d \n",numlinepar, i,j, i1, j1); + printf("Error in line parameters number %d, %1d%1d instead of %1d%1d \n \ +It might be a problem of design; if ncovcol and the model are correct\n \ +run imach with mle=-1 to get a correct template of the parameter file.\n",numlinepar, i,j, i1, j1); exit(1); } fprintf(ficparo,"%1d%1d",i1,j1); @@ -5135,13 +5146,13 @@ int main(int argc, char *argv[]) printf("Problem with %s \n",optionfilehtmcov), exit(0); } else{ - fprintf(fichtmcov,"<body>\n<title>IMaCh Cov %s\n %s
%s \ + fprintf(fichtmcov,"\nIMaCh Cov %s\n %s
%s \

\n\ Title=%s
Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s
\n",\ - fileres,version,fullversion,title,datafile,firstpass,lastpass,stepm, weightopt, model); + optionfilehtmcov,version,fullversion,title,datafile,firstpass,lastpass,stepm, weightopt, model); } - fprintf(fichtm,"\nIMaCh %s\n %s
%s \ + fprintf(fichtm,"\nIMaCh %s\n %s
%s \

\n\ Title=%s
Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s
\n\ \n\ @@ -5152,7 +5163,7 @@ Title=%s
Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s
%s
\n\ - Gnuplot file name: %s
\n\ - Date and time at start: %s\n",\ - fileres,version,fullversion,title,datafile,firstpass,lastpass,stepm, weightopt, model,\ + optionfilehtm,version,fullversion,title,datafile,firstpass,lastpass,stepm, weightopt, model,\ optionfilefiname,optionfilext,optionfilefiname,optionfilext,\ fileres,fileres,\ filelog,filelog,optionfilegnuplot,optionfilegnuplot,strstart); @@ -5917,8 +5928,9 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf
\n",\ fprintf(ficlog,"Total time was %d Sec.\n", end_time.tv_sec -start_time.tv_sec); /* printf("Total time was %d uSec.\n", total_usecs);*/ /* if(fileappend(fichtm,optionfilehtm)){ */ - fprintf(fichtm,"
Local time at start %s
Local time at end %s
",strstart, strtend); + fprintf(fichtm,"
Local time at start %s
Local time at end %s
\n",strstart, strtend); fclose(fichtm); + fprintf(fichtmcov,"
Local time at start %s
Local time at end %s
\n",strstart, strtend); fclose(fichtmcov); fclose(ficgp); fclose(ficlog);