diff options
Diffstat (limited to 'vquad/core.py')
| -rw-r--r-- | vquad/core.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/vquad/core.py b/vquad/core.py index 23f1c24..7435334 100644 --- a/vquad/core.py +++ b/vquad/core.py @@ -61,10 +61,9 @@ def _calc_coeffs(vals, level): class DivergentIntegralError(ValueError): - def __init__(self, msg, igral, err, nr_points): + def __init__(self, msg, igral, err): self.igral = igral self.err = err - self.nr_points = nr_points super().__init__(msg) @@ -131,7 +130,6 @@ class Vquad: self.ivals = [ival] # Active intervals self.attic = [] # Inactive intervals self.f = f - self.nr_points = len(vals) self.igral_excess = 0 self.err_excess = 0 @@ -143,7 +141,6 @@ class Vquad: children = [_Interval(ival.a, m, min_level, depth), _Interval(m, ival.b, min_level, depth)] points = np.concatenate([child.points()[1:-1] for child in children]) - self.nr_points += len(points) valss = np.empty((2, tbls.sizes[min_level])) valss[:, 0] = ival.vals[0], f_center valss[:, -1] = f_center, ival.vals[-1] @@ -158,7 +155,7 @@ class Vquad: '[{}, {}]! (h={})') raise DivergentIntegralError( msg.format(child.a, child.b, child.b - child.a), - child.igral * np.inf, None, self.nr_points) + child.igral * np.inf, None) return children def refine(self, ival): @@ -168,7 +165,6 @@ class Vquad: vals = np.empty(points.shape) vals[0::2] = ival.vals vals[1::2] = self.f(points[1::2]) - self.nr_points += (len(vals) - 1) // 2 ival.interpolate(vals, ival.coeffs) return points @@ -219,7 +215,7 @@ class Vquad: or err < abs(igral) * tol or err - self.err_excess < abs(igral) * tol < self.err_excess or not self.ivals): - return igral, err, self.nr_points + return igral, err def vquad(f, a, b, tol): |