--- imach/src/imach.c	2003/05/16 16:49:47	1.77
+++ imach/src/imach.c	2003/06/05 15:34:14	1.80
@@ -1,4 +1,4 @@
-/* $Id: imach.c,v 1.77 2003/05/16 16:49:47 brouard Exp $
+/* $Id: imach.c,v 1.80 2003/06/05 15:34:14 brouard Exp $
    Interpolated Markov Chain
 
   Short summary of the programme:
@@ -119,7 +119,19 @@
 #define ODIRSEPARATOR '\\'
 #endif
 
-char version[80]="Imach version 0.95a, May 2003, INED-EUROREVES ";
+/* $Id: imach.c,v 1.80 2003/06/05 15:34:14 brouard Exp $ */
+/* $Log: imach.c,v $
+ * 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: 1.80 $ */
+/* $Date: 2003/06/05 15:34:14 $ */
+/* $State: Exp $ */
+
+char version[80]="Imach version 0.95a1, June 2003, INED-EUROREVES ";
 int erreur; /* Error number */
 int nvar;
 int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;
@@ -1799,7 +1811,7 @@ void  concatwav(int wav[], int **dh, int
 	  sum=sum+j;
 	  /*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);*/
-	  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{
@@ -1810,7 +1822,7 @@ void  concatwav(int wav[], int **dh, int
 	  else if (j <= jmin)jmin=j;
 	  /*	    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]);*/
-	  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;
 	}
 	jk= j/stepm;