--- imach/src/imach.c	2003/05/16 16:49:47	1.77
+++ imach/src/imach.c	2003/06/10 13:39:11	1.83
@@ -1,4 +1,14 @@
-/* $Id: imach.c,v 1.77 2003/05/16 16:49:47 brouard Exp $
+/* $Id: imach.c,v 1.83 2003/06/10 13:39:11 lievre Exp $
+  $State: Exp $
+  $Log: imach.c,v $
+  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
 
   Short summary of the programme:
@@ -119,7 +129,11 @@
 #define ODIRSEPARATOR '\\'
 #endif
 
-char version[80]="Imach version 0.95a, May 2003, INED-EUROREVES ";
+/* $Id: imach.c,v 1.83 2003/06/10 13:39:11 lievre Exp $ */
+/* $State: Exp $ */
+
+char version[]="Imach version 0.95a1, June 2003, INED-EUROREVES ";
+char fullversion[]="$Revision: 1.83 $ $Date: 2003/06/10 13:39:11 $"; 
 int erreur; /* Error number */
 int nvar;
 int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov;
@@ -1799,7 +1813,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 +1824,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;
@@ -2987,7 +3001,7 @@ m=pow(2,cptcoveff);
       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);
       
-      for (i=1; i<= nlstate ; i ++)
+      for (i=1; i< nlstate ; i ++)
 	fprintf(ficgp,"+$%d",k+i+1);
       fprintf(ficgp,")) t\"prev(%d,%d)\" w l",cpt,cpt+1);
       
@@ -3454,7 +3468,7 @@ int main(int argc, char *argv[])
      gettimeofday(&start_time, (struct timezone*)0); */ /* at first time */
   getcwd(pathcd, size);
 
-  printf("\n%s",version);
+  printf("\n%s\n%s",version,fullversion);
   if(argc <=1){
     printf("\nEnter the parameter file name: ");
     scanf("%s",pathtot);