--- imach/src/imach.c 2002/03/01 17:56:23 1.28 +++ imach/src/imach.c 2002/03/06 19:02:50 1.29 @@ -1,4 +1,4 @@ -/* $Id: imach.c,v 1.28 2002/03/01 17:56:23 lievre Exp $ +/* $Id: imach.c,v 1.29 2002/03/06 19:02:50 lievre Exp $ Interpolated Markov Chain Short summary of the programme: @@ -1556,16 +1556,22 @@ void evsij(char fileres[], double ***eij for(i=1; i<=nlstate;i++) for(j=1; j<=nlstate;j++) - for (h=0, eij[i][j][(int)age]=0; h<=nhstepm; h++){ - eij[i][j][(int)age] +=p3mat[i][j][h]; + for (h=0, eij[i][j][(int)age]=0; h<=nhstepm-1; h++){ + eij[i][j][(int)age] +=(p3mat[i][j][h]+p3mat[i][j][h+1])/2.0; } hf=1; if (stepm >= YEARM) hf=stepm/YEARM; - fprintf(ficreseij,"%.0f",age ); + for(i=1; i<=nlstate;i++) for(j=1; j<=nlstate;j++){ - fprintf(ficreseij," %.4f", hf*eij[i][j][(int)age]); + if (j==i) eij[i][j][(int)age]= (eij[i][j][(int)age]-0.5*stepm/12./hf); + } + + fprintf(ficreseij,"%3.0f",age ); + for(i=1; i<=nlstate;i++) + for(j=1; j<=nlstate;j++){ + fprintf(ficreseij," %9.4f", hf*eij[i][j][(int)age]); } fprintf(ficreseij,"\n"); free_ma3x(p3mat,1,nlstate+ndeath,1, nlstate+ndeath, 0,nhstepm); @@ -1882,7 +1888,7 @@ fclose(ficresprob); } /******************* Printing html file ***********/ -void printinghtml(char fileres[], char title[], char datafile[], int firstpass, int lastpass, int stepm, int weightopt, char model[],int imx,int jmin, int jmax, double jmeanint,char optionfile[],char optionfilehtm[] ){ +void printinghtml(char fileres[], char title[], char datafile[], int firstpass, int lastpass, int stepm, int weightopt, char model[],int imx,int jmin, int jmax, double jmeanint,char optionfile[],char optionfilehtm[],char rfileres[] ){ int jj1, k1, i1, cpt; FILE *fichtm; /*char optionfilehtm[FILENAMELENGTH];*/ @@ -1893,7 +1899,7 @@ void printinghtml(char fileres[], char t printf("Problem with %s \n",optionfilehtm), exit(0); } - fprintf(fichtm,"