Changeset 6323 for issm/trunk/src/c/shared/Numerics/OptimalSearch.cpp

Timestamp:

10/15/10 16:13:34 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added some verbosity levels and generalized

File:

• issm/trunk/src/c/shared/Numerics/OptimalSearch.cpp (modified) (2 diffs)

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

@@ -41 +41 @@
         fx1= (*f)(x1,optargs);
         if isnan(fx1) ISSMERROR("Function evaluation returned NaN");
-        _printf_("\n        Iteration         x           f(x)       Tolerance\n\n");
-        _printf_("        %s    %12.6g  %12.6g  %s","   N/A",x1,fx1,"         N/A\n");
+        ISSMPRINTF(VerboseControl(),"\n        Iteration         x           f(x)       Tolerance\n\n");
+        ISSMPRINTF(VerboseControl(),"        %s    %12.6g  %12.6g  %s","   N/A",x1,fx1,"         N/A\n");
 
         //update tolerances
@@ -54 +54 @@
                 fx2 = (*f)(x2,optargs);
                 if isnan(fx2) ISSMERROR("Function evaluation returned NaN");
-                _printf_("         %5i    %12.6g  %12.6g  %12.6g\n",iter,x2,fx2,fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1));
+                ISSMPRINTF(VerboseControl(),"         %5i    %12.6g  %12.6g  %12.6g\n",iter,x2,fx2,fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1));
 
                 //Stop the optimization?
                 if ((fabs(x2-x1)+seps)<tolerance || (fabs(fx2-fx1)+seps)<tolerance){
-                        _printf_("      %s%g\n","optimization terminated: the current x satisfies the termination criteria using 'tolx' of " ,tolerance);
+                        ISSMPRINTF(VerboseControl(),"      %s%g\n","optimization terminated: the current x satisfies the termination criteria using 'tolx' of " ,tolerance);
                         loop=false;
                 }
                 else if (iter>=maxiter){
-                        _printf_("      %s\n","exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'\n");
+                        ISSMPRINTF(VerboseControl(),"      %s\n","exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'\n");
                         loop=false;
                 }