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

add ball shape searchlight #348

Merged
merged 4 commits into from Mar 23, 2018

Conversation

Projects
None yet
3 participants
@lcnature
Contributor

lcnature commented Mar 22, 2018

No description provided.

Mingbo Cai
@mjanderson09

This comment has been minimized.

Contributor

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]]

@@ -95,6 +95,32 @@ def __init__(self, rad):
self.mask_[r1, r2, r3] = True
class Ball(Shape):
"""Diamond

This comment has been minimized.

@mihaic

mihaic Mar 22, 2018

Contributor

"Ball searchlight shape"?

Mingbo Cai
@mihaic

mihaic approved these changes Mar 22, 2018

Mingbo Cai
I think Diamond also chooses voxels with Manhattan distnace of equal …
…to or less than rad instead of just less than. So I just updated the docstring slightly. Please double check this is correct
@mihaic

This comment has been minimized.

Contributor

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
@lcnature

This comment has been minimized.

Contributor

lcnature commented Mar 22, 2018

@mihaic Done. Thanks!

@mihaic mihaic merged commit 83e6cf7 into brainiak:master Mar 23, 2018

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

This comment has been minimized.

Contributor

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