--- imach/src/imach.c 2019/05/09 15:17:34 1.293 +++ imach/src/imach.c 2019/05/18 09:52:50 1.295 @@ -1,6 +1,12 @@ -/* $Id: imach.c,v 1.293 2019/05/09 15:17:34 brouard Exp $ +/* $Id: imach.c,v 1.295 2019/05/18 09:52:50 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + 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 *** @@ -1087,12 +1093,12 @@ typedef struct { #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.293 2019/05/09 15:17:34 brouard Exp $ */ +/* $Id: imach.c,v 1.295 2019/05/18 09:52:50 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.293 $ $Date: 2019/05/09 15:17:34 $"; +char fullversion[]="$Revision: 1.295 $ $Date: 2019/05/18 09:52:50 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -2969,24 +2975,8 @@ double **pmij(double **ps, double *cov, ps[ii][ii]=1; } } - /* Added for backcast */ /* Transposed matrix too */ - for(jj=1; jj<= nlstate+ndeath; jj++){ - s1=0.; - for(ii=1; ii<= nlstate+ndeath; ii++){ - s1+=ps[ii][jj]; - } - for(ii=1; ii<= nlstate; ii++){ - ps[ii][jj]=ps[ii][jj]/s1; - } - } - /* Transposition */ - for(jj=1; jj<= nlstate+ndeath; jj++){ - for(ii=jj; ii<= nlstate+ndeath; ii++){ - s1=ps[ii][jj]; - ps[ii][jj]=ps[jj][ii]; - ps[jj][ii]=s1; - } - } + + /* for(ii=1; ii<= nlstate+ndeath; ii++){ */ /* for(jj=1; jj<= nlstate+ndeath; jj++){ */ /* printf(" pmij ps[%d][%d]=%lf ",ii,jj,ps[ii][jj]); */ @@ -6028,7 +6018,7 @@ void concatwav(int wav[], int **dh, int 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 */ /**< And for each alive state j, sums over i \f$ w^i_x {}{h}_p^{ij}x\f$, which are the probability