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

Diff for /imach/src/imach.c between versions 1.189 and 1.190

version 1.189, 2015/04/30 14:45:16 version 1.190, 2015/05/05 08:51:13
Line 1 Line 1
 /* $Id$  /* $Id$
   $State$    $State$
   $Log$    $Log$
     Revision 1.190  2015/05/05 08:51:13  brouard
     Summary: Adding digits in output parameters (7 digits instead of 6)
   
     Fix 1+age+.
   
   Revision 1.189  2015/04/30 14:45:16  brouard    Revision 1.189  2015/04/30 14:45:16  brouard
   Summary: 0.98q2    Summary: 0.98q2
   
Line 6398  int main(int argc, char *argv[]) Line 6403  int main(int argc, char *argv[])
   fprintf(ficparo,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model);    fprintf(ficparo,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model);
   fprintf(ficlog,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model);    fprintf(ficlog,"title=%s datafile=%s lastobs=%d firstpass=%d lastpass=%d\nftol=%e stepm=%d ncovcol=%d nlstate=%d ndeath=%d maxwav=%d mle=%d weight=%d\nmodel=1+age+%s.\n", title, datafile, lastobs, firstpass,lastpass,ftol,stepm,ncovcol,nlstate,ndeath,maxwav, mle, weightopt,model);
   fflush(ficlog);    fflush(ficlog);
   if(model[0]=='#'|| model[0]== '\0'){    /* if(model[0]=='#'|| model[0]== '\0'){ */
     if(model[0]=='#'){
     printf("Error in 'model' line: model should start with 'model=1+age+' and end with '.' \n \      printf("Error in 'model' line: model should start with 'model=1+age+' and end with '.' \n \
  'model=1+age+.' or 'model=1+age+V1.' or 'model=1+age+age*age+V1+V1*age.' or \n \   'model=1+age+.' or 'model=1+age+V1.' or 'model=1+age+age*age+V1+V1*age.' or \n \
  'model=1+age+V1+V2.' or 'model=1+age+V1+V2+V1*V2.' etc. \n");          \   'model=1+age+V1+V2.' or 'model=1+age+V1+V2+V1*V2.' etc. \n");          \
Line 7109  Interval (in months) between two waves: Line 7115  Interval (in months) between two waves:
           fprintf(ficlog,"%d%d ",i,k);            fprintf(ficlog,"%d%d ",i,k);
           fprintf(ficres,"%1d%1d ",i,k);            fprintf(ficres,"%1d%1d ",i,k);
           for(j=1; j <=ncovmodel; j++){            for(j=1; j <=ncovmodel; j++){
             printf("%lf ",p[jk]);              printf("%12.7f ",p[jk]);
             fprintf(ficlog,"%lf ",p[jk]);              fprintf(ficlog,"%12.7f ",p[jk]);
             fprintf(ficres,"%lf ",p[jk]);              fprintf(ficres,"%12.7f ",p[jk]);
             jk++;               jk++; 
           }            }
           printf("\n");            printf("\n");
Removed from v.1.189  
changed lines
  Added in v.1.190

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