Summary: Temp

diff --git a/src/imach.c b/src/imach.c
index 43836dcdf30b48485f029d9b1500df5a0367d4bb..29095b26059cd361072df9badc772198c1a2e866 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.256  2017/03/27 05:50:23  brouard
+  Summary: Temporary
+
   Revision 1.255  2017/03/08 16:02:28  brouard
   Summary: IMaCh version 0.99r10 bugs in gnuplot fixed
 
@@ -4956,13 +4959,9 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
       /* if(mi==0)  never been interviewed correctly before death */
       /* Only death is a correct wave */
       mw[mi][i]=m;
-    }
+    } /* else not in a death state */
 #ifndef DISPATCHINGKNOWNDEATHAFTERLASTWAVE
-    else if ((int) andc[i] != 9999) { /* Status is negative. A death occured after lastpass, we can't take it into account because of potential bias */
-      /* m++; */
-      /* mi++; */
-      /* s[m][i]=nlstate+1;  /\* We are setting the status to the last of non live state *\/ */
-      /* mw[mi][i]=m; */
+    else if ((int) andc[i] != 9999) {  /* Date of death is known */
       if ((int)anint[m][i]!= 9999) { /* date of last interview is known */
        if((andc[i]+moisdc[i]/12.) <=(anint[m][i]+mint[m][i]/12.)){ /* death occured before last wave and status should have been death instead of -1 */
          nbwarn++;
@@ -4975,12 +4974,12 @@ void  concatwav(int wav[], int **dh, int **bh,  int **mw, int **s, double *agedc
        }else{ /* Death occured afer last wave potential bias */
          nberr++;
          if(firstwo==0){
-           printf("Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood.\nOthers in log file only\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
+           printf("Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood. Please add a new fictive wave at the date of last vital status scan, with a dead status or alive but unknown state status (-1). See documentation\nOthers in log file only\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
            firstwo=1;
          }
-         fprintf(ficlog,"Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood.\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
+         fprintf(ficlog,"Error! Death for individual %ld line=%d occurred at %d/%d after last wave %d interviewed at %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood. Please add a new fictive wave at the date of last vital status scan, with a dead status or alive but unknown state status (-1). See documentation\n\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );
        }
-      }else{ /* end date of interview is known */
+      }else{ /* if date of interview is unknown */
        /* death is known but not confirmed by death status at any wave */
        if(firstfour==0){
          printf("Error! Death for individual %ld line=%d  occurred %d/%d but not confirmed by any death status for any wave, including last wave %d at unknown date %d/%d. Potential bias if other individuals are still alive at this date but ignored. This case (%d)/wave (%d) is skipped, no contribution to likelihood.\nOthers in log file only\n",num[i],i,(int) moisdc[i], (int) andc[i], lastpass,(int)mint[m][i],(int)anint[m][i], i,m );