From: N. Brouard <brouard@ined.fr>
Date: Fri, 28 Jun 2024 09:31:55 +0000 (+0000)
Subject: Summary: Adding log lines too
X-Git-Tag: imach-099s7~18
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=c3375b545c0ae530570305b4a43485fb478cb9c9;p=.git

Summary: Adding log lines too
---

diff --git a/src/imach.c b/src/imach.c
index 7c335d9..da3ba35 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,11 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.362  2024/06/28 08:00:31  brouard
+  Summary: 0.99s6
+
+  * imach.c (Module): s6 errors with age*age (harmless).
+
   Revision 1.361  2024/05/12 20:29:32  brouard
   Summary: Version 0.99s5
 
@@ -3013,24 +3018,30 @@ static void print2() /* print a line of traces */
    /* 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");
  }