quadax 0.2.2__tar.gz → 0.2.4__tar.gz

{quadax-0.2.2/quadax.egg-info → quadax-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quadax
-Version: 0.2.2
+Version: 0.2.4
 Summary: Numerical quadrature with JAX
 Home-page: https://github.com/f0uriest/quadax
 Author: Rory Conlin
@@ -25,9 +25,9 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: equinox
+Requires-Dist: equinox<0.12,>=0.11
 Requires-Dist: jax<=0.5.0,>=0.3.2
-Requires-Dist: numpy<2.0,>=1.20.0
+Requires-Dist: numpy<2.2,>=1.20.0
 
 
 ########
@@ -42,7 +42,7 @@ quadax is a library for numerical quadrature and integration using JAX.
 - ``vmap``-able, ``jit``-able, differentiable.
 - Scalar or vector valued integrands.
 - Finite or infinite domains with discontinuities or singularities within the domain of integration.
-- Globally adaptive Gauss-Konrod and Clenshaw-Curtis quadrature for smooth integrands (similar to ``scipy.integrate.quad``)
+- Globally adaptive Gauss-Kronrod and Clenshaw-Curtis quadrature for smooth integrands (similar to ``scipy.integrate.quad``)
 - Adaptive tanh-sinh quadrature for singular or near singular integrands.
 - Quadrature from sampled values using trapezoidal and Simpsons methods.
 

{quadax-0.2.2 → quadax-0.2.4}/README.rst

@@ -11,7 +11,7 @@ quadax is a library for numerical quadrature and integration using JAX.
 - ``vmap``-able, ``jit``-able, differentiable.
 - Scalar or vector valued integrands.
 - Finite or infinite domains with discontinuities or singularities within the domain of integration.
-- Globally adaptive Gauss-Konrod and Clenshaw-Curtis quadrature for smooth integrands (similar to ``scipy.integrate.quad``)
+- Globally adaptive Gauss-Kronrod and Clenshaw-Curtis quadrature for smooth integrands (similar to ``scipy.integrate.quad``)
 - Adaptive tanh-sinh quadrature for singular or near singular integrands.
 - Quadrature from sampled values using trapezoidal and Simpsons methods.
 

{quadax-0.2.2 → quadax-0.2.4}/quadax/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-21T21:23:26-0400",
+ "date": "2024-12-07T14:57:57-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "09217f2a463afa4971d9ae368d001a24a032e8c6",
- "version": "0.2.2"
+ "full-revisionid": "75fbdd94dce98d54a6be302eb92bc7c94a8eaf60",
+ "version": "0.2.4"
 }
 '''  # END VERSION_JSON
 

{quadax-0.2.2 → quadax-0.2.4}/quadax/adaptive.py

@@ -39,7 +39,7 @@ def quadgk(
     order=21,
     norm=jnp.inf,
 ):
-    """Global adaptive quadrature using Gauss-Konrod rule.
+    """Global adaptive quadrature using Gauss-Kronrod rule.
 
     Integrate fun from `interval[0]` to `interval[-1]` using a h-adaptive scheme with
     error estimate. Breakpoints can be specified in `interval` where integration
@@ -422,19 +422,21 @@ def adaptive_quadrature(
     epsrel = setdefault(epsrel, jnp.sqrt(jnp.finfo(jnp.array(1.0)).eps))
     fun, interval = map_interval(fun, interval)
     vfunc = wrap_func(fun, args)
-    f = jax.eval_shape(vfunc, (interval[0] + interval[-1] / 2))
+    f = jax.eval_shape(vfunc, (interval[0] + interval[-1]) / 2)
     epmach = jnp.finfo(f.dtype).eps
     shape = f.shape
 
     state = {}
     state["neval"] = 0  # number of evaluations of local quadrature rule
     state["ninter"] = len(interval) - 1  # current number of intervals
-    state["r_arr"] = jnp.zeros((max_ninter, *shape))  # local results from each interval
+    state["r_arr"] = jnp.zeros(
+        (max_ninter, *shape), f.dtype
+    )  # local results from each interval
     state["e_arr"] = jnp.zeros(max_ninter)  # local error est. from each interval
     state["a_arr"] = jnp.zeros(max_ninter)  # start of each interval
     state["b_arr"] = jnp.zeros(max_ninter)  # end of each interval
     state["s_arr"] = jnp.zeros(
-        (max_ninter, *shape)
+        (max_ninter, *shape), f.dtype
     )  # global est. of I from n intervals
     state["a_arr"] = state["a_arr"].at[: state["ninter"]].set(interval[:-1])
     state["b_arr"] = state["b_arr"].at[: state["ninter"]].set(interval[1:])
@@ -442,7 +444,7 @@ def adaptive_quadrature(
     state["roundoff2"] = 0  # for keeping track of roundoff errors
     state["status"] = 0  # error flag
     state["err_bnd"] = 0.0  # error bound we're trying to reach
-    state["area"] = jnp.zeros(shape)  # current best estimate for I
+    state["area"] = jnp.zeros(shape, f.dtype)  # current best estimate for I
     state["err_sum"] = 0.0  # current estimate for error in I
 
     def init_body(i, state_):

{quadax-0.2.2 → quadax-0.2.4}/quadax/fixed_order.py

@@ -118,7 +118,7 @@ class NestedRule(AbstractQuadratureRule):
         def truefun():
             f = jax.eval_shape(vfun, jnp.array(0.0))
             z = jnp.zeros(f.shape, f.dtype)
-            return z, 0.0, z, z
+            return z, self.norm(z), jnp.abs(z), jnp.abs(z)
 
         def falsefun():
 

{quadax-0.2.2 → quadax-0.2.4}/quadax/romberg.py

@@ -97,7 +97,7 @@ def romberg(
     fun, interval = map_interval(fun, interval)
     vfunc = wrap_func(fun, args)
     a, b = interval
-    f = jax.eval_shape(vfunc, (a + b / 2))
+    f = jax.eval_shape(vfunc, (a + b) / 2)
 
     result = jnp.zeros((divmax + 1, divmax + 1, *f.shape), f.dtype)
     result = result.at[0, 0].set(vfunc(a) + vfunc(b))

{quadax-0.2.2 → quadax-0.2.4/quadax.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quadax
-Version: 0.2.2
+Version: 0.2.4
 Summary: Numerical quadrature with JAX
 Home-page: https://github.com/f0uriest/quadax
 Author: Rory Conlin
@@ -25,9 +25,9 @@ Classifier: Topic :: Scientific/Engineering :: Mathematics
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: equinox
+Requires-Dist: equinox<0.12,>=0.11
 Requires-Dist: jax<=0.5.0,>=0.3.2
-Requires-Dist: numpy<2.0,>=1.20.0
+Requires-Dist: numpy<2.2,>=1.20.0
 
 
 ########
@@ -42,7 +42,7 @@ quadax is a library for numerical quadrature and integration using JAX.
 - ``vmap``-able, ``jit``-able, differentiable.
 - Scalar or vector valued integrands.
 - Finite or infinite domains with discontinuities or singularities within the domain of integration.
-- Globally adaptive Gauss-Konrod and Clenshaw-Curtis quadrature for smooth integrands (similar to ``scipy.integrate.quad``)
+- Globally adaptive Gauss-Kronrod and Clenshaw-Curtis quadrature for smooth integrands (similar to ``scipy.integrate.quad``)
 - Adaptive tanh-sinh quadrature for singular or near singular integrands.
 - Quadrature from sampled values using trapezoidal and Simpsons methods.
 

quadax-0.2.4/quadax.egg-info/requires.txt

@@ -0,0 +1,3 @@
+equinox<0.12,>=0.11
+jax<=0.5.0,>=0.3.2
+numpy<2.2,>=1.20.0

quadax-0.2.4/requirements.txt

@@ -0,0 +1,3 @@
+equinox >= 0.11, < 0.12
+jax >= 0.3.2, <= 0.5.0
+numpy >= 1.20.0, < 2.2

{quadax-0.2.2 → quadax-0.2.4}/tests/test_adaptive.py

@@ -87,11 +87,17 @@ example_problems = [
         "interval": [0, 1, 2],
         "val": -4,
     },
+    # problem 16 - complex function
+    {
+        "fun": lambda t: t * jnp.log(1 + t) * 1j,
+        "interval": [0, 1],
+        "val": 0.25j,
+    },
 ]
 
 
 class TestQuadGK:
-    """Tests for Gauss-Konrod quadrature."""
+    """Tests for Gauss-Kronrod quadrature."""
 
     def _base(self, i, tol, fudge=1, **kwargs):
         prob = example_problems[i]
@@ -210,6 +216,12 @@ class TestQuadGK:
         self._base(14, 1e-8)
         self._base(14, 1e-12)
 
+    def test_prob16(self):
+        """Test for example problem #16."""
+        self._base(16, 1e-4)
+        self._base(16, 1e-8)
+        self._base(16, 1e-12)
+
 
 class TestQuadCC:
     """Tests for Clenshaw-Curtis quadrature."""
@@ -331,6 +343,12 @@ class TestQuadCC:
         self._base(14, 1e-8)
         self._base(14, 1e-12)
 
+    def test_prob16(self):
+        """Test for example problem #16."""
+        self._base(16, 1e-4)
+        self._base(16, 1e-8)
+        self._base(16, 1e-12)
+
 
 class TestQuadTS:
     """Tests for adaptive tanh-sinh quadrature."""
@@ -452,6 +470,12 @@ class TestQuadTS:
         self._base(14, 1e-8)
         self._base(14, 1e-12)
 
+    def test_prob16(self):
+        """Test for example problem #16."""
+        self._base(16, 1e-4)
+        self._base(16, 1e-8)
+        self._base(16, 1e-12)
+
 
 class TestRombergTS:
     """Tests for tanh-sinh quadrature with adaptive refinement."""
@@ -567,6 +591,12 @@ class TestRombergTS:
         self._base(14, 1e-8)
         self._base(14, 1e-12)
 
+    def test_prob16(self):
+        """Test for example problem #16."""
+        self._base(16, 1e-4)
+        self._base(16, 1e-8)
+        self._base(16, 1e-12)
+
 
 class TestRomberg:
     """Tests for Romberg's method (only for well behaved integrands)."""
@@ -670,3 +700,9 @@ class TestRomberg:
         self._base(14, 1e-4)
         self._base(14, 1e-8)
         self._base(14, 1e-12)
+
+    def test_prob16(self):
+        """Test for example problem #16."""
+        self._base(16, 1e-4)
+        self._base(16, 1e-8)
+        self._base(16, 1e-12)

quadax-0.2.2/quadax.egg-info/requires.txt

@@ -1,3 +0,0 @@
-equinox
-jax<=0.5.0,>=0.3.2
-numpy<2.0,>=1.20.0

quadax-0.2.2/requirements.txt

@@ -1,3 +0,0 @@
-equinox
-jax >= 0.3.2, <= 0.5.0
-numpy >= 1.20.0, < 2.0