junifer 0.0.5.dev152__py3-none-any.whl → 0.0.5.dev161__py3-none-any.whl

junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.5.dev152'
-__version_tuple__ = version_tuple = (0, 0, 5, 'dev152')
+__version__ = version = '0.0.5.dev161'
+__version_tuple__ = version_tuple = (0, 0, 5, 'dev161')

junifer/external/nilearn/__init__.py

@@ -4,3 +4,6 @@
 # License: AGPL
 
 from .junifer_nifti_spheres_masker import JuniferNiftiSpheresMasker
+
+
+__all__ = ["JuniferNiftiSpheresMasker"]

junifer/external/nilearn/junifer_nifti_spheres_masker.py

@@ -29,9 +29,12 @@ if TYPE_CHECKING:
     from pandas import DataFrame
 
 
+__all__ = ["JuniferNiftiSpheresMasker"]
+
+
 # New BSD License
 
-# Copyright (c) 2007 - 2022 The nilearn developers.
+# Copyright (c) The nilearn developers.
 # All rights reserved.
 
 
@@ -99,6 +102,17 @@ def _apply_mask_and_get_affinity(
         Contains the boolean indices for each sphere.
         shape: (number of seeds, number of voxels)
 
+    Raises
+    ------
+    ValueError
+        If ``niimg`` and ``mask_img`` are both provided or
+        if overlap is detected between spheres.
+
+    Warns
+    -----
+    RuntimeWarning
+        If the provided images contain NaN, they will be converted to zeroes.
+
     """
     seeds = list(seeds)
 
@@ -210,7 +224,7 @@ def _iter_signals_from_spheres(
     X, A = _apply_mask_and_get_affinity(
         seeds, niimg, radius, allow_overlap, mask_img=mask_img
     )
-    for _, row in enumerate(A.rows):
+    for row in A.rows:
         yield X[:, row]
 
 

junifer/external/nilearn/tests/test_junifer_nifti_spheres_masker.py

@@ -4,12 +4,14 @@
 # License: AGPL
 
 import warnings
+from typing import List, Tuple
 
 import nibabel
 import numpy as np
 import pytest
 from nilearn._utils import data_gen
 from nilearn.image import get_data
+from nilearn.maskers import NiftiSpheresMasker
 from numpy.testing import assert_array_equal
 
 from junifer.external.nilearn import JuniferNiftiSpheresMasker
@@ -17,7 +19,7 @@ from junifer.external.nilearn import JuniferNiftiSpheresMasker
 
 # New BSD License
 
-# Copyright (c) 2007 - 2022 The nilearn developers.
+# Copyright (c) The nilearn developers.
 # All rights reserved.
 
 
@@ -331,3 +333,76 @@ def test_nifti_spheres_masker_io_shapes() -> None:
         )
         test_data = masker.transform(img_4d)
         assert test_data.shape == (n_volumes, n_regions)
+
+
+@pytest.mark.parametrize(
+    "shape",
+    [
+        (10, 11, 12),
+        (10, 11, 12, 5),
+    ],
+)
+@pytest.mark.parametrize(
+    "radius, allow_overlap",
+    [
+        (2.0, True),
+        (2.0, False),
+        (3.0, True),
+        (4.0, True),
+        (5.0, True),
+    ],
+)
+@pytest.mark.parametrize(
+    "coords",
+    [
+        [(1, 1, 1)],
+        [(1, 1, 1), (4, 4, 4)],
+        [(1, 1, 1), (4, 4, 4), (10, 10, 10)],
+    ],
+)
+def test_junifer_and_nilearn_mean_agg_are_equal(
+    shape: Tuple[int, ...],
+    radius: float,
+    allow_overlap: bool,
+    coords: List[Tuple[int, int, int]],
+) -> None:
+    """Test junifer's masker behaves same as nilearn's when agg is mean.
+
+    Parameters
+    ----------
+    shape : tuple of int
+        The parametrized shape of the input image.
+    radius : float
+        The parametrized radius of the spheres.
+    allow_overlap : bool
+        The parametrized option to overlap spheres or not.
+    coords : list of tuple of int, int and int
+        The parametrized seeds.
+
+    """
+    # Set affine
+    affine = np.eye(4)
+    # Generate random image
+    input_img, mask_img = data_gen.generate_random_img(
+        shape=shape,
+        affine=affine,
+    )
+    # Compute junifer's version
+    junifer_masker = JuniferNiftiSpheresMasker(
+        seeds=coords,
+        radius=radius,
+        allow_overlap=allow_overlap,
+        mask_img=mask_img,
+    )
+    junifer_output = junifer_masker.fit_transform(input_img)
+    # Compute nilearn's version
+    nilearn_masker = NiftiSpheresMasker(
+        seeds=coords,
+        radius=radius,
+        allow_overlap=allow_overlap,
+        mask_img=mask_img,
+    )
+    nilearn_output = nilearn_masker.fit_transform(input_img)
+    # Checks
+    assert junifer_output.shape == nilearn_output.shape
+    np.testing.assert_almost_equal(junifer_output, nilearn_output)

{junifer-0.0.5.dev152.dist-info → junifer-0.0.5.dev161.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.5.dev152
+Version: 0.0.5.dev161
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.5.dev152.dist-info → junifer-0.0.5.dev161.dist-info}/RECORD

@@ -1,5 +1,5 @@
 junifer/__init__.py,sha256=-T9XmiCCL0j3YLx-0Pph15sPfL5FlcBDscajjJ-V4sU,604
-junifer/_version.py,sha256=YEKUDK7au3qW4ScztaosLY-XtlLg7Y8o26fPONml4S8,428
+junifer/_version.py,sha256=UfXRLkQeUycPYOXVnbIPOq4a2hAaHq9EznoNGJMncyo,428
 junifer/stats.py,sha256=BjQb2lfTGDP9l4UuQYmJFcJJNRfbJDGlNvC06SJaDDE,6237
 junifer/api/__init__.py,sha256=lwyIF0hPc7fICuSoddJfay0LPqlTRxHJ_xbtizgFYZA,312
 junifer/api/cli.py,sha256=53pews3mXkJ7DUDSkV51PbitYnuVAdQRkWG-gjO08Uw,16142
@@ -132,9 +132,9 @@ junifer/external/h5io/h5io/_h5io.py,sha256=8dWZDYegoPcBkH_fHPdl0eXNWTaRdk9hfIQo8
 junifer/external/h5io/h5io/_version.py,sha256=mFY0GwwuN-a3M8w93_mskS6GZIvv9SNdjLfJaWNsm-I,22
 junifer/external/h5io/h5io/chunked_array.py,sha256=K1HWf7R2Jc7gCzBqAoBjx0ZnMmUhTe3iAO6RF6PdUO4,3338
 junifer/external/h5io/h5io/chunked_list.py,sha256=1Y5BbuWzurJlEFQzJNuDdC3fNZ39ENEMba99X_4VeSM,1952
-junifer/external/nilearn/__init__.py,sha256=a2Umwm3_WeqIC7DqPUmnUonYfX3LUdQ0ScDGZrNP6y4,180
-junifer/external/nilearn/junifer_nifti_spheres_masker.py,sha256=D3Sf78zJx-bArO2tbUbvjDdnOv2T7HCcNtvfcEL6lCU,16267
-junifer/external/nilearn/tests/test_junifer_nifti_spheres_masker.py,sha256=qlMFWjo9y8mNLrdmN2qCEK6_nplASv2OlomSfTxDcuw,10370
+junifer/external/nilearn/__init__.py,sha256=Cx9SM-AHU2OmyC5n6YmRv2JMEYp3qoVnxl5bk4XYWjc,222
+junifer/external/nilearn/junifer_nifti_spheres_masker.py,sha256=DbSK2hKrgpHZ_vCRLbVv3YJpLZNkEAG0HFfQQpG6zdU,16546
+junifer/external/nilearn/tests/test_junifer_nifti_spheres_masker.py,sha256=zpvBYIvaNjUj9fIUg5K78LRzJqbyMYlUo2UQYS9_lo4,12275
 junifer/markers/__init__.py,sha256=u4BFgS_3GXAwFN2HfqdAhlBkyenLw4IYlMlwXwnjkVQ,1235
 junifer/markers/base.py,sha256=7_TLrz8dZH_3t1zgSSW2yCnDO2DGGAxFMZLHDkvJ_NM,6985
 junifer/markers/brainprint.py,sha256=On1M8Hp14g-S-o-3TVVYTGfviJEz-xjuAVg0mRHyxFg,21793
@@ -263,10 +263,10 @@ junifer/utils/logging.py,sha256=b02qVTdE-WNVo6uxCYdIHVmNfM7An0NdCJNq_2Gte8o,9355
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
 junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
-junifer-0.0.5.dev152.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.5.dev152.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.5.dev152.dist-info/METADATA,sha256=saDs-CMpk_pn8L2kDcN_1KLtE3-YB8CCB87K5XgUTik,8281
-junifer-0.0.5.dev152.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-junifer-0.0.5.dev152.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.5.dev152.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.5.dev152.dist-info/RECORD,,
+junifer-0.0.5.dev161.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.5.dev161.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.5.dev161.dist-info/METADATA,sha256=AFnrJ4D7WeYBR0_-Crevx4ezleXY3PX4hz5LR9VKvvo,8281
+junifer-0.0.5.dev161.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+junifer-0.0.5.dev161.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.5.dev161.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.5.dev161.dist-info/RECORD,,