mirror of https://github.com/davisking/dlib.git
Renamed numerical integration header to dlib/numerical_integration.h. Changed relevant headers to include numerical_integration.h Fixed documentation in integrate_function_adapt_simpson_abstract.h
This commit is contained in:
parent
6ca3a9f2e9
commit
e032a77ed4
|
@ -0,0 +1,9 @@
|
|||
// Copyright (C) 2013 Steve Taylor (steve98654@gmail.com)
|
||||
// License: Boost Software License See LICENSE.txt for the full license.
|
||||
#ifndef DLIB_INTEGRATE_FUNCTION_ADAPT_SIMPSON_HEADER
|
||||
#define DLIB_INTEGRATE_FUNCTION_ADAPT_SIMPSON_HEADER
|
||||
|
||||
#include "matrix.h"
|
||||
#include "numerical_integration/integrate_function_adapt_simpson.h"
|
||||
|
||||
#endif // DLIB_INTEGRATE_FUNCTION_ADAPT_SIMPSON_HEADER
|
|
@ -3,22 +3,21 @@
|
|||
#ifndef DLIB_INTEGRATE_FUNCTION_ADAPT_SIMPSON_ABSTRACT__
|
||||
#define DLIB_INTEGRATE_FUNCTION_ADAPT_SIMPSON_ABSTRACT__
|
||||
|
||||
templte <typename T, typename funct>
|
||||
template <typename T, typename funct>
|
||||
T integrate_function_adapt_simp(const funct& f, T a, T b, T tol);
|
||||
/*!
|
||||
requires
|
||||
- b > a
|
||||
- tol > 0, tol is a tolerance parameter that typically determines
|
||||
the overall accuracy of approximated integral. We suggest
|
||||
a default value of 1e-10 for tol.
|
||||
|
||||
- tol > 0
|
||||
- f to be real valued single variable function
|
||||
|
||||
ensures
|
||||
- returns an approximation of the integral of f over the domain [a,b]
|
||||
using the adaptive Simpson method outlined in
|
||||
ander, W. and W. Gautshi, "Adaptive Quadrature -- Revisited"
|
||||
Gander, W. and W. Gautshi, "Adaptive Quadrature -- Revisited"
|
||||
BIT, Vol. 40, (2000), pp.84-101
|
||||
- tol is a tolerance parameter that typically determines
|
||||
the overall accuracy of approximated integral. We suggest
|
||||
a default value of 1e-10 for tol.
|
||||
!*/
|
||||
|
||||
#endif // DLIB_INTEGRATE_FUNCTION_ADAPT_SIMPSON__
|
||||
|
|
|
@ -10,8 +10,7 @@
|
|||
#include <math.h>
|
||||
#include <dlib/matrix.h>
|
||||
#include <dlib/numeric_constants.h>
|
||||
#include <dlib/integrate_function_adapt_simpson.h>
|
||||
|
||||
#include <dlib/numerical_integration.h>
|
||||
#include "tester.h"
|
||||
|
||||
namespace
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <stdint.h>
|
||||
#include <dlib/matrix.h>
|
||||
#include <dlib/numeric_constants.h>
|
||||
#include <dlib/integrate_function_adapt_simpson.h>
|
||||
#include <dlib/numerical_integration.h>
|
||||
|
||||
using namespace std;
|
||||
using namespace dlib;
|
||||
|
|
Loading…
Reference in New Issue