From 380564d76fa990669cc56bd7a277949ebbff2c41 Mon Sep 17 00:00:00 2001 From: "N. Brouard" Date: Wed, 13 Mar 2002 17:19:16 +0000 Subject: [PATCH] CHANGE ncov to ncovcol There was a confusion with older ncov parameter. In fact it was the number of columns, between id and date of birth, which can be used for covariates. In the program we use ncovmodel for the real number of covariates. Version 0.8 ! --- src/imach.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/imach.c b/src/imach.c index ab994a3..dd5c2e7 100644 --- a/src/imach.c +++ b/src/imach.c @@ -82,7 +82,7 @@ int cptcovn, cptcovage=0, cptcoveff=0,cptcov; 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, int imx) ij=1; for (i=1; i<=10; i++) { - if((Ndum[i]!=0) && (i<=ncov)){ + if((Ndum[i]!=0) && (i<=ncovcol)){ Tvaraff[ij]=i; ij++; } @@ -1903,7 +1903,7 @@ void printinghtml(char fileres[], char title[], char datafile[], int firstpass, printf("Problem with %s \n",optionfilehtm), exit(0); } - fprintf(fichtm,"