Changeset 6616

Timestamp:

11/18/10 08:36:27 (14 years ago)

Author:

Mathieu Morlighem

Message:

minor: better termination flags

File:

• issm/trunk/src/c/shared/Numerics/BrentSearch.cpp (modified) (1 diff)

issm/trunk/src/c/shared/Numerics/BrentSearch.cpp

@@ -179 +179 @@
                 /*Stop the optimization?*/
                 if (sqrt(pow(xbest-xm,2)) < (tol2-0.5*(xmax-xmin))){
-                        _printf_(VerboseControl(),"      %s%g\n","optimization terminated: the current x satisfies the termination criteria using 'tolx' of" ,tolerance);
+                        _printf_(VerboseControl(),"      optimization terminated: current x satisfies criteria 'tolx'=%g\n",tolerance);
                         loop=false;
                 }
                 else if (iter>=maxiter){
-                        _printf_(VerboseControl(),"      %s\n","exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'\n");
+                        _printf_(VerboseControl(),"      exiting: Maximum number of iterations has been exceeded  ('maxiter'=%i)\n",maxiter);
                         loop=false;
                 }
                 else if (!isnan(cm_jump) && (xmin==0) && ((fxbest/fxmin)<cm_jump)){
-                        _printf_(VerboseControl(),"      %s%g\n","optimization terminated: the current x satisfies the termination criteria using 'cm_jump' of" ,cm_jump);
+                        _printf_(VerboseControl(),"      optimization terminated: current x satisfies criteria 'cm_jump'=%g\n",cm_jump);
                         loop=false;
                 }