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.77 and 1.80

version 1.77, 2003/05/16 16:49:47	version 1.80, 2003/06/05 15:34:14
Line 119	Line 119
#define ODIRSEPARATOR '\\'	#define ODIRSEPARATOR '\\'
#endif	#endif

char version[80]="Imach version 0.95a, May 2003, INED-EUROREVES ";	/* $Id$ */
	/* $Log$
	* Revision 1.80 2003/06/05 15:34:14 brouard
	* Trying to add the true revision is the program and log
	*
	/* Revision 1.79 2003/06/05 15:17:23 brouard
	/* * empty log message *
	/* */
	/* $Revision$ */
	/* $Date$ */
	/* $State$ */

	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 1799 void concatwav(int wav[], int **dh, int	Line 1811 void concatwav(int wav[], int **dh, int
sum=sum+j;	sum=sum+j;
/if (j<0) printf("j=%d num=%d \n",j,i);/	/if (j<0) printf("j=%d num=%d \n",j,i);/
/* printf("%d %d %d %d\n", s[mw[mi][i]][i] ,s[mw[mi+1][i]][i],j,i);*/	/* printf("%d %d %d %d\n", s[mw[mi][i]][i] ,s[mw[mi+1][i]][i],j,i);*/
if(j<0)printf("Warning! Negative delay (%d) between waves %d and %d of individual at line %d who is aged %.1f with statuses %d %d\n ",j,mw[mi][i],mw[mi+1][i], i,agev[mw[mi][i]][i],s[mw[mi][i]][i] ,s[mw[mi+1][i]][i]);	if(j<0)printf("Error! Negative delay (%d to death) between waves %d and %d of individual %d at line %d who is aged %.1f with statuses from %d to %d\n ",j,mw[mi][i],mw[mi+1][i],num[i], i,agev[mw[mi][i]][i],s[mw[mi][i]][i] ,s[mw[mi+1][i]][i]);
}	}
}	}
else{	else{
Line 1810 void concatwav(int wav[], int **dh, int	Line 1822 void concatwav(int wav[], int **dh, int
else if (j <= jmin)jmin=j;	else if (j <= jmin)jmin=j;
/* if (j<10) printf("j=%d jmin=%d num=%d ",j,jmin,i); */	/* if (j<10) printf("j=%d jmin=%d num=%d ",j,jmin,i); */
/printf("%d %lf %d %d %d\n", i,agev[mw[mi][i]][i],j,s[mw[mi][i]][i] ,s[mw[mi+1][i]][i]);/	/printf("%d %lf %d %d %d\n", i,agev[mw[mi][i]][i],j,s[mw[mi][i]][i] ,s[mw[mi+1][i]][i]);/
if(j<0)printf("Warning! Negative delay (%d to death) between waves %d and %d of individual at line %d who is aged %.1f with statuses %d %d\n ",j,mw[mi][i],mw[mi+1][i], i,agev[mw[mi][i]][i],s[mw[mi][i]][i] ,s[mw[mi+1][i]][i]);	if(j<0)printf("Error! Negative delay (%d) between waves %d and %d of individual %d at line %d who is aged %.1f with statuses from %d to %d\n ",j,mw[mi][i],mw[mi+1][i],num[i], i,agev[mw[mi][i]][i],s[mw[mi][i]][i] ,s[mw[mi+1][i]][i]);
sum=sum+j;	sum=sum+j;
}	}
jk= j/stepm;	jk= j/stepm;

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

Removed from v.1.77
changed lines
	Added in v.1.80