-
Notifications
You must be signed in to change notification settings - Fork 12
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 smoothness metric #72
Draft
hugofluhr
wants to merge
8
commits into
MIPLabCH:master
Choose a base branch
from
hugofluhr:enh/smoothness
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3d4761b
[enh]-added smoothness metric and test
hugofluhr af2c427
fixed name of test fct
hugofluhr 1ce603d
reformat
hugofluhr c1ed943
added citations for smoothness
hugofluhr a8ecda6
add smoothness to CLI and supported metrics
hugofluhr f51ddd7
fixed typo
hugofluhr 1b4d091
Merge branch 'MIPLabCH:master' into enh/smoothness
hugofluhr 854c047
additional tests for different inputs
hugofluhr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -72,6 +72,16 @@ def test_gsdi(): | |
assert (gsdi_out["beta_over_alpha"] == gsdi_in).all() | ||
|
||
|
||
def test_smoothness(): | ||
signal = rand(10, 2) | ||
laplacian = rand(10, 10) | ||
|
||
expected_smoothness = np.dot(signal.T, np.dot(laplacian, signal)) | ||
computed_smoothness = metrics.smoothness(laplacian, signal) | ||
|
||
assert (expected_smoothness == computed_smoothness).all() | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can add an assert here with Or use chatGPT 🤣 |
||
|
||
# ### Break tests | ||
def test_break_sdi(): | ||
ts1 = np.arange(1, 3)[..., np.newaxis] | ||
|
@@ -124,3 +134,29 @@ def test_functional_connectivity(): | |
|
||
for k in fcd.keys(): | ||
assert (fcd[k] == np.corrcoef(tsd[k])).all() | ||
|
||
|
||
def test_break_smoothness(): | ||
# shape of signal | ||
signal = rand(3, 3, 3) | ||
laplacian = rand(3, 3) | ||
|
||
with raises(ValueError) as errorinfo: | ||
metrics.smoothness(laplacian, signal) | ||
assert "should be a 2D" in str(errorinfo.value) | ||
|
||
# shape of laplacian | ||
signal = rand(10, 2) | ||
laplacian = rand(10, 9) | ||
|
||
with raises(ValueError) as errorinfo: | ||
metrics.smoothness(laplacian, signal) | ||
assert "a square matrix" in str(errorinfo.value) | ||
|
||
# shape mismatch | ||
signal = rand(10, 2) | ||
laplacian = rand(9, 9) | ||
|
||
with raises(ValueError) as errorinfo: | ||
metrics.smoothness(laplacian, signal) | ||
assert "don't match" in str(errorinfo.value) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeaaaah... Do you remember when your function was one line? Now you understand the pain of the Sdev...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes definitely, thanks for the guidance and regular feedback!