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.79 and 1.83

version 1.79, 2003/06/05 15:17:23	version 1.83, 2003/06/10 13:39:11
Line 1	Line 1
/* $Id$	/* $Id$
	$State$
	$Log$
	Revision 1.83 2003/06/10 13:39:11 lievre
	* empty log message *

	Revision 1.82 2003/06/05 15:57:20 brouard
	Add log in imach.c and fullversion number is now printed.

	*/
	/*
Interpolated Markov Chain	Interpolated Markov Chain

Short summary of the programme:	Short summary of the programme:
Line 120	Line 130
#endif	#endif

/* $Id$ */	/* $Id$ */
/* $Log$	/* $State$ */
* Revision 1.79 2003/06/05 15:17:23 brouard
* * empty log message *	char version[]="Imach version 0.95a1, June 2003, INED-EUROREVES ";
* */	char fullversion[]="$Revision$ $Date$";
char version[80]="Imach version 0.95a1, June 2003, INED-EUROREVES ";
int erreur; /* Error number */	int erreur; /* Error number */
int nvar;	int nvar;
int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;	int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;
Line 2992 m=pow(2,cptcoveff);	Line 3001 m=pow(2,cptcoveff);
fprintf(ficgp,"\nset out \"p%s%d%d.png\" \n",strtok(optionfile, "."),cpt,k1);	fprintf(ficgp,"\nset out \"p%s%d%d.png\" \n",strtok(optionfile, "."),cpt,k1);
fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter png small\nset size 0.65,0.65\nplot [%.f:%.f] \"pij%s\" u ($1==%d ? ($3):1/0):($%d/($%d",ageminpar,agemaxpar,fileres,k1,k+cpt+1,k+1);	fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter png small\nset size 0.65,0.65\nplot [%.f:%.f] \"pij%s\" u ($1==%d ? ($3):1/0):($%d/($%d",ageminpar,agemaxpar,fileres,k1,k+cpt+1,k+1);

for (i=1; i<= nlstate ; i ++)	for (i=1; i< nlstate ; i ++)
fprintf(ficgp,"+$%d",k+i+1);	fprintf(ficgp,"+$%d",k+i+1);
fprintf(ficgp,")) t\"prev(%d,%d)\" w l",cpt,cpt+1);	fprintf(ficgp,")) t\"prev(%d,%d)\" w l",cpt,cpt+1);

Line 3459 int main(int argc, char *argv[])	Line 3468 int main(int argc, char *argv[])
gettimeofday(&start_time, (struct timezone)0); / /* at first time */	gettimeofday(&start_time, (struct timezone)0); / /* at first time */
getcwd(pathcd, size);	getcwd(pathcd, size);

printf("\n%s",version);	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);	scanf("%s",pathtot);

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

Removed from v.1.79
changed lines
	Added in v.1.83