--- imach/src/imach.c 2002/03/11 14:17:15 1.32 +++ imach/src/imach.c 2002/03/13 17:19:16 1.34 @@ -1,4 +1,4 @@ -/* $Id: imach.c,v 1.32 2002/03/11 14:17:15 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++; } @@ -1559,7 +1559,7 @@ 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 @@ -1903,7 +1903,7 @@ void printinghtml(char fileres[], char t printf("Problem with %s \n",optionfilehtm), exit(0); } - fprintf(fichtm,"