Skip to content

/ brainiak

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.

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

Jump to bottom

add ball shape searchlight #348

Merged
merged 4 commits into from Mar 23, 2018
Merged

add ball shape searchlight #348

merged 4 commits into from Mar 23, 2018

Conversation

@lcnature
Copy link
Contributor

@lcnature lcnature commented Mar 22, 2018

No description provided.

Mingbo Cai
add ball shape searchlight
Loading status checks…
e0d4b26
@mjanderson09
Copy link
Contributor

@mjanderson09 mjanderson09 commented Mar 22, 2018

Looks good!

(Pdb) print(b.mask_[3,:])
[[False False False False False False False False False False False]
[False False False True True True True True False False False]
[False False True True True True True True True False False]
[False True True True True True True True True True False]
[False True True True True True True True True True False]
[False True True True True True True True True True False]
[False True True True True True True True True True False]
[False True True True True True True True True True False]
[False False True True True True True True True False False]
[False False False True True True True True False False False]
[False False False False False False False False False False False]]
@mjanderson09
mjanderson09 approved these changes Mar 22, 2018
View changes
@mihaic
mihaic requested changes Mar 22, 2018
View changes
brainiak/searchlight/searchlight.py Outdated
@@ -95,6 +95,32 @@ def __init__(self, rad):
self.mask_[r1, r2, r3] = True


class Ball(Shape):
"""Diamond

This comment has been minimized.

Sign in to view
@mihaic

mihaic Mar 22, 2018
Contributor

"Ball searchlight shape"?
Mingbo Cai
update Ball shape docstring
Loading status checks…
1a93517
@mihaic
mihaic approved these changes Mar 22, 2018
View changes
Mingbo Cai
I think Diamond also chooses voxels with Manhattan distnace of equal …
Loading status checks…
65c94d9 
…to or less than rad instead of just less than. So I just updated the docstring slightly. Please double check this is correct
@mihaic
Copy link
Contributor

@mihaic mihaic commented Mar 22, 2018

@lcnature, regardless of your off-by-one question (@mjanderson09?), please add unit tests for the new Ball class to pass the coverage check.
Mingbo Cai
added check for Ball searchlight
Loading status checks…
5daeb33
@lcnature
Copy link
Contributor Author

@lcnature lcnature commented Mar 22, 2018

@mihaic Done. Thanks!
@mihaic mihaic merged commit 83e6cf7 into brainiak:master Mar 23, 2018
5 checks passed
5 checks passed
codecov/patch 100% of diff hit (target 88.34%)
Details
codecov/project 88.48% (+0.14%) compared to 0b3db59
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
linux Build finished.
Details
macos Build finished.
Details
@mihaic
Copy link
Contributor

@mihaic mihaic commented Mar 23, 2018

Thanks, @lcnature. I am sure your Ball shape will be very popular.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaic mihaic

@mjanderson09 mjanderson09

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@lcnature @mjanderson09 @mihaic