From 4a7ebf25fd509e0d7c701f491d9dcc29ba26562d Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Mon, 11 Mar 2002 14:17:15 +0000 Subject: [PATCH] Supress a bug in esij --- src/imach.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/imach.c b/src/imach.c index 1e63261..363eb96 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1540,14 +1540,14 @@ void evsij(char fileres[], double ***eij, double x[], int nlstate, int stepm, in 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. @@ -1565,7 +1565,7 @@ void evsij(char fileres[], double ***eij, double x[], int nlstate, int stepm, in /* 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 title[], char datafile[], int firstpass, printf("Problem with %s \n",optionfilehtm), exit(0); } - fprintf(fichtm,"