From: Agnès Lièvre <agnes.lievre@education.gouv.fr>
Date: Wed, 11 Dec 2002 16:58:19 +0000 (+0000)
Subject: Correction of bug related to the covariates
X-Git-Tag: imach-099s7~650
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=b9a8d58c7953acd92fdc3f667ae624ba06e4b7bb;p=.git

Correction of bug related to the covariates
---

diff --git a/src/imach.c b/src/imach.c
index 46cceb8..75d59e8 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1131,7 +1131,7 @@ void mlikeli(FILE *ficres,double p[], int npar, int ncovmodel, int nlstate, doub
   powell(p,xi,npar,ftol,&iter,&fret,func);
 
    printf("\n#Number of iterations = %d, -2 Log likelihood = %.12f\n",iter,func(p));
-  fprintf(ficlog,"#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));
+  fprintf(ficlog,"\n#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));
   fprintf(ficres,"#Number of iterations = %d, -2 Log likelihood = %.12f \n",iter,func(p));
 
 }
@@ -4010,7 +4010,7 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf<br>\n
   free_imatrix(mw,1,lastpass-firstpass+1,1,imx);   
   free_ivector(num,1,n);
   free_vector(agedc,1,n);
-  free_matrix(covar,0,NCOVMAX,1,n);
+  /*free_matrix(covar,0,NCOVMAX,1,n);*/
   /*free_matrix(covar,1,NCOVMAX,1,n);*/
   fclose(ficparo);
   fclose(ficres);
@@ -4293,7 +4293,8 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf<br>\n
   free_matrix(oldms, 1,nlstate+ndeath,1,nlstate+ndeath);
   free_matrix(newms, 1,nlstate+ndeath,1,nlstate+ndeath);
   free_matrix(savms, 1,nlstate+ndeath,1,nlstate+ndeath);
- 
+  
+  free_matrix(covar,0,NCOVMAX,1,n);
   free_matrix(matcov,1,npar,1,npar);
   free_vector(delti,1,npar);
   free_matrix(agev,1,maxwav,1,imx);