Summary: 0.98r4 working

diff --git a/src/imach.c b/src/imach.c
index f52478e8e9ba06cec4fe156dbc06c1a7ea3362a3..ea1c8f5a6242bb88e67a1d48b3d52790a3719864 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.214  2015/12/16 06:57:54  brouard
+  Summary: temporary not working
+
   Revision 1.213  2015/12/11 18:22:17  brouard
   Summary: 0.98r4
 
@@ -5701,8 +5704,8 @@ void prevforecast(char fileres[], double anproj1, double mproj1, double jproj1,
     printf("Problem with forecast resultfile: %s\n", fileresf);
     fprintf(ficlog,"Problem with forecast resultfile: %s\n", fileresf);
   }
-  printf("Computing forecasting: result on file '%s' \n", fileresf);
-  fprintf(ficlog,"Computing forecasting: result on file '%s' \n", fileresf);
+  printf("Computing forecasting: result on file '%s', please wait... \n", fileresf);
+  fprintf(ficlog,"Computing forecasting: result on file '%s', please wait... \n", fileresf);
 
   if (cptcoveff==0) ncodemax[cptcoveff]=1;
 
@@ -5797,6 +5800,9 @@ void prevforecast(char fileres[], double anproj1, double mproj1, double jproj1,
   if (mobilav!=0) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
 
   fclose(ficresf);
+  printf("End of Computing forecasting \n");
+  fprintf(ficlog,"End of Computing forecasting\n");
+
 }
 
 /************** Forecasting *****not tested NB*************/
@@ -7682,8 +7688,8 @@ Please run with mle=-1 to get a correct covariance matrix.\n",optionfile,numline
   free_vector(annais,1,n);
   /* free_matrix(mint,1,maxwav,1,n);
      free_matrix(anint,1,maxwav,1,n);*/
-  free_vector(moisdc,1,n);
-  free_vector(andc,1,n);
+  /* free_vector(moisdc,1,n); */
+  /* free_vector(andc,1,n); */
   /* */
   
   wav=ivector(1,imx);
@@ -7705,6 +7711,9 @@ Please run with mle=-1 to get a correct covariance matrix.\n",optionfile,numline
   concatwav(wav, dh, bh, mw, s, agedc, agev,  firstpass, lastpass, imx, nlstate, stepm);
   /* */
  
+  free_vector(moisdc,1,n);
+  free_vector(andc,1,n);
+
   /* Routine tricode is to calculate cptcoveff (real number of unique covariates) and to associate covariable number and modality */
 
   nbcode=imatrix(0,NCOVMAX,0,NCOVMAX); 
@@ -8445,10 +8454,10 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
    /*------------ free_vector  -------------*/
    /*  chdir(path); */
  
-    free_ivector(wav,1,imx);
-    free_imatrix(dh,1,lastpass-firstpass+2,1,imx);
-    free_imatrix(bh,1,lastpass-firstpass+2,1,imx);
-    free_imatrix(mw,1,lastpass-firstpass+2,1,imx);   
+    /* free_ivector(wav,1,imx); */  /* Moved after last prevalence call */
+    /* free_imatrix(dh,1,lastpass-firstpass+2,1,imx); */
+    /* free_imatrix(bh,1,lastpass-firstpass+2,1,imx); */
+    /* free_imatrix(mw,1,lastpass-firstpass+2,1,imx);    */
     free_lvector(num,1,n);
     free_vector(agedc,1,n);
     /*free_matrix(covar,0,NCOVMAX,1,n);*/
@@ -8508,6 +8517,11 @@ Please run with mle=-1 to get a correct covariance matrix.\n",ageminpar,agemaxpa
     /*  printf("ageminpar=%f, agemax=%f, s[lastpass][imx]=%d, agev[lastpass][imx]=%f, nlstate=%d, imx=%d,  mint[lastpass][imx]=%f, anint[lastpass][imx]=%f,dateprev1=%f, dateprev2=%f, firstpass=%d, lastpass=%d\n",\
        ageminpar, agemax, s[lastpass][imx], agev[lastpass][imx], nlstate, imx, mint[lastpass][imx],anint[lastpass][imx], dateprev1, dateprev2, firstpass, lastpass);
     */
+    free_ivector(wav,1,imx);
+    free_imatrix(dh,1,lastpass-firstpass+2,1,imx);
+    free_imatrix(bh,1,lastpass-firstpass+2,1,imx);
+    free_imatrix(mw,1,lastpass-firstpass+2,1,imx);   
+
 
     if (mobilav!=0) {
       mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);