From: N. Brouard <brouard@ined.fr>
Date: Tue, 5 May 2015 08:51:13 +0000 (+0000)
Subject: Summary: Adding digits in output parameters (7 digits instead of 6)
X-Git-Tag: imach-099s7~361
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=1847b8233840ad8ce4547fa283cabf479e7fbd9a;p=.git

Summary: Adding digits in output parameters (7 digits instead of 6)

Fix 1+age+.
---

diff --git a/src/imach.c b/src/imach.c
index ba83962..4d16e5b 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.189  2015/04/30 14:45:16  brouard
+  Summary: 0.98q2
+
   Revision 1.188  2015/04/30 08:27:53  brouard
   *** empty log message ***
 
@@ -6395,7 +6398,8 @@ 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(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);
-  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 \
  '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");		\
@@ -7106,9 +7110,9 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf<br>\n",\
 	  fprintf(ficlog,"%d%d ",i,k);
 	  fprintf(ficres,"%1d%1d ",i,k);
 	  for(j=1; j <=ncovmodel; j++){
-	    printf("%lf ",p[jk]);
-	    fprintf(ficlog,"%lf ",p[jk]);
-	    fprintf(ficres,"%lf ",p[jk]);
+	    printf("%12.7f ",p[jk]);
+	    fprintf(ficlog,"%12.7f ",p[jk]);
+	    fprintf(ficres,"%12.7f ",p[jk]);
 	    jk++; 
 	  }
 	  printf("\n");