siibra 0.4a86__py3-none-any.whl → 0.4a87__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of siibra might be problematic. Click here for more details.
- siibra/VERSION +1 -1
- siibra/features/anchor.py +15 -18
- {siibra-0.4a86.dist-info → siibra-0.4a87.dist-info}/METADATA +11 -2
- {siibra-0.4a86.dist-info → siibra-0.4a87.dist-info}/RECORD +7 -7
- {siibra-0.4a86.dist-info → siibra-0.4a87.dist-info}/WHEEL +1 -1
- {siibra-0.4a86.dist-info → siibra-0.4a87.dist-info}/LICENSE +0 -0
- {siibra-0.4a86.dist-info → siibra-0.4a87.dist-info}/top_level.txt +0 -0
siibra/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.
|
|
1
|
+
0.4a87
|
siibra/features/anchor.py
CHANGED
|
@@ -146,24 +146,21 @@ class AnatomicalAnchor:
|
|
|
146
146
|
"""
|
|
147
147
|
if concept not in self._assignments:
|
|
148
148
|
matches: List[AnatomicalAssignment] = []
|
|
149
|
-
if isinstance(concept, Space):
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
if
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
if
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
# on the region-to-region test.
|
|
165
|
-
if self.location is not None:
|
|
166
|
-
matches.append(AnatomicalAnchor.match_location_to_region(self.location, concept))
|
|
149
|
+
if isinstance(concept, Space) and self.space == concept:
|
|
150
|
+
matches.append(
|
|
151
|
+
AnatomicalAssignment(self.space, concept, AssignmentQualification.EXACT)
|
|
152
|
+
)
|
|
153
|
+
elif isinstance(concept, Region) and concept.species in self.species:
|
|
154
|
+
hierarchy_search = concept.root.find(self._regionspec)
|
|
155
|
+
if len(hierarchy_search) > 0 or self.has_region_aliases: # dramatic speedup, since decoding _regionspec is expensive
|
|
156
|
+
for r in self.regions:
|
|
157
|
+
matches.append(AnatomicalAnchor.match_regions(r, concept))
|
|
158
|
+
if len(hierarchy_search) == 0 and self.location is not None:
|
|
159
|
+
# We perform the (quite expensive) location-to-region test
|
|
160
|
+
# only if this anchor's regionspec is not known to the
|
|
161
|
+
# parcellation of the query region. Otherwise we can rely
|
|
162
|
+
# on the region-to-region test.
|
|
163
|
+
matches.append(AnatomicalAnchor.match_location_to_region(self.location, concept))
|
|
167
164
|
elif isinstance(concept, Location):
|
|
168
165
|
if self.location is not None:
|
|
169
166
|
matches.append(AnatomicalAnchor.match_locations(self.location, concept))
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.2
|
|
2
2
|
Name: siibra
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.4a87
|
|
4
4
|
Summary: siibra - Software interfaces for interacting with brain atlases
|
|
5
5
|
Home-page: https://github.com/FZJ-INM1-BDA/siibra-python
|
|
6
6
|
Author: Big Data Analytics Group, Forschungszentrum Juelich, Institute of Neuroscience and Medicine (INM-1)
|
|
@@ -25,6 +25,15 @@ Requires-Dist: nilearn
|
|
|
25
25
|
Requires-Dist: typing-extensions; python_version < "3.8"
|
|
26
26
|
Requires-Dist: filelock
|
|
27
27
|
Requires-Dist: ebrains-drive>=0.6.0
|
|
28
|
+
Dynamic: author
|
|
29
|
+
Dynamic: author-email
|
|
30
|
+
Dynamic: classifier
|
|
31
|
+
Dynamic: description
|
|
32
|
+
Dynamic: description-content-type
|
|
33
|
+
Dynamic: home-page
|
|
34
|
+
Dynamic: requires-dist
|
|
35
|
+
Dynamic: requires-python
|
|
36
|
+
Dynamic: summary
|
|
28
37
|
|
|
29
38
|
|License| |PyPI version| |doi| |Python versions| |Documentation Status|
|
|
30
39
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
siibra/VERSION,sha256=
|
|
1
|
+
siibra/VERSION,sha256=DVVHtGY0MIvedU7xNA1_6jXB9d82lCfJNW-RWnnSP2M,7
|
|
2
2
|
siibra/__init__.py,sha256=qBxxMRyl9RojNt0twQr2LDk1Nyk5eNsPHFxxoIwnpx4,4540
|
|
3
3
|
siibra/commons.py,sha256=PImsqrZBp2Mn_9ZEJOxEOd4i-w_HPMv4sUcHCtN9cPw,25868
|
|
4
4
|
siibra/configuration/__init__.py,sha256=-_Kuf0TfMEdFXiSCTAdcHUL_krA8-cxhJypSNNay53Q,752
|
|
@@ -15,7 +15,7 @@ siibra/explorer/__init__.py,sha256=_9gCCp7P8AniGlztulrRyleIOEKcNZlBFVurtnI8GBM,4
|
|
|
15
15
|
siibra/explorer/url.py,sha256=mUAFN7OHfLELfdqqJmSdAkmXJjKCv6Qh5RHtyxNQjfo,5868
|
|
16
16
|
siibra/explorer/util.py,sha256=Z2ruicDL3S_qcxhHHW0GF1q5-r963tJpzgtQmAn8YSM,1424
|
|
17
17
|
siibra/features/__init__.py,sha256=Y5q2M7HoToTcfAdO50jmnPGZybJOi5GyEcbxQRscJjo,1518
|
|
18
|
-
siibra/features/anchor.py,sha256=
|
|
18
|
+
siibra/features/anchor.py,sha256=6XQC8kViFyxd6Xcwp4lMJi2XLoZVNpWevczU5lnhfgk,14135
|
|
19
19
|
siibra/features/feature.py,sha256=YdIBmyJYFlJby6oIXxK1zFV6FJVr3_eygDynCLCe7vk,20478
|
|
20
20
|
siibra/features/connectivity/__init__.py,sha256=ybKN9OfmabSeTx1I6WSrULu5dT6raefty8QB2XaiUrE,1077
|
|
21
21
|
siibra/features/connectivity/functional_connectivity.py,sha256=AkRYufi4r3CeV50FLaI6kjKraQ4t9G58iPn521HRRGk,1407
|
|
@@ -67,8 +67,8 @@ siibra/volumes/nifti.py,sha256=nGSCedjpsiy43XIiHQ2SRy9rPRK8Ci9QDq4AHKclCck,9030
|
|
|
67
67
|
siibra/volumes/parcellationmap.py,sha256=phoMzNLI3Ig9rWvuD_c1yBm3ejLxAJGXtTHMXqw-ivc,44243
|
|
68
68
|
siibra/volumes/sparsemap.py,sha256=j41ozLSgKri68-KDsqo46gEs4lT4aYsf2yMF4l-ruCo,21752
|
|
69
69
|
siibra/volumes/volume.py,sha256=h_KrdDkpeoENnOrE7BlTZNXaZQGTrJXHX0eSyArxF-4,11667
|
|
70
|
-
siibra-0.
|
|
71
|
-
siibra-0.
|
|
72
|
-
siibra-0.
|
|
73
|
-
siibra-0.
|
|
74
|
-
siibra-0.
|
|
70
|
+
siibra-0.4a87.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
71
|
+
siibra-0.4a87.dist-info/METADATA,sha256=S41qxqi1gP5ETbJJ9jU5_DLL_n4Poo31Gu8o9N5vMGk,8525
|
|
72
|
+
siibra-0.4a87.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
|
73
|
+
siibra-0.4a87.dist-info/top_level.txt,sha256=NF0OSGLL0li2qyC7MaU0iBB5Y9S09_euPpvisD0-8Hg,7
|
|
74
|
+
siibra-0.4a87.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|