Skip to content

Allowing the sl_rad parameter in searchlight to be 0 #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mihaic merged 4 commits into from
Oct 31, 2019
Merged

Allowing the sl_rad parameter in searchlight to be 0 #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06af0a2
allow sl_rad to be 0
Oct 18, 2019
c0797ef
delete unnecessary print function
Oct 18, 2019
d2747fd
just formatting
Oct 18, 2019
fc5d175
Merge branch 'master' into searchlight_sl_rad
mihaic Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions brainiak/searchlight/searchlight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ class Searchlight:
"""
def __init__(self, sl_rad=1, max_blk_edge=10, shape=Cube,
min_active_voxels_proportion=0):
assert sl_rad >= 0, 'sl_rad should not be negative'
assert max_blk_edge > 0, 'max_blk_edge should be positive'
self.sl_rad = sl_rad
self.max_blk_edge = max_blk_edge
self.min_active_voxels_proportion = min_active_voxels_proportion
Expand Down Expand Up @@ -534,9 +536,11 @@ def _singlenode_searchlight(l, msk, mysl_rad, bcast_var, extra_params):
voxel_fn = extra_params[0]
shape_mask = extra_params[1]
min_active_voxels_proportion = extra_params[2]
outmat = np.empty(msk.shape, dtype=np.object)[mysl_rad:-mysl_rad,
mysl_rad:-mysl_rad,
mysl_rad:-mysl_rad]
outmat = np.empty(msk.shape, dtype=np.object)
if mysl_rad > 0:
outmat = outmat[mysl_rad:-mysl_rad,
mysl_rad:-mysl_rad,
mysl_rad:-mysl_rad]
for i in range(0, outmat.shape[0]):
for j in range(0, outmat.shape[1]):
for k in range(0, outmat.shape[2]):
Expand Down
6 changes: 5 additions & 1 deletion tests/searchlight/test_searchlight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,10 @@ def voxel_test_sfn(l, msk, myrad, bcast):
def block_test_sfn(l, msk, myrad, bcast_var, extra_params):
outmat = l[0][:, :, :, 0]
outmat[~msk] = None
return outmat[myrad:-myrad, myrad:-myrad, myrad:-myrad]
if myrad == 0:
return outmat
else:
return outmat[myrad:-myrad, myrad:-myrad, myrad:-myrad]


def test_correctness(): # noqa: C901
Expand Down Expand Up @@ -286,6 +289,7 @@ def do_test(dim0, dim1, dim2, ntr, nsubj, max_blk_edge, rad):
block_test(data, mask, max_blk_edge, rad)

do_test(dim0=7, dim1=5, dim2=9, ntr=5, nsubj=1, max_blk_edge=4, rad=1)
do_test(dim0=7, dim1=5, dim2=9, ntr=5, nsubj=1, max_blk_edge=4, rad=0)
do_test(dim0=7, dim1=5, dim2=9, ntr=5, nsubj=5, max_blk_edge=4, rad=1)
do_test(dim0=1, dim1=5, dim2=9, ntr=5, nsubj=5, max_blk_edge=4, rad=1)
do_test(dim0=0, dim1=10, dim2=8, ntr=5, nsubj=5, max_blk_edge=4, rad=1)
Expand Down