version 1.122, 2006/03/20 09:45:41
|
version 1.123, 2006/03/20 10:52:43
|
Line 1
|
Line 1
|
/* $Id$ |
/* $Id$ |
$State$ |
$State$ |
$Log$ |
$Log$ |
|
Revision 1.123 2006/03/20 10:52:43 brouard |
|
* 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 |
|
|
Revision 1.122 2006/03/20 09:45:41 brouard |
Revision 1.122 2006/03/20 09:45:41 brouard |
(Module): Weights can have a decimal point as for |
(Module): Weights can have a decimal point as for |
English (a comma might work with a correct LC_NUMERIC environment, |
English (a comma might work with a correct LC_NUMERIC environment, |
Line 4568 int main(int argc, char *argv[])
|
Line 4579 int main(int argc, char *argv[])
|
free_ma3x(delti3,1,nlstate,1, nlstate+ndeath-1,1,ncovmodel); |
free_ma3x(delti3,1,nlstate,1, nlstate+ndeath-1,1,ncovmodel); |
fclose (ficparo); |
fclose (ficparo); |
fclose (ficlog); |
fclose (ficlog); |
|
goto end; |
exit(0); |
exit(0); |
} |
} |
else if(mle==-3) { |
else if(mle==-3) { |
Line 4598 int main(int argc, char *argv[])
|
Line 4610 int main(int argc, char *argv[])
|
j++; |
j++; |
fscanf(ficpar,"%1d%1d",&i1,&j1); |
fscanf(ficpar,"%1d%1d",&i1,&j1); |
if ((i1 != i) && (j1 != j)){ |
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); |
exit(1); |
} |
} |
fprintf(ficparo,"%1d%1d",i1,j1); |
fprintf(ficparo,"%1d%1d",i1,j1); |
Line 5143 int main(int argc, char *argv[])
|
Line 5157 int main(int argc, char *argv[])
|
printf("Problem with %s \n",optionfilehtmcov), exit(0); |
printf("Problem with %s \n",optionfilehtmcov), exit(0); |
} |
} |
else{ |
else{ |
fprintf(fichtmcov,"<body>\n<title>IMaCh Cov %s</title>\n <font size=\"2\">%s <br> %s</font> \ |
fprintf(fichtmcov,"<html><head>\n<title>IMaCh Cov %s</title></head>\n <body><font size=\"2\">%s <br> %s</font> \ |
<hr size=\"2\" color=\"#EC5E5E\"> \n\ |
<hr size=\"2\" color=\"#EC5E5E\"> \n\ |
Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s<br>\n",\ |
Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s<br>\n",\ |
fileres,version,fullversion,title,datafile,firstpass,lastpass,stepm, weightopt, model); |
optionfilehtmcov,version,fullversion,title,datafile,firstpass,lastpass,stepm, weightopt, model); |
} |
} |
|
|
fprintf(fichtm,"<body>\n<title>IMaCh %s</title>\n <font size=\"2\">%s <br> %s</font> \ |
fprintf(fichtm,"<html><head>\n<title>IMaCh %s</title></head>\n <body><font size=\"2\">%s <br> %s</font> \ |
<hr size=\"2\" color=\"#EC5E5E\"> \n\ |
<hr size=\"2\" color=\"#EC5E5E\"> \n\ |
Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s<br>\n\ |
Title=%s <br>Datafile=%s Firstpass=%d Lastpass=%d Stepm=%d Weight=%d Model=%s<br>\n\ |
\n\ |
\n\ |
Line 5160 Title=%s <br>Datafile=%s Firstpass=%d La
|
Line 5174 Title=%s <br>Datafile=%s Firstpass=%d La
|
- Log file of the run: <a href=\"%s\">%s</a><br>\n\ |
- Log file of the run: <a href=\"%s\">%s</a><br>\n\ |
- Gnuplot file name: <a href=\"%s\">%s</a><br>\n\ |
- Gnuplot file name: <a href=\"%s\">%s</a><br>\n\ |
- Date and time at start: %s</ul>\n",\ |
- Date and time at start: %s</ul>\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,\ |
optionfilefiname,optionfilext,optionfilefiname,optionfilext,\ |
fileres,fileres,\ |
fileres,fileres,\ |
filelog,filelog,optionfilegnuplot,optionfilegnuplot,strstart); |
filelog,filelog,optionfilegnuplot,optionfilegnuplot,strstart); |
Line 5925 Interval (in months) between two waves:
|
Line 5939 Interval (in months) between two waves:
|
fprintf(ficlog,"Total time was %d Sec.\n", end_time.tv_sec -start_time.tv_sec); |
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);*/ |
/* printf("Total time was %d uSec.\n", total_usecs);*/ |
/* if(fileappend(fichtm,optionfilehtm)){ */ |
/* if(fileappend(fichtm,optionfilehtm)){ */ |
fprintf(fichtm,"<br>Local time at start %s<br>Local time at end %s<br>",strstart, strtend); |
fprintf(fichtm,"<br>Local time at start %s<br>Local time at end %s<br>\n</body></html>",strstart, strtend); |
fclose(fichtm); |
fclose(fichtm); |
|
fprintf(fichtmcov,"<br>Local time at start %s<br>Local time at end %s<br>\n</body></html>",strstart, strtend); |
fclose(fichtmcov); |
fclose(fichtmcov); |
fclose(ficgp); |
fclose(ficgp); |
fclose(ficlog); |
fclose(ficlog); |