Commit 7c4d0b0b authored by Joseph Weston's avatar Joseph Weston
Browse files

Merge branch 'add_cwg'

add Cristoph Groth as 'adaptive' author.

See merge request !53
parents 257a4367 197bf5be
Pipeline #8138 failed with stage
in 1 minute and 40 seconds
# Adaptive Authors
Below is a list of the main contributors to Adaptive:
Below is a list of the contributors to Adaptive:
+ [Anton Akhmerov](<https://antonakhmerov.org>)
+ [Christoph Groth](<http://inac.cea.fr/Pisp/christoph.groth/>)
+ [Bas Nijholt](<http://nijho.lt>)
+ [Joseph Weston](<https://joseph.weston.cloud>)
......
......@@ -92,7 +92,6 @@ in the repository.
## Credits
We would like to give credits to the following people:
- Pedro Gonnet for his implementation of [`CQUAD`](https://www.gnu.org/software/gsl/manual/html_node/CQUAD-doubly_002dadaptive-integration.html), "Algorithm 4" as described in "Increasing the Reliability of Adaptive Quadrature Using Explicit Interpolants", P. Gonnet, ACM Transactions on Mathematical Software, 37 (3), art. no. 26, 2010.
- Christoph Groth for his Python implementation of [`CQUAD`](https://gitlab.kwant-project.org/cwg/python-cquad) which served as basis for the [`IntegratorLearner`](adaptive/learner/integrator_learner.py).
- Pauli Virtanen for his `AdaptiveTriSampling` script (no longer available online since SciPy Central went down) which served as inspiration for the [`Learner2D`](adaptive/learner/learner2D.py).
For general discussion, we have a [Gitter chat channel](https://gitter.im/python-adaptive/adaptive). If you find any bugs or have any feature suggestions please file a GitLab [issue](https://gitlab.kwant-project.org/qt/adaptive/issues/new?issue) or submit a [merge request](https://gitlab.kwant-project.org/qt/adaptive/merge_requests).
......
# -*- coding: utf-8 -*-
# Copyright 2017 Christoph Groth
# Copyright 2017 `adaptive` authors
# Based on an adaptive quadrature algorithm by Pedro Gonnet
from fractions import Fraction
from collections import defaultdict
......
# -*- coding: utf-8 -*-
# Copyright 2010 Pedro Gonnet
# Copyright 2017 Christoph Groth
# Copyright 2017 `adaptive` authors
# Based on an adaptive quadrature algorithm by Pedro Gonnet
from collections import defaultdict
from math import sqrt
......
Supports Markdown
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