[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.297 and 1.298

version 1.297, 2019/05/22 17:56:10 version 1.298, 2019/05/22 18:19:56
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.298  2019/05/22 18:19:56  brouard
     *** empty log message ***
   
   Revision 1.297  2019/05/22 17:56:10  brouard    Revision 1.297  2019/05/22 17:56:10  brouard
   Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1    Summary: Fix bug by moving date2dmy and nhstepm which gaefin=-1
   
Line 5206  void prevalence(double ***probs, double Line 5209  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)  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).       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       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]       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;    int i=0, mi=0, m=0, mli=0;
Removed from v.1.297  
changed lines
  Added in v.1.298

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>