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

[REF] Reorganize submodules #225

Merged
merged 13 commits into from
May 24, 2020
Merged

[REF] Reorganize submodules #225

merged 13 commits into from
May 24, 2020

Conversation

tsalo
Copy link
Member

@tsalo tsalo commented May 24, 2020

Closes None. References #220.

Changes proposed in this pull request:

  • Move annotate submodules up a level.
  • Consolidate Correctors and base class in one file.
  • Remove model-based CBMA file. The current skeleton does not reflect what will ultimately be added to NiMARE.
  • Remove Decoder base class. Our decoders are currently all functions.
  • Change KernelTransformer argument "masked" to "return_type" to match MetaResult
  • Fix thresholding bug in ALESubtraction and simplify interface
    • No meaningful threshold was being applied in the ALESubtraction. This change applies the threshold with a new parameter and allows users to simply provide the map name instead of the actual maps.

@codecov
Copy link

codecov bot commented May 24, 2020

Codecov Report

Merging #225 into master will decrease coverage by 0.41%.
The diff coverage is 93.08%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #225      +/-   ##
==========================================
- Coverage   61.06%   60.64%   -0.42%     
==========================================
  Files          71       65       -6     
  Lines        4418     4498      +80     
==========================================
+ Hits         2698     2728      +30     
- Misses       1720     1770      +50     
Impacted Files Coverage Δ
nimare/annotate/utils.py 100.00% <ø> (ø)
nimare/decode/continuous.py 38.59% <ø> (ø)
nimare/decode/discrete.py 22.96% <ø> (ø)
nimare/decode/encode.py 82.75% <ø> (ø)
nimare/meta/cbma/__init__.py 100.00% <ø> (ø)
nimare/meta/cbma/peaks2maps.py 1.75% <ø> (ø)
nimare/meta/cbma/kernel.py 76.54% <70.37%> (-1.03%) ⬇️
nimare/meta/cbma/mkda.py 90.52% <88.88%> (ø)
nimare/meta/cbma/ale.py 93.35% <92.85%> (+0.30%) ⬆️
nimare/annotate/__init__.py 100.00% <100.00%> (ø)
... and 13 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 96c0c0c...02a6906. Read the comment docs.

tsalo added 5 commits May 24, 2020 10:56
No meaningful threshold was being applied in the ALESubtraction. This
change applies the threshold with a new parameter *and* allows users to
simply provide the map name instead of the actual maps.
@tsalo tsalo merged commit c380acb into neurostuff:master May 24, 2020
@tsalo tsalo deleted the docs/more-docs branch May 24, 2020 15:41
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.

1 participant