From: N. Brouard Date: Wed, 22 May 2019 18:19:56 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: imach-099s7~179 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=bdd36f63173923d187a6e2e00fbb7b3de61f58c9;p=.git *** empty log message *** --- diff --git a/src/imach.c b/src/imach.c index 1420ae3..42cccf1 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,9 @@ /* $Id$ $State$ $Log$ + Revision 1.297 2019/05/22 17:56:10 brouard + Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1 + Revision 1.296 2019/05/20 13:03:18 brouard Summary: Projection syntax simplified @@ -5203,11 +5206,11 @@ void prevalence(double ***probs, double agemin, double agemax, int **s, 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;