Changeset 477

Timestamp:

05/18/09 15:14:17 (15 years ago)

Author:

Mathieu Morlighem

Message:

took care of some specific cases

File:

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

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

@@ -64 +64 @@
 
         //initialize the other variables
-        seps=sqrt(DBL_EPSILON); //precision of a double
+        seps=sqrt(DBL_EPSILON);    //precision of a double
         distance=0.0;              //new_x=old_x + distance
         gold=0.5*(3.0-sqrt(5.0));  //gold = 1 - golden ratio
@@ -115 +115 @@
                         intervalgold=distance;
 
-                        // Is the parabola acceptable
+                        // Is the parabola acceptable (we use seps here because in some configuration parab_num==parab_den*(xmax-xbest)
+                        // and the result is not repeatable anymore
                         if (( sqrt(pow(parab_num,2)) < sqrt(pow(0.5*parab_den*oldintervalgold,2))) &&
-                                                (parab_num>parab_den*(xmin-xbest)) &&
-                                                (parab_num<parab_den*(xmax-xbest))){
+                                                (parab_num>parab_den*(xmin-xbest)+seps) && 
+                                                (parab_num<parab_den*(xmax-xbest)-seps)){
 
                                 // Yes, parabolic interpolation step