Changeset d60d28c in tol

Timestamp:

May 22, 2013, 7:59:35 AM (13 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

c52d330

Parents:

f18e2c2

Message:

Allowing fixed values and avoiding some numerical problems in BRnRFunction::AutoScale

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5835 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bmath/bfunct/nrealfun.cpp (modified) (2 diffs)

tol/bmath/bfunct/nrealfun.cpp

@@ -196 +196 @@
   for(k=0; k<n_; k++)
   {
+    if(xMin[k].IsFinite() && xMin[k]==xMax[k]) { continue; }
     if(verbose)
     {
@@ -212 +213 @@
     {
       S[k] = Abs(Fk.NewtonSolve(x[k], 0));
-    }
-  }
+      if(!(S[k].IsFinite()))
+      {
+        BPartialFunction fk(*this, x, k);
+        BDat x0 = x[k];
+        BDat f0 = fk[x0];
+        BDat ha = tolerance;
+        BDat hb = tolerance;
+        BDat a,b,fa,fb,adf=0;
+        int iter = 0;
+        do
+        {
+          iter++;
+          a = x0-ha; 
+          b = x0+hb; 
+          fa = fk[a];
+          fb = fk[b];
+          if(!(fa.IsFinite())) { a = x0; fa=f0; ha=0; }
+          if(!(fb.IsFinite())) { b = x0; fb=f0; hb=0; }
+          adf = Abs(fb-fa);
+          if(adf<fDist)
+          {
+            ha *= 2.0;
+            hb *= 2.0;
+          }
+          else
+          {
+            ha *= 0.75;
+            hb *= 0.75;
+          }
+        }
+        while((Abs(adf-fDist)>tolerance) && (ha>0 || hb>0) && (iter<=100));
+        if(iter<=100) { S[k] = ha+hb; }
+        else { S[k] = 1; }
+      }
+    }
+  }
+  if(!(S[k].IsFinite())) { S[k]=1; }
   return(true);
 /*