Skip to content
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

[ENH,REF] Adds new region_agg parameter #131

Merged
merged 14 commits into from
Nov 25, 2019
Merged

[ENH,REF] Adds new region_agg parameter #131

merged 14 commits into from
Nov 25, 2019

Conversation

rmarkello
Copy link
Owner

@rmarkello rmarkello commented Nov 22, 2019

Related to #125 (insomuch as it temporarily removes batch normalization as an option)

This adds the region_agg parameter (and renames metric to agg_metric) in the abagen.get_expression_data() function. This parameter controls how samples belonging to the same region are combined (i.e., [1] aggregated separately for each donor and then combined across donors or [2] aggregated across all donors simultaneously).

Also some minor updates to various typos and doc-strings throughout the package.

To Do:

  • Update Donor normalization doc page to highlight sample_norm vs donor_norm differences
  • Add new doc page to highlight region_agg and agg_metric options
  • Ensure all documentation between abagen.get_expression_data() and abagen CLI is up-to-date
  • Add tests for new functions in abagen.samples
  • Add tests for new parameters to abagen.get_expression_data and abagen CLI

@codecov
Copy link

codecov bot commented Nov 23, 2019

Codecov Report

Merging #131 into master will decrease coverage by 0.18%.
The diff coverage is 95.18%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #131      +/-   ##
==========================================
- Coverage   90.14%   89.95%   -0.19%     
==========================================
  Files          32       32              
  Lines        1959     1962       +3     
==========================================
- Hits         1766     1765       -1     
- Misses        193      197       +4
Impacted Files Coverage Δ
abagen/tests/test_correct.py 100% <ø> (ø) ⬆️
abagen/correct.py 98.24% <100%> (-0.94%) ⬇️
abagen/probes.py 97.27% <100%> (+0.21%) ⬆️
abagen/cli/run.py 93.47% <100%> (+0.29%) ⬆️
abagen/io.py 77.77% <100%> (ø) ⬆️
abagen/allen.py 97.22% <100%> (-0.76%) ⬇️
abagen/tests/cli/test_run.py 100% <100%> (ø) ⬆️
abagen/samples.py 96.26% <87.09%> (-2.78%) ⬇️
abagen/utils.py 93.38% <0%> (+0.82%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 253b691...0873fd1. Read the comment docs.

@codecov-io
Copy link

codecov-io commented Nov 25, 2019

Codecov Report

Merging #131 into master will increase coverage by 0.08%.
The diff coverage is 97.81%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #131      +/-   ##
==========================================
+ Coverage   90.14%   90.23%   +0.08%     
==========================================
  Files          32       32              
  Lines        1959     1996      +37     
==========================================
+ Hits         1766     1801      +35     
- Misses        193      195       +2
Impacted Files Coverage Δ
abagen/tests/test_correct.py 100% <ø> (ø) ⬆️
abagen/correct.py 98.24% <100%> (-0.94%) ⬇️
abagen/probes.py 97.27% <100%> (+0.21%) ⬆️
abagen/cli/run.py 93.47% <100%> (+0.29%) ⬆️
abagen/io.py 77.77% <100%> (ø) ⬆️
abagen/tests/cli/test_run.py 100% <100%> (ø) ⬆️
abagen/samples.py 100% <100%> (+0.95%) ⬆️
abagen/tests/test_samples.py 98.26% <95.55%> (-1.74%) ⬇️
abagen/allen.py 96.15% <96.42%> (-1.83%) ⬇️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 253b691...8de9e38. Read the comment docs.

Handling of annotation files wasn't being done correctly after I removed
`samples.update_samples` and merged the functionality into
`allen.get_expression_data()`
@rmarkello rmarkello merged commit fc91343 into master Nov 25, 2019
@rmarkello rmarkello deleted the sampcombo branch November 25, 2019 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants