From: N. Brouard <brouard@ined.fr>
Date: Thu, 30 Apr 2015 14:45:16 +0000 (+0000)
Subject: Summary: 0.98q2
X-Git-Tag: imach-099s7~362
X-Git-Url: https://henry.ined.fr/git/?a=commitdiff_plain;h=3d425d0c8eb57cedec33cfcebf974aaa1dc00d69;p=.git

Summary: 0.98q2
---

diff --git a/src/imach.c b/src/imach.c
index 2646c25..ba83962 100644
--- a/src/imach.c
+++ b/src/imach.c
@@ -1,6 +1,9 @@
 /* $Id$
   $State$
   $Log$
+  Revision 1.188  2015/04/30 08:27:53  brouard
+  *** empty log message ***
+
   Revision 1.187  2015/04/29 09:11:15  brouard
   *** empty log message ***
 
@@ -678,7 +681,7 @@ typedef struct {
 /* $Id$ */
 /* $State$ */
 
-char version[]="Imach version 0.98q1, April 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";
+char version[]="Imach version 0.98q2, April 2015,INED-EUROREVES-Institut de longevite-Japan Society for the Promotion of Science (Grant-in-Aid for Scientific Research 25293121), Intel Software 2015";
 char fullversion[]="$Revision$ $Date$"; 
 char strstart[80];
 char optionfilext[10], optionfilefiname[FILENAMELENGTH];
@@ -1563,16 +1566,16 @@ void linmin(double p[], double xi[], int n, double *fret,double (*func)(double [
   printf("retour brent fret=%.12e xmin=%.12e\n",*fret,xmin);
   fprintf(ficlog,"retour brent fret=%.12e xmin=%.12e\n",*fret,xmin);
 #endif
-  printf("linmin end ");
+  /* printf("linmin end "); */
   for (j=1;j<=n;j++) { 
     /* printf(" before xi[%d]=%12.8f", j,xi[j]); */
     xi[j] *= xmin; /* xi rescaled by xmin: if xmin=-1.237 and xi=(1,0,...,0) xi=(-1.237,0,...,0) */
-    if(xxs <1.0)
-      printf(" after xi[%d]=%12.8f, xmin=%12.8f, ax=%12.8f, xx=%12.8f, bx=%12.8f, xxs=%12.8f", j,xi[j], xmin, ax, xx, bx,xxs );
+    /* if(xxs <1.0) */
+    /*   printf(" after xi[%d]=%12.8f, xmin=%12.8f, ax=%12.8f, xx=%12.8f, bx=%12.8f, xxs=%12.8f", j,xi[j], xmin, ax, xx, bx,xxs ); */
     p[j] += xi[j]; /* Parameters values are updated accordingly */
   } 
-  printf("\n");
-  printf("Comparing last *frec(xmin)=%12.8f from Brent and frec(0.)=%12.8f \n", (*func)(p));
+  /* printf("\n"); */
+  /* printf("Comparing last *frec(xmin)=%12.8f from Brent and frec(0.)=%12.8f \n", *fret, (*func)(p)); */
   free_vector(xicom,1,n); 
   free_vector(pcom,1,n); 
 }