|
|
| version 1.292, 2019/05/09 14:17:20 | version 1.295, 2019/05/18 09:52:50 |
|---|---|
| Line 1 | Line 1 |
| /* $Id$ | /* $Id$ |
| $State$ | $State$ |
| $Log$ | $Log$ |
| Revision 1.295 2019/05/18 09:52:50 brouard | |
| Summary: doxygen tex bug | |
| Revision 1.294 2019/05/16 14:54:33 brouard | |
| Summary: There was some wrong lines added | |
| Revision 1.293 2019/05/09 15:17:34 brouard | |
| *** empty log message *** | |
| Revision 1.292 2019/05/09 14:17:20 brouard | Revision 1.292 2019/05/09 14:17:20 brouard |
| Summary: Some updates | Summary: Some updates |
| Line 2966 double **pmij(double **ps, double *cov, | Line 2975 double **pmij(double **ps, double *cov, |
| ps[ii][ii]=1; | ps[ii][ii]=1; |
| } | } |
| } | } |
| /* for(ii=1; ii<= nlstate+ndeath; ii++){ */ | /* for(ii=1; ii<= nlstate+ndeath; ii++){ */ |
| /* for(jj=1; jj<= nlstate+ndeath; jj++){ */ | /* for(jj=1; jj<= nlstate+ndeath; jj++){ */ |
| /* printf(" pmij ps[%d][%d]=%lf ",ii,jj,ps[ii][jj]); */ | /* printf(" pmij ps[%d][%d]=%lf ",ii,jj,ps[ii][jj]); */ |
| Line 6009 void concatwav(int wav[], int **dh, int | Line 6018 void concatwav(int wav[], int **dh, int |
| prlim[i][i]=mobaverage[(int)age][i][ij]; | prlim[i][i]=mobaverage[(int)age][i][ij]; |
| } | } |
| } | } |
| /**< Computes the shifted transition matrix \f$ {}{h}_p^{ij}_x\f$ at horizon h. | /**< Computes the shifted transition matrix \f$ {}{h}_p^{ij}x\f$ at horizon h. |
| */ | */ |
| hpxij(p3mat,nhstepm,age,hstepm,xp,nlstate,stepm,oldm,savm, ij,nres); /* Returns p3mat[i][j][h] for h=0 to nhstepm */ | hpxij(p3mat,nhstepm,age,hstepm,xp,nlstate,stepm,oldm,savm, ij,nres); /* Returns p3mat[i][j][h] for h=0 to nhstepm */ |
| /**< And for each alive state j, sums over i \f$ w^i_x {}{h}_p^{ij}x\f$, which are the probability | /**< And for each alive state j, sums over i \f$ w^i_x {}{h}_p^{ij}x\f$, which are the probability |
| Line 10787 int main(int argc, char *argv[]) | Line 10796 int main(int argc, char *argv[]) |
| int *tab; | int *tab; |
| int mobilavproj=0 , prevfcast=0 ; /* moving average of prev, If prevfcast=1 prevalence projection */ | int mobilavproj=0 , prevfcast=0 ; /* moving average of prev, If prevfcast=1 prevalence projection */ |
| /* int backcast=0; */ /* defined as global for mlikeli and mle */ | int backcast=0; /* defined as global for mlikeli and mle*/ |
| int mobilav=0,popforecast=0; | int mobilav=0,popforecast=0; |
| int hstepm=0, nhstepm=0; | int hstepm=0, nhstepm=0; |
| int agemortsup; | int agemortsup; |