From: Agnès Lièvre Date: Fri, 20 Feb 2004 13:25:42 +0000 (+0000) Subject: Version 0.96d. Population forecasting command line is (temporarily) X-Git-Tag: imach-099s7~604 X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=926612aa65ec240850e5765d283708d03cd0ebd0;p=.git Version 0.96d. Population forecasting command line is (temporarily) suppressed. --- diff --git a/src/imach.c b/src/imach.c index 5b07b3c..5f33f63 100644 --- a/src/imach.c +++ b/src/imach.c @@ -1,6 +1,10 @@ /* $Id$ $State$ $Log$ + Revision 1.96 2003/07/15 15:38:55 brouard + * imach.c (Repository): Errors in subdirf, 2, 3 while printing tmpout is + rewritten within the same printf. Workaround: many printfs. + Revision 1.95 2003/07/08 07:54:34 brouard * imach.c (Repository): (Repository): Using imachwizard code to output a more meaningful covariance @@ -204,7 +208,7 @@ /* $Id$ */ /* $State$ */ -char version[]="Imach version 0.96c, July 2003, INED-EUROREVES "; +char version[]="Imach version 0.96d, February 2004, INED-EUROREVES "; char fullversion[]="$Revision$ $Date$"; int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ int nvar; @@ -4480,6 +4484,7 @@ int main(int argc, char *argv[]) }*/ + printf("Total number of individuals= %d, Agemin = %.2f, Agemax= %.2f\n\n", imx, agemin, agemax); fprintf(ficlog,"Total number of individuals= %d, Agemin = %.2f, Agemax= %.2f\n\n", imx, agemin, agemax); @@ -4832,9 +4837,9 @@ Interval (in months) between two waves: Min=%d Max=%d Mean=%.2lf
\n",\ } ungetc(c,ficpar); - fscanf(ficpar,"popforecast=%d popfile=%s popfiledate=%lf/%lf/%lf last-popfiledate=%lf/%lf/%lf\n",&popforecast,popfile,&jpyram,&mpyram,&anpyram,&jpyram1,&mpyram1,&anpyram1); + /* fscanf(ficpar,"popforecast=%d popfile=%s popfiledate=%lf/%lf/%lf last-popfiledate=%lf/%lf/%lf\n",&popforecast,popfile,&jpyram,&mpyram,&anpyram,&jpyram1,&mpyram1,&anpyram1); fprintf(ficparo,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1); - fprintf(ficres,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1); + fprintf(ficres,"popforecast=%d popfile=%s popfiledate=%.lf/%.lf/%.lf last-popfiledate=%.lf/%.lf/%.lf\n",popforecast,popfile,jpyram,mpyram,anpyram,jpyram1,mpyram1,anpyram1);*/ /* freqsummary(fileres, agemin, agemax, s, agev, nlstate, imx,Tvaraff,nbcode, ncodemax,mint,anint);*/ /*,dateprev1,dateprev2,jprev1, mprev1,anprev1,jprev2, mprev2,anprev2);*/