gh-273: add tests for glass.shells

tests/conftest.py

@@ -12,19 +12,47 @@ def cosmo() -> Cosmology:
     class MockCosmology:
         @property
         def omega_m(self) -> float:
+            """Matter density parameter at redshift 0."""
             return 0.3
 
+        @property
+        def rho_c(self) -> float:
+            """Critical density at redshift 0 in Msol Mpc-3."""
+            return 3e4
+
         def ef(self, z: npt.NDArray[np.float64]) -> npt.NDArray[np.float64]:
+            """Standardised Hubble function :math:`E(z) = H(z)/H_0`."""
             return (self.omega_m * (1 + z) ** 3 + 1 - self.omega_m) ** 0.5
 
         def xm(
             self,
             z: npt.NDArray[np.float64],
             z2: npt.NDArray[np.float64] | None = None,
         ) -> npt.NDArray[np.float64]:
+            """
+            Dimensionless transverse comoving distance.
+
+            :math:`x_M(z) = d_M(z)/d_H`
+            """
             if z2 is None:
-                return np.array(z) * 1000
-            return (np.array(z2) - np.array(z)) * 1000
+                return np.array(z) * 1_000
+            return (np.array(z2) - np.array(z)) * 1_000
+
+        def rho_m_z(self, z: npt.NDArray[np.float64]) -> npt.NDArray[np.float64]:
+            """Redshift-dependent matter density in Msol Mpc-3."""
+            return self.rho_c * self.omega_m * (1 + z) ** 3
+
+        def dc(
+            self,
+            z: npt.NDArray[np.float64],
+            z2: npt.NDArray[np.float64] | None = None,
+        ) -> npt.NDArray[np.float64]:
+            """Comoving distance :math:`d_c(z)` in Mpc."""
+            return self.xm(z) / 1_000 if z2 is None else self.xm(z, z2) / 1_000
+
+        def dc_inv(self, dc: npt.NDArray[np.float64]) -> npt.NDArray[np.float64]:
+            """Inverse function for the comoving distance in Mpc."""
+            return 1_000 * (1 / (dc + np.finfo(float).eps))
 
     return MockCosmology()
 

tests/test_shells.py

@@ -1,15 +1,80 @@
 import numpy as np
 import pytest
 
+from cosmology import Cosmology
+
 from glass import (
     RadialWindow,
+    combine,  # noqa: F401
+    cubic_windows,
+    density_weight,
+    distance_grid,
+    distance_weight,
+    linear_windows,
     partition,
+    redshift_grid,
     restrict,
     tophat_windows,
+    volume_weight,
 )
 
 
+def test_distance_weight(cosmo: Cosmology) -> None:
+    """Add unit tests for :func:`distance_weight`."""
+    z = np.linspace(0, 1, 6)
+
+    # check shape
+
+    w = distance_weight(z, cosmo)
+    np.testing.assert_array_equal(w.shape, z.shape)
+
+    # check first value is 1
+
+    np.testing.assert_array_equal(w[0], 1)
+
+    # check values are decreasing
+
+    np.testing.assert_array_less(w[1:], w[:-1])
+
+
+def test_volume_weight(cosmo: Cosmology) -> None:
+    """Add unit tests for :func:`volume_weight`."""
+    z = np.linspace(0, 1, 6)
+
+    # check shape
+
+    w = volume_weight(z, cosmo)
+    np.testing.assert_array_equal(w.shape, z.shape)
+
+    # check first value is 0
+
+    np.testing.assert_array_equal(w[0], 0)
+
+    # check values are increasing
+
+    np.testing.assert_array_less(w[:-1], w[1:])
+
+
+def test_density_weight(cosmo: Cosmology) -> None:
+    """Add unit tests for :func:`density_weight`."""
+    z = np.linspace(0, 1, 6)
+
+    # check shape
+
+    w = density_weight(z, cosmo)
+    np.testing.assert_array_equal(w.shape, z.shape)
+
+    # check first value is 0
+
+    np.testing.assert_array_equal(w[0], 0)
+
+    # check values are increasing
+
+    np.testing.assert_array_less(w[:-1], w[1:])
+
+
 def test_tophat_windows() -> None:
+    """Add unit tests for :func:`tophat_windows`."""
     zb = np.array([0.0, 0.1, 0.2, 0.5, 1.0, 2.0])
     dz = 0.005
 
@@ -30,7 +95,100 @@ def test_tophat_windows() -> None:
     assert all(np.all(w.wa == 1) for w in ws)
 
 
+def test_linear_windows() -> None:
+    """Add unit tests for :func:`linear_windows`."""
+    dz = 1e-2
+    zgrid = [
+        0.0,
+        0.20224358,
+        0.42896272,
+        0.69026819,
+        1.0,
+    ]
+
+    # check spacing of redshift grid
+
+    ws = linear_windows(zgrid)
+    np.testing.assert_allclose(dz, np.diff(ws[0].za).mean(), atol=1e-2)
+
+    # check number of windows
+
+    np.testing.assert_array_equal(len(ws), len(zgrid) - 2)
+
+    # check values of zeff
+
+    np.testing.assert_array_equal([w.zeff for w in ws], zgrid[1:-1])
+
+    # check weight function input
+
+    ws = linear_windows(
+        zgrid,
+        weight=lambda _: 0,  # type: ignore[arg-type, return-value]
+    )
+    for w in ws:
+        np.testing.assert_array_equal(w.wa, np.zeros_like(w.wa))
+
+    # check error raised
+
+    with pytest.raises(ValueError, match="nodes must have at least 3 entries"):
+        linear_windows([])
+
+    # check warning issued
+
+    with pytest.warns(
+        UserWarning, match="first triangular window does not start at z=0"
+    ):
+        linear_windows([0.1, 0.2, 0.3])
+
+
+def test_cubic_windows() -> None:
+    """Add unit tests for :func:`cubic_windows`."""
+    dz = 1e-2
+    zgrid = [
+        0.0,
+        0.20224358,
+        0.42896272,
+        0.69026819,
+        1.0,
+    ]
+
+    # check spacing of redshift grid
+
+    ws = cubic_windows(zgrid)
+    np.testing.assert_allclose(dz, np.diff(ws[0].za).mean(), atol=1e-2)
+
+    # check number of windows
+
+    np.testing.assert_array_equal(len(ws), len(zgrid) - 2)
+
+    # check values of zeff
+
+    np.testing.assert_array_equal([w.zeff for w in ws], zgrid[1:-1])
+
+    # check weight function input
+
+    ws = cubic_windows(
+        zgrid,
+        weight=lambda _: 0,  # type: ignore[arg-type, return-value]
+    )
+    for w in ws:
+        np.testing.assert_array_equal(w.wa, np.zeros_like(w.wa))
+
+    # check error raised
+
+    with pytest.raises(ValueError, match="nodes must have at least 3 entries"):
+        cubic_windows([])
+
+    # check warning issued
+
+    with pytest.warns(
+        UserWarning, match="first cubic spline window does not start at z=0"
+    ):
+        cubic_windows([0.1, 0.2, 0.3])
+
+
 def test_restrict() -> None:
+    """Add unit tests for :func:`restrict`."""
     # Gaussian test function
     z = np.linspace(0.0, 5.0, 1000)
     f = np.exp(-(((z - 2.0) / 0.5) ** 2) / 2)
@@ -62,6 +220,7 @@ def test_restrict() -> None:
 
 @pytest.mark.parametrize("method", ["lstsq", "nnls", "restrict"])
 def test_partition(method: str) -> None:
+    """Add unit tests for :func:`partition`."""
     shells = [
         RadialWindow(np.array([0.0, 1.0]), np.array([1.0, 0.0]), 0.0),
         RadialWindow(np.array([0.0, 1.0, 2.0]), np.array([0.0, 1.0, 0.0]), 0.5),
@@ -82,3 +241,69 @@ def test_partition(method: str) -> None:
     assert part.shape == (len(shells), 3, 2)
 
     np.testing.assert_allclose(part.sum(axis=0), np.trapezoid(fz, z))
+
+
+def test_redshift_grid() -> None:
+    """Add unit tests for :func:`redshift_grid`."""
+    zmin = 0
+    zmax = 1
+
+    # check num input
+
+    num = 5
+    z = redshift_grid(zmin, zmax, num=5)
+    np.testing.assert_array_equal(len(z), num + 1)
+
+    # check dz input
+
+    dz = 0.2
+    z = redshift_grid(zmin, zmax, dz=dz)
+    np.testing.assert_array_equal(len(z), np.ceil((zmax - zmin) / dz) + 1)
+
+    # check dz for spacing which results in a max value above zmax
+
+    z = redshift_grid(zmin, zmax, dz=0.3)
+    np.testing.assert_array_less(zmax, z[-1])
+
+    # check error raised
+
+    with pytest.raises(ValueError, match="exactly one of 'dz' or 'num' must be given"):
+        redshift_grid(zmin, zmax)
+
+    with pytest.raises(ValueError, match="exactly one of 'dz' or 'num' must be given"):
+        redshift_grid(zmin, zmax, dz=dz, num=num)
+
+
+def test_distance_grid(cosmo: Cosmology) -> None:
+    """Add unit tests for :func:`distance_grid`."""
+    zmin = 0
+    zmax = 1
+
+    # check num input
+
+    num = 5
+    x = distance_grid(cosmo, zmin, zmax, num=5)
+    np.testing.assert_array_equal(len(x), num + 1)
+
+    # check dz input
+
+    dx = 0.2
+    x = distance_grid(cosmo, zmin, zmax, dx=dx)
+    np.testing.assert_array_equal(len(x), np.ceil((zmax - zmin) / dx) + 1)
+
+    # check decrease in distance
+
+    x = distance_grid(cosmo, zmin, zmax, dx=0.3)
+    np.testing.assert_array_less(x[1:], x[:-1])
+
+    # check error raised
+
+    with pytest.raises(ValueError, match="exactly one of 'dz' or 'num' must be given"):
+        distance_grid(cosmo, zmin, zmax)
+
+    with pytest.raises(ValueError, match="exactly one of 'dz' or 'num' must be given"):
+        distance_grid(cosmo, zmin, zmax, dx=dx, num=num)
+
+
+def test_combine() -> None:
+    """Add unit tests for :func:`combine`."""