Changeset 9305

Timestamp:

08/11/11 16:42:35 (14 years ago)

Author:

Eric.Larour

Message:

isnan issue

Location:

issm/trunk/src/c/shared/Numerics

Files:

• BrentSearch.cpp (modified) (1 diff)
• OptimalSearch.cpp (modified) (2 diffs)

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

@@ -42 +42 @@
         iter=0;
         fxmin = (*f)(xmin,optargs);
-        if isnan(fxmin) _error_("Function evaluation returned NaN");
+        if (isnan(fxmin)) _error_("Function evaluation returned NaN");
         _printf_(VerboseControl(),"\n        Iteration         x           f(x)       Tolerance         Procedure\n\n");
         _printf_(VerboseControl(),"        %s    %12.6g  %12.6g  %s","   N/A",xmin,fxmin,"         N/A         boundary\n");
         fxmax = (*f)(xmax,optargs);
-        if isnan(fxmax) _error_("Function evaluation returned NaN");
+        if (isnan(fxmax)) _error_("Function evaluation returned NaN");
         _printf_(VerboseControl(),"        %s    %12.6g  %12.6g  %s","   N/A",xmax,fxmax,"         N/A         boundary\n");
 

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

@@ -40 +40 @@
         //get the value of the function at the first boundary
         fx1= (*f)(x1,optargs);
-        if isnan(fx1) _error_("Function evaluation returned NaN");
+        if (isnan(fx1)) _error_("Function evaluation returned NaN");
         _printf_(VerboseControl(),"\n        Iteration         x           f(x)       Tolerance\n\n");
         _printf_(VerboseControl(),"        %s    %12.6g  %12.6g  %s","   N/A",x1,fx1,"         N/A\n");
@@ -53 +53 @@
                 iter++;
                 fx2 = (*f)(x2,optargs);
-                if isnan(fx2) _error_("Function evaluation returned NaN");
+                if (isnan(fx2)) _error_("Function evaluation returned NaN");
                 _printf_(VerboseControl(),"         %5i    %12.6g  %12.6g  %12.6g\n",iter,x2,fx2,fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1));