-
Notifications
You must be signed in to change notification settings - Fork 6
Add WatershedLungspace class #418
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
Merged
Merged
Changes from 48 commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
c5bca1f
Limit version of pytest
psomhorst e4ff11d
Set stack level and type of warnings
psomhorst ddffe25
Add subtraction to PixelMask class
psomhorst 287a1ad
Add support for PixelMask plotting in PixelMap plotting
psomhorst 9e33fb0
Add function to get summed impedance to EITData
psomhorst 3248b61
Rename absolute argument to use_magnitude and add fraction_of_max arg…
psomhorst 27905b3
Add captures to PixelMap.apply
psomhorst 5aa5e0c
Add IntegerMap including PlotConfig
psomhorst dfc27bf
Add to_..._array convenience methods to PixelMap
psomhorst 7291afd
Add default PixelMapPlotConfig to registry
psomhorst 5734478
Update deprecated function name
psomhorst cac298c
Add PixelMask.values alias to .mask
psomhorst d43f8ff
Add PixelMask.shape property
psomhorst ca952fb
Add __eq__ method to check equivalence of PixelMasks
psomhorst 1fc168b
Replace fixed default masks with generated masks, based on shape
psomhorst f24510b
Add contour and surface plots to PixelMap
psomhorst bdb9b1c
Update tests for PixelMasks
psomhorst 513f28b
Update tests for PixelMap
psomhorst 23cb2bb
Add option for simulated data to Vendor
psomhorst 69f5c2b
Add WatershedLungspace class and accompanying tests
psomhorst c69dea0
Add notebook with Watershed demonstration
psomhorst 5bac9b0
Add watershed and notebook to documentation
psomhorst a67d7fe
Update PixelMaskCollection tests to use real EITData
psomhorst 4e0ff70
Improve IntegerMap with dtype class variable and lossless conversion …
psomhorst dff9811
Add test value conversion at init
psomhorst 207321f
Update IntegerMap plot config
psomhorst 251e48d
Update notebook to show integer map plotting
psomhorst 48b3dc9
Update to_boolean_array to optionally keep zero values as True
psomhorst d6e6cb4
Update pixelmap tests
psomhorst 17a8530
Add check for no markers inside TIV mask
psomhorst 90a8b34
Fix issue where BreathDetection fails if no peaks are found
psomhorst 672e47d
Raise error if no breaths are found in breath detection
psomhorst 7e82552
Add test for watershed with no amplitude
psomhorst 95af7b4
Add test for captures
psomhorst b3aa395
Fix langauge issues
psomhorst c85340e
Add TIVLungspace class
psomhorst f2fb3a6
Add tests for TIVLungspace class
psomhorst 0ae5e52
Add TIV lungspace to docs
psomhorst 6eacd1b
Use TIVLungspace in WatershedLungspace
psomhorst fedebb7
Add AmplitudeMap, AmplitudeMapPlotConfig
psomhorst 8a1812a
Update notebook to show AmplitudeMap
psomhorst 9d69897
Create separate AmplitudeLungspace class, and remove modes from TIVLu…
psomhorst a9042fe
Update documentation for AmplitudeLungspace
psomhorst 1f0aaa6
Update Watershed to use AmplitudeLungspace
psomhorst dd072d5
Re-add warning for AmplitudeLungspace
psomhorst 1c56417
Update tests for AmplitudeLungspace
psomhorst 8abfd6c
Add comment about test coverage
psomhorst 1b434c3
Add AmplitudeMap and IntegerMap to pixelmap docs
psomhorst 93c9a7e
Fix typo
psomhorst 51b42ef
Only consider pixels that are not all-NaN when aggregating
psomhorst 3daeba8
Suppress zero warning when subtracting masks
psomhorst b909af1
Add exception when trying to normalize a all-NaN PixelMap
psomhorst 650c5f2
Add explicit check for all-NaN values
psomhorst 9c33751
Catch or prevent warnings in tests
psomhorst f45fc39
Test butterworth filters with apply instead of deprecated apply_filter
psomhorst 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ::: eitprocessing.roi.tiv.TIVLungspace | ||
|
|
||
| ::: eitprocessing.roi.amplitude.AmplitudeLungspace |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ::: eitprocessing.roi.watershed.WatershedLungspace |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Is this for summing impedance within a ROI? Is it necessary to have a separate calculate_global_impedance then? Or I would remove the word "included" in the docstring for calculate_global_impedance since that suggests that there is some sort of selection as well.
Uh oh!
There was an error while loading. Please reload this page.
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.
The idea is that
get_summed_impedancewill replace the function ofcalculate_global_impedance. However, for now,calculate_global_impedanceis used to calculate the global impedance of the raw signal. The idea is to markcalculate_global_impedanceas deprecated in a future version, and remove it altogether in a later version.Do you think we should already mark it deprecated in this PR?It is not a good idea to make it deprecated in this PR, because it wil result in a DeprecationWarning every time you load EIT data.