--- imach/src/imach.c 2002/03/10 13:43:02 1.31 +++ imach/src/imach.c 2002/03/13 17:19:16 1.34 @@ -1,4 +1,4 @@ -/* $Id: imach.c,v 1.31 2002/03/10 13:43:02 brouard Exp $ +/* $Id: imach.c,v 1.34 2002/03/13 17:19:16 brouard Exp $ Interpolated Markov Chain Short summary of the programme: @@ -82,7 +82,7 @@ int cptcovn, cptcovage=0, cptcoveff=0,cp int npar=NPARMAX; int nlstate=2; /* Number of live states */ int ndeath=1; /* Number of dead states */ -int ncovmodel, ncov; /* Total number of covariables including constant a12*1 +b12*x ncovmodel=2 */ +int ncovmodel, ncovcol; /* Total number of covariables including constant a12*1 +b12*x ncovmodel=2 */ int popbased=0; int *wav; /* Number of waves for this individuual 0 is possible */ @@ -1513,7 +1513,7 @@ void tricode(int *Tvar, int **nbcode, in ij=1; for (i=1; i<=10; i++) { - if((Ndum[i]!=0) && (i<=ncov)){ + if((Ndum[i]!=0) && (i<=ncovcol)){ Tvaraff[ij]=i; ij++; } @@ -1540,14 +1540,14 @@ void evsij(char fileres[], double ***eij k=1; /* For example stepm=6 months */ hstepm=k*YEARM; /* (a) Every k years of age (in months), for example every k=2 years 24 m */ - hstepm=1; /* or (b) We decided to compute the life expectancy with the smallest unit */ + hstepm=stepm; /* or (b) We decided to compute the life expectancy with the smallest unit */ /* hstepm beeing the number of stepms, if hstepm=1 the length of hstepm is stepm. nhstepm is the number of hstepm from age to agelim nstepm is the number of stepm from age to agelin. Look at hpijx to understand the reason of that which relies in memory size and note for a fixed period like k years */ /* We decided (b) to get a life expectancy respecting the most precise curvature of the - survival function given par stepm (the optimization length). Unfortunately it + survival function given by stepm (the optimization length). Unfortunately it means that if the survival funtion is printed only each two years of age and if you sum them up and add 1 year (area under the trapezoids) you won't get the same results. So we changed our mind and took the option of the best precision. @@ -1559,13 +1559,13 @@ void evsij(char fileres[], double ***eij /* nhstepm age range expressed in number of stepm */ nstepm=(int) rint((agelim-age)*YEARM/stepm); /* Typically if 20 years nstepm = 20*12/6=40 stepm */ - if (stepm >= YEARM) hstepm=1; + /* if (stepm >= YEARM) hstepm=1;*/ nhstepm = nstepm/hstepm;/* Expressed in hstepm, typically nhstepm=40/4=10 */ p3mat=ma3x(1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm); /* Computed by stepm unit matrices, product of hstepm matrices, stored in an array of nhstepm length: nhstepm=10, hstepm=4, stepm=6 months */ hpxij(p3mat,nhstepm,age,hstepm,x,nlstate,stepm,oldm, savm, ij); - hf=hstepm/YEARM; /* Duration of hstepm expressed in year unit. */ + hf=hstepm*stepm/YEARM; /* Duration of hstepm expressed in year unit. */ for(i=1; i<=nlstate;i++) for(j=1; j<=nlstate;j++) for (h=0, eij[i][j][(int)age]=0; h<=nhstepm-1; h++){ @@ -1903,7 +1903,7 @@ void printinghtml(char fileres[], char t printf("Problem with %s \n",optionfilehtm), exit(0); } - fprintf(fichtm,"