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

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/shared/Numerics/OptimalSearch.cpp (modified) (3 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -9 +9 @@
 #endif
 
-#include "./numerics.h"
-#include "../../classes/objects/objects.h"
-#include "../../io/io.h"
-#include "../../include/include.h"
-#include "../../shared/shared.h"
 #include <float.h>
+
+#include "../Exceptions/exceptions.h"
+#include "../io/io.h"
+#include "../MemOps/MemOps.h"
+#include "./Verbosity.h"
+#include "./OptPars.h"
+#include "./OptArgs.h"
+#include "./types.h"
+#include "./isnan.h"
 
 void OptimalSearch(IssmDouble* psearch_scalar,IssmDouble* pJ,OptPars* optpars,IssmDouble (*f)(IssmDouble,OptArgs*), OptArgs* optargs){
@@ -43 +47 @@
         if (xIsNan<IssmDouble>(fx1)) _error_("Function evaluation returned NaN");
         cout<<setprecision(5);
-        if(VerboseControl()) _pprintLine_("");
-        if(VerboseControl()) _pprintLine_("       Iteration         x           f(x)       Tolerance");
-        if(VerboseControl()) _pprintLine_("");
-        if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<x1<<"  "<<setw(12)<<fx1<<"           N/A");
+        if(VerboseControl()) _printf0_("\n");
+        if(VerboseControl()) _printf0_("       Iteration         x           f(x)       Tolerance\n");
+        if(VerboseControl()) _printf0_("\n");
+        if(VerboseControl()) _printf0_("           N/A    "<<setw(12)<<x1<<"  "<<setw(12)<<fx1<<"           N/A\n");
 
         //update tolerances
@@ -59 +63 @@
                 if (xIsNan<IssmDouble>(fx2)) _error_("Function evaluation returned NaN");
                 if(VerboseControl())
-                 _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)));
+                 _printf0_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)) << "\n");
 
                 //Stop the optimization?
                 if ((fabs(x2-x1)+seps)<tolerance || (fabs(fx2-fx1)+seps)<tolerance){
-                        if(VerboseControl()) _pprintLine_("      " << "optimization terminated: the current x satisfies the termination criteria using 'tolx' of "  << tolerance);
+                        if(VerboseControl()) _printf0_("      " << "optimization terminated: the current x satisfies the termination criteria using 'tolx' of "  << tolerance << "\n");
                         loop=false;
                 }
                 else if (iter>=maxiter){
-                        if(VerboseControl()) _pprintLine_("      " << "exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'");
+                        if(VerboseControl()) _printf0_("      " << "exiting: Maximum number of iterations has been exceeded  - increase 'maxiter'\n");
                         loop=false;
                 }

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache