Changeset 7090

Timestamp:

01/14/11 08:23:05 (14 years ago)

Author:

Mathieu Morlighem

Message:

added check after initial value

File:

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

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

@@ -30 +30 @@
         double tol1,tol2,seps,tolerance;
         int    maxiter,iter;
-        bool   loop,goldenflag;
+        bool   loop=true,goldenflag;
 
         /*Recover parameters:*/
@@ -84 +84 @@
         /*4: print result*/
         _printf_(VerboseControl(),"         %5i    %12.6g  %12.6g  %12.6g  %s\n",iter,xbest,fxbest,pow(pow(xbest-xm,2),0.5),"       initial");
-
-        loop=true;
+        if (!isnan(cm_jump) && (xmin==0) && ((fxbest/fxmin)<cm_jump)){
+                _printf_(VerboseControl(),"      optimization terminated: current x satisfies criteria 'cm_jump'=%g\n",cm_jump);
+                _printf_(true,"alpha = %g\n",xbest);
+                loop=false;
+        }
+
         while(loop){