--- imach/src/imach.c 2024/06/28 08:00:31 1.362 +++ imach/src/imach.c 2024/06/28 09:31:55 1.363 @@ -1,6 +1,9 @@ -/* $Id: imach.c,v 1.362 2024/06/28 08:00:31 brouard Exp $ +/* $Id: imach.c,v 1.363 2024/06/28 09:31:55 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.363 2024/06/28 09:31:55 brouard + Summary: Adding log lines too + Revision 1.362 2024/06/28 08:00:31 brouard Summary: 0.99s6 @@ -1410,12 +1413,12 @@ double gnuplotversion=GNUPLOTVERSION; #define ODIRSEPARATOR '\\' #endif -/* $Id: imach.c,v 1.362 2024/06/28 08:00:31 brouard Exp $ */ +/* $Id: imach.c,v 1.363 2024/06/28 09:31:55 brouard Exp $ */ /* $State: Exp $ */ #include "version.h" char version[]=__IMACH_VERSION__; char copyright[]="April 2024,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015-2020, Nihon University 2021-202, INED 2000-2024"; -char fullversion[]="$Revision: 1.362 $ $Date: 2024/06/28 08:00:31 $"; +char fullversion[]="$Revision: 1.363 $ $Date: 2024/06/28 09:31:55 $"; char strstart[80]; char optionfilext[10], optionfilefiname[FILENAMELENGTH]; int erreur=0, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ @@ -3018,24 +3021,30 @@ static void print2() /* print a line of /* printf("... after %u function calls ...\n", nf); */ /* printf("... including %u linear searches ...\n", nl); */ /* printf("%10d %10d%14.7g",nl, nf, fx); */ - printf ( "\n" ); + /* printf ( "\n" ); */ printf ( " Linear searches %d", nl ); /* printf ( " Linear searches %d\n", nl ); */ /* printf ( " Function evaluations %d\n", nf ); */ /* printf ( " Function value FX = %g\n", fx ); */ printf ( " Function evaluations %d", nf ); printf ( " Function value FX = %.12lf\n", fx ); + fprintf (ficlog, " Function evaluations %d", nf ); + fprintf (ficlog, " Function value FX = %.12lf\n", fx ); #ifdef DEBUGPRAX printf("n=%d prin=%d\n",n,prin); #endif - if(fx <= fmin) printf(" UNDEFINED "); else printf("%14.7g",log(fx-fmin)); + /* if(fx <= fmin) printf(" UNDEFINED "); else printf("%14.7g",log(fx-fmin)); */ if ( n <= 4 || 2 < prin ) { /* for(i=1;i<=n;i++)printf("%14.7g",x[i-1]); */ - for(i=1;i<=n;i++)printf("%14.7g",x[i]); + for(i=1;i<=n;i++){ + printf("%14.7g",x[i]); + fprintf(ficlog,"%14.7g",x[i]); + } /* r8vec_print ( n, x, " X:" ); */ } printf("\n"); + fprintf(ficlog,"\n"); }