@@ -256,25 +256,6 @@ class Interval:

         ]

         return ' '.join(lst)

-    def equal(self, other, *, verbose=False):

-        """Note: Implementing __eq__ breaks SortedContainers in some way."""

-        if not self.complete:

-            if verbose:

-                print('Interval {} is not complete.'.format(self))

-            return False

-

-        slots = set(self.__slots__).intersection(other.__slots__)

-        same_slots = []

-        for s in slots:

-            a = getattr(self, s)

-            b = getattr(other, s)

-            is_equal = np.allclose(a, b, rtol=0, atol=eps, equal_nan=True)

-            if verbose and not is_equal:

-                print('self.{} - other.{} = {}'.format(s, s, a - b))

-            same_slots.append(is_equal)

-

-        return all(same_slots)

-

 class IntegratorLearner(BaseLearner):

@@ -470,17 +451,5 @@ class IntegratorLearner(BaseLearner):

     def loss(self, real=True):

         return abs(abs(self.igral) * self.tol - self.err)

-    def equal(self, other, *, verbose=False):

-        """Note: `other` is a list of ivals."""

-        if len(self.ivals) != len(other):

-            if verbose:

-                print('len(self.ivals)={} != len(other)={}'.format(

-                    len(self.ivals), len(other)))

-            return False

-

-        ivals = [sorted(i, key=attrgetter('a')) for i in [self.ivals, other]]

-        return all(ival.equal(other_ival, verbose=verbose)

-                   for ival, other_ival in zip(*ivals))

-

     def plot(self):

         return hv.Scatter(self.done_points)

@@ -1,5 +1,6 @@

 # -*- coding: utf-8 -*-

 from functools import partial

+from operator import attrgetter

 import numpy as np

 import pytest

@@ -17,6 +18,37 @@ def run_integrator_learner(f, a, b, tol, nr_points):

     return learner

+def equal_ival(ival, other, *, verbose=False):

+    """Note: Implementing __eq__ breaks SortedContainers in some way."""

+    if not ival.complete:

+        if verbose:

+            print('Interval {} is not complete.'.format(ival))

+        return False

+

+    slots = set(ival.__slots__).intersection(other.__slots__)

+    same_slots = []

+    for s in slots:

+        a = getattr(ival, s)

+        b = getattr(other, s)

+        is_equal = np.allclose(a, b, rtol=0, atol=eps, equal_nan=True)

+        if verbose and not is_equal:

+            print('ival.{} - other.{} = {}'.format(s, s, a - b))

+        same_slots.append(is_equal)

+

+    return all(same_slots)

+

+def equal_ivals(ivals, other, *, verbose=False):

+    """Note: `other` is a list of ivals."""

+    if len(ivals) != len(other):

+        if verbose:

+            print('len(ivals)={} != len(other)={}'.format(

+                len(ivals), len(other)))

+        return False

+

+    ivals = [sorted(i, key=attrgetter('a')) for i in [ivals, other]]

+    return all(equal_ival(ival, other_ival, verbose=verbose)

+               for ival, other_ival in zip(*ivals))

+

 def same_ivals(f, a, b, tol):

         igral, err, nr_points, ivals = algorithm_4(f, a, b, tol)

@@ -26,7 +58,7 @@ def same_ivals(f, a, b, tol):

         print('igral difference', learner.igral-igral,

               'err difference', learner.err - err)

-        return learner.equal(ivals, verbose=True)

+        return equal_ivals(learner.ivals, ivals, verbose=True)

 def test_cquad():

@@ -47,7 +79,7 @@ def test_machine_precision():

     print('igral difference', learner.igral-igral,

           'err difference', learner.err - err)

-    assert learner.equal(ivals, verbose=True)

+    assert equal_ivals(learner.ivals, ivals, verbose=True)

 def test_machine_precision2():