From 1528ee89ddc12daea80f085d6599b0e9a17c8b9a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 4 Mar 2003 02:35:30 +0000
Subject: [PATCH] Changed the tolerance so that t7.geo works on my machine. But
this is tricky and ugly, and should be investigated (I added a comment).
Not that important, since it only affects the anisotropic algo, but
still.
---
Geo/CAD.cpp | 5 +++--
Numeric/gsl_brent.cpp | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index 57963b60f6..22e2defdf3 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.59 2003-03-01 22:36:38 geuzaine Exp $
+// $Id: CAD.cpp,v 1.60 2003-03-04 02:35:30 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -1815,7 +1815,8 @@ static Vertex *VERTEX;
double min1d(double (*funct) (double), double *xmin)
{
- double ax = 1.e-15, bx = 1.e-12, cx = 1.e-11, fa, fb, fx, tol = 1.e-3;
+ // we should think about the tolerance more carefully...
+ double ax = 1.e-15, bx = 1.e-12, cx = 1.e-11, fa, fb, fx, tol = 1.e-4;
mnbrak(&ax, &bx, &cx, &fa, &fx, &fb, funct);
//Msg(INFO, "--MIN1D : ax %12.5E bx %12.5E cx %12.5E",ax,bx,cx);
return (brent(ax, bx, cx, funct, tol, xmin));
diff --git a/Numeric/gsl_brent.cpp b/Numeric/gsl_brent.cpp
index 127f1d4e7d..2669304d28 100644
--- a/Numeric/gsl_brent.cpp
+++ b/Numeric/gsl_brent.cpp
@@ -1,4 +1,4 @@
-// $Id: gsl_brent.cpp,v 1.7 2003-03-03 23:47:32 geuzaine Exp $
+// $Id: gsl_brent.cpp,v 1.8 2003-03-04 02:35:30 geuzaine Exp $
//
// Copyright (C) 1997 - 2003 C. Geuzaine, J.-F. Remacle
//
@@ -86,7 +86,8 @@ double brent(double ax, double bx, double cx,
// this is deprecated: we should use gsl_min_fminimizer_x_minimum(s) instead
a = gsl_min_fminimizer_x_lower(s);
c = gsl_min_fminimizer_x_upper(s);
- status = gsl_min_test_interval(a, c, tol, 0.0);
+ // we should think about the tolerance more carefully...
+ status = gsl_min_test_interval(a, c, tol, tol);
}
while(status == GSL_CONTINUE && iter < MAXITER);
--
GitLab