Skip to content

GitLab

Commit be5c480b authored by Steve Taylor's avatar Steve Taylor
Browse files

Made changes to the tolerance stopping criteria in impl_adapt_simp_stop.

parent e032a77e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlib/numerical_integration/integrate_function_adapt_simpson.h
View file @ be5c480b
...@@ -18,7 +18,7 @@ T impl_adapt_simp_stop(const funct& f, T a, T b, T fa, T fm, T fb, T is, int cnt ...@@ -18,7 +18,7 @@ T impl_adapt_simp_stop(const funct& f, T a, T b, T fa, T fm, T fb, T is, int cnt
i1 = (16.0*i2 - i1)/15.0; i1 = (16.0*i2 - i1)/15.0;
T Q = 0; T Q = 0;
if((std::abs(i1-i2) <= std::numeric_limits<double>::epsilon()) || (m <= a) || (b <= m)) if((std::abs(i1-i2) <= std::abs(is)) || (m <= a) || (b <= m))
{ {
Q = i1; Q = i1;
} }
...@@ -36,7 +36,7 @@ T impl_adapt_simp_stop(const funct& f, T a, T b, T fa, T fm, T fb, T is, int cnt ...@@ -36,7 +36,7 @@ T impl_adapt_simp_stop(const funct& f, T a, T b, T fa, T fm, T fb, T is, int cnt
} }
template <typename T, typename funct> template <typename T, typename funct>
T integrate_function_adapt_simp(const funct& f, T a, T b, T tol = 1e-10) T integrate_function_adapt_simp(const funct& f, T a, T b, T tol)
{ {
T eps = std::numeric_limits<double>::epsilon(); T eps = std::numeric_limits<double>::epsilon();
...@@ -58,7 +58,7 @@ T integrate_function_adapt_simp(const funct& f, T a, T b, T tol = 1e-10) ...@@ -58,7 +58,7 @@ T integrate_function_adapt_simp(const funct& f, T a, T b, T tol = 1e-10)
is = b-a; is = b-a;
} }
is = is*tol/eps; is = is*tol;
int cnt = 0; int cnt = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment