imach/src/imach.c - diff

Return to imach.c CVS log

Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.113 and 1.116

version 1.113, 2006/02/24 14:20:24	version 1.116, 2006/03/06 10:29:27
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.116 2006/03/06 10:29:27 brouard
	(Module): Variance-covariance wrong links and
	varian-covariance of ej. is needed (Saito).

	Revision 1.115 2006/02/27 12:17:45 brouard
	(Module): One freematrix added in mlikeli! 0.98c

	Revision 1.114 2006/02/26 12:57:58 brouard
	(Module): Some improvements in processing parameter
	filename with strsep.

Revision 1.113 2006/02/24 14:20:24 brouard	Revision 1.113 2006/02/24 14:20:24 brouard
(Module): Memory leaks checks with valgrind and:	(Module): Memory leaks checks with valgrind and:
datafile was not closed, some imatrix were not freed and on matrix	datafile was not closed, some imatrix were not freed and on matrix
Line 300 extern int errno;	Line 311 extern int errno;
/* $Id$ */	/* $Id$ */
/* $State$ */	/* $State$ */

char version[]="Imach version 0.98b, January 2006, INED-EUROREVES ";	char version[]="Imach version 0.98c, February 2006, INED-EUROREVES ";
char fullversion[]="$Revision$ $Date$";	char fullversion[]="$Revision$ $Date$";
int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */	int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */
int nvar;	int nvar;
Line 1664 void mlikeli(FILE *ficres,double p[], in	Line 1675 void mlikeli(FILE *ficres,double p[], in

powell(p,xi,npar,ftol,&iter,&fret,func);	powell(p,xi,npar,ftol,&iter,&fret,func);

	free_matrix(xi,1,npar,1,npar);
fclose(ficrespow);	fclose(ficrespow);
printf("\n#Number of iterations = %d, -2 Log likelihood = %.12f\n",iter,func(p));	printf("\n#Number of iterations = %d, -2 Log likelihood = %.12f\n",iter,func(p));
fprintf(ficlog,"\n#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));	fprintf(ficlog,"\n#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));
Line 3272 void printinghtml(char fileres[], char t	Line 3284 void printinghtml(char fileres[], char t
- Stable prevalence in each health state: <a href=\"%s\">%s</a> <br>\n",	- Stable prevalence in each health state: <a href=\"%s\">%s</a> <br>\n",
subdirf2(fileres,"pl"),subdirf2(fileres,"pl"));	subdirf2(fileres,"pl"),subdirf2(fileres,"pl"));
fprintf(fichtm,"\	fprintf(fichtm,"\
- Life expectancies by age and initial health status (estepm=%2d months): \	- Life expectancies by age and initial health status (estepm=%2d months) WRONG LINK (to be made): \
	<a href=\"%s\">%s</a> <br>\n</li>",
	estepm,subdirf2(fileres,"le"),subdirf2(fileres,"le"));
	fprintf(fichtm,"\
	- Health expectancies by age and initial health status with standard errors (estepm=%2d months): \
<a href=\"%s\">%s</a> <br>\n</li>",	<a href=\"%s\">%s</a> <br>\n</li>",
estepm,subdirf2(fileres,"e"),subdirf2(fileres,"e"));	estepm,subdirf2(fileres,"e"),subdirf2(fileres,"e"));
	fprintf(fichtm,"\
	- Variances and covariances of health expectancies by age and initial health status (estepm=%2d months) TO BE MADE: \
	<a href=\"%s\">%s</a> <br>\n</li>",
	estepm,subdirf2(fileres,"vch"),subdirf2(fileres,"vch"));


fprintf(fichtm," \n<ul><li><b>Graphs</b></li><p>");	fprintf(fichtm," \n<ul><li><b>Graphs</b></li><p>");

Line 3326 fprintf(fichtm," \n<ul><li><b>Graphs</b>	Line 3347 fprintf(fichtm," \n<ul><li><b>Graphs</b>
- Correlation matrix of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",	- Correlation matrix of one-step probabilities: <a href=\"%s\">%s</a> <br>\n",
subdirf2(fileres,"probcor"),subdirf2(fileres,"probcor"));	subdirf2(fileres,"probcor"),subdirf2(fileres,"probcor"));
fprintf(fichtm,"\	fprintf(fichtm,"\
- Variances and covariances of life expectancies by age and initial health status (estepm=%d months): <a href=\"%s\">%s</a><br>\n",	- Variances and covariances of health expectancies by age (estepm=%d months): <a href=\"%s\">%s</a><br>\n",
estepm, subdirf2(fileres,"v"),subdirf2(fileres,"v"));	estepm, subdirf2(fileres,"v"),subdirf2(fileres,"v"));
fprintf(fichtm,"\	fprintf(fichtm,"\
- Health expectancies with their variances (no covariance): <a href=\"%s\">%s</a> <br>\n",	- Life and health expectancies with their standard errors: <a href=\"%s\">%s</a> <br>\n",
subdirf2(fileres,"t"),subdirf2(fileres,"t"));	subdirf2(fileres,"t"),subdirf2(fileres,"t"));
fprintf(fichtm,"\	fprintf(fichtm,"\
- Standard deviation of stable prevalences: <a href=\"%s\">%s</a> <br>\n",\	- Standard deviation of stable prevalences: <a href=\"%s\">%s</a> <br>\n",\
Line 4141 int main(int argc, char *argv[])	Line 4162 int main(int argc, char *argv[])
char line[MAXLINE], linepar[MAXLINE];	char line[MAXLINE], linepar[MAXLINE];
char path[MAXLINE],pathc[MAXLINE],pathcd[MAXLINE],pathtot[MAXLINE],model[MAXLINE];	char path[MAXLINE],pathc[MAXLINE],pathcd[MAXLINE],pathtot[MAXLINE],model[MAXLINE];
char pathr[MAXLINE], pathimach[MAXLINE];	char pathr[MAXLINE], pathimach[MAXLINE];
	char *bp, tok, val; / pathtot */
int firstobs=1, lastobs=10;	int firstobs=1, lastobs=10;
int sdeb, sfin; /* Status at beginning and end */	int sdeb, sfin; /* Status at beginning and end */
int c, h , cpt,l;	int c, h , cpt,l;
Line 4218 int main(int argc, char *argv[])	Line 4240 int main(int argc, char *argv[])
printf("\n%s\n%s",version,fullversion);	printf("\n%s\n%s",version,fullversion);
if(argc <=1){	if(argc <=1){
printf("\nEnter the parameter file name: ");	printf("\nEnter the parameter file name: ");
scanf("%s",pathtot);	fgets(pathr,FILENAMELENGTH,stdin);
	i=strlen(pathr);
	if(pathr[i-1]=='\n')
	pathr[i-1]='\0';
	for (tok = pathr; tok != NULL; ){
	printf("Pathr \|%s\|\n",pathr);
	while ((val = strsep(&tok, "\"" )) != NULL && *val == '\0');
	printf("val= \|%s\| pathr=%s\n",val,pathr);
	strcpy (pathtot, val);
	if(pathr[0] == '\0') break; /* Un peu sale */
	}
}	}
else{	else{
strcpy(pathtot,argv[1]);	strcpy(pathtot,argv[1]);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.113
changed lines
	Added in v.1.116