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.133 and 1.134

version 1.133, 2009/07/06 10:21:25	version 1.134, 2009/10/29 13:18:53
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.134 2009/10/29 13:18:53 brouard
	(Module): Now imach stops if date of birth, at least year of birth, is not given. Some cleaning of the code.

Revision 1.133 2009/07/06 10:21:25 brouard	Revision 1.133 2009/07/06 10:21:25 brouard
just nforces	just nforces

Line 406 extern int errno;	Line 409 extern int errno;
/* $Id$ */	/* $Id$ */
/* $State$ */	/* $State$ */

char version[]="Imach version 0.98k, June 2009, INED-EUROREVES-Institut de longevite ";	char version[]="Imach version 0.98l, October 2009, INED-EUROREVES-Institut de longevite ";
char fullversion[]="$Revision$ $Date$";	char fullversion[]="$Revision$ $Date$";
char strstart[80];	char strstart[80];
char optionfilext[10], optionfilefiname[FILENAMELENGTH];	char optionfilext[10], optionfilefiname[FILENAMELENGTH];
Line 4945 run imach with mle=-1 to get a correct t	Line 4948 run imach with mle=-1 to get a correct t
month=99;	month=99;
year=9999;	year=9999;
}else{	}else{
printf("Error reading data around '%s' at line number %ld %s for individual %d, '%s'\nShould be a date of birth (mm/yyyy or .). Exiting.\n",strb, linei,i,line,j);	printf("Error reading data around '%s' at line number %ld for individual %d, '%s'\nShould be a date of birth (mm/yyyy or .). Exiting.\n",strb, linei,i,line);
fprintf(ficlog,"Error reading data around '%s' at line number %ld %s for individual %d, '%s'\nShould be a date of birth (mm/yyyy or .). Exiting.\n",strb, linei,i,line,j);fflush(ficlog);	fprintf(ficlog,"Error reading data around '%s' at line number %ld for individual %d, '%s'\nShould be a date of birth (mm/yyyy or .). Exiting.\n",strb, linei,i,line);fflush(ficlog);
	goto end;
	}
	if (year==9999) {
	printf("Error reading data around '%s' at line number %ld for individual %d, '%s'\nShould be a date of birth (mm/yyyy) but at least the year of birth should be given. Exiting.\n",strb, linei,i,line);
	fprintf(ficlog,"Error reading data around '%s' at line number %ld for individual %d, '%s'\nShould be a date of birth (mm/yyyy) but at least the year of birth should be given. Exiting.\n",strb, linei,i,line);fflush(ficlog);
goto end;	goto end;

}	}
annais[i]=(double)(year);	annais[i]=(double)(year);
moisnais[i]=(double)(month);	moisnais[i]=(double)(month);
Line 5172 run imach with mle=-1 to get a correct t	Line 5181 run imach with mle=-1 to get a correct t
agev[m][i]=1;	agev[m][i]=1;
else if(agev[m][i] <agemin){	else if(agev[m][i] <agemin){
agemin=agev[m][i];	agemin=agev[m][i];
/printf(" Min anint[%d][%d]=%.2f annais[%d]=%.2f, agemin=%.2f\n",m,i,anint[m][i], i,annais[i], agemin);/	printf(" Min anint[%d][%d]=%.2f annais[%d]=%.2f, agemin=%.2f\n",m,i,anint[m][i], i,annais[i], agemin);
}	}
else if(agev[m][i] >agemax){	else if(agev[m][i] >agemax){
agemax=agev[m][i];	agemax=agev[m][i];

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

Removed from v.1.133
changed lines
	Added in v.1.134