Changeset 393

Timestamp:

05/13/09 14:46:33 (16 years ago)

Author:

Mathieu Morlighem

Message:

minor (choose always the best value)

File:

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

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

@@ -29 +29 @@
 
         /*function values: */
-        double fxmax,fxmin,fxbest,fval;
+        double fxmax,fxmin,fxbest;
         double fx,fx1,fx2;
 
         /*x : */
         double xmax,xmin,xbest;
-        double x,x1,x2,xm,xval;
+        double x,x1,x2,xm;
 
         /*tolerances: */
@@ -233 +233 @@
         //Now, check that the value on the boundaries are not better than current fxbest
         if (fxbest>fxmin){
-                xval=xmin;
-                fval=fxmin;
+                xbest=xmin;
+                fxbest=fxmin;
         }
-        else if (fxbest>fxmax){
-                xval=xmax;
-                fval=fxmax;
+        if (fxbest>fxmax){
+                xbest=xmax;
+                fxbest=fxmax;
         }
-        else{
-                xval=xbest;
-                fval=fxbest;
-        }
 
         /*Assign output pointers: */
-        *psearch_scalar=xval;
-        *pJ=fval;
-        
+        *psearch_scalar=xbest;
+        *pJ=fxbest;
 }