[BACK]Return to imach.c CVS log [TXT] [DIR] Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.214 and 1.215

version 1.214, 2015/12/16 06:57:54 version 1.215, 2015/12/16 08:52:24
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.215  2015/12/16 08:52:24  brouard
     Summary: 0.98r4 working
   
   Revision 1.214  2015/12/16 06:57:54  brouard    Revision 1.214  2015/12/16 06:57:54  brouard
   Summary: temporary not working    Summary: temporary not working
   
Line 5704  void prevforecast(char fileres[], double Line 5707  void prevforecast(char fileres[], double
     printf("Problem with forecast resultfile: %s\n", fileresf);      printf("Problem with forecast resultfile: %s\n", fileresf);
     fprintf(ficlog,"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);    printf("Computing forecasting: result on file '%s', please wait... \n", fileresf);
   fprintf(ficlog,"Computing forecasting: result on file '%s' \n", fileresf);    fprintf(ficlog,"Computing forecasting: result on file '%s', please wait... \n", fileresf);
   
   if (cptcoveff==0) ncodemax[cptcoveff]=1;    if (cptcoveff==0) ncodemax[cptcoveff]=1;
   
Line 5800  void prevforecast(char fileres[], double Line 5803  void prevforecast(char fileres[], double
   if (mobilav!=0) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);    if (mobilav!=0) free_ma3x(mobaverage,1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
   
   fclose(ficresf);    fclose(ficresf);
     printf("End of Computing forecasting \n");
     fprintf(ficlog,"End of Computing forecasting\n");
   
 }  }
   
 /************** Forecasting *****not tested NB*************/  /************** Forecasting *****not tested NB*************/
Line 7685  Please run with mle=-1 to get a correct Line 7691  Please run with mle=-1 to get a correct
   free_vector(annais,1,n);    free_vector(annais,1,n);
   /* free_matrix(mint,1,maxwav,1,n);    /* free_matrix(mint,1,maxwav,1,n);
      free_matrix(anint,1,maxwav,1,n);*/       free_matrix(anint,1,maxwav,1,n);*/
   free_vector(moisdc,1,n);    /* free_vector(moisdc,1,n); */
   free_vector(andc,1,n);    /* free_vector(andc,1,n); */
   /* */    /* */
       
   wav=ivector(1,imx);    wav=ivector(1,imx);
Line 7708  Please run with mle=-1 to get a correct Line 7714  Please run with mle=-1 to get a correct
   concatwav(wav, dh, bh, mw, s, agedc, agev,  firstpass, lastpass, imx, nlstate, stepm);    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 */    /* Routine tricode is to calculate cptcoveff (real number of unique covariates) and to associate covariable number and modality */
   
   nbcode=imatrix(0,NCOVMAX,0,NCOVMAX);     nbcode=imatrix(0,NCOVMAX,0,NCOVMAX); 
Line 8448  Please run with mle=-1 to get a correct Line 8457  Please run with mle=-1 to get a correct
    /*------------ free_vector  -------------*/     /*------------ free_vector  -------------*/
    /*  chdir(path); */     /*  chdir(path); */
     
     free_ivector(wav,1,imx);      /* free_ivector(wav,1,imx); */  /* Moved after last prevalence call */
     free_imatrix(dh,1,lastpass-firstpass+2,1,imx);      /* free_imatrix(dh,1,lastpass-firstpass+2,1,imx); */
     free_imatrix(bh,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_imatrix(mw,1,lastpass-firstpass+2,1,imx);    */
     free_lvector(num,1,n);      free_lvector(num,1,n);
     free_vector(agedc,1,n);      free_vector(agedc,1,n);
     /*free_matrix(covar,0,NCOVMAX,1,n);*/      /*free_matrix(covar,0,NCOVMAX,1,n);*/
Line 8511  Please run with mle=-1 to get a correct Line 8520  Please run with mle=-1 to get a correct
     /*  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",\      /*  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);          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) {      if (mobilav!=0) {
       mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);        mobaverage= ma3x(1, AGESUP,1,NCOVMAX, 1,NCOVMAX);
Removed from v.1.214  
changed lines
  Added in v.1.215

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>