--- imach/src/imach.c 2019/05/22 17:56:10 1.297 +++ imach/src/imach.c 2019/05/22 18:19:56 1.298 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.297 2019/05/22 17:56:10 brouard Exp $ +/* $Id: imach.c,v 1.298 2019/05/22 18:19:56 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.298 2019/05/22 18:19:56 brouard + *** empty log message *** + Revision 1.297 2019/05/22 17:56:10 brouard Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1 @@ -1110,12 +1113,12 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.297 2019/05/22 17:56:10 brouard Exp $ */ +/* $Id: imach.c,v 1.298 2019/05/22 18:19:56 brouard Exp $ */ /* $State: Exp $ */ #include "version.h" char version[]=__IMACH_VERSION__; char copyright[]="April 2018,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2018"; -char fullversion[]="$Revision: 1.297 $ $Date: 2019/05/22 17:56:10 $"; +char fullversion[]="$Revision: 1.298 $ $Date: 2019/05/22 18:19:56 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -5206,11 +5209,11 @@ void prevalence(double ***probs, double void concatwav(int wav[], int **dh, int **bh, int **mw, int **s, double *agedc, double **agev, int firstpass, int lastpass, int imx, int nlstate, int stepm) { - /* Concatenates waves: wav[i] is the number of effective (useful waves) of individual i. + /* Concatenates waves: wav[i] is the number of effective (useful waves in the sense that a non interview is useless) of individual i. Death is a valid wave (if date is known). mw[mi][i] is the mi (mi=1 to wav[i]) effective wave of individual i dh[m][i] or dh[mw[mi][i]][i] is the delay between two effective waves m=mw[mi][i] - and mw[mi+1][i]. dh depends on stepm. + and mw[mi+1][i]. dh depends on stepm. s[m][i] exists for any wave from firstpass to lastpass */ int i=0, mi=0, m=0, mli=0;