[ENH] Refactor Functional Connectivity based markers #107

Merged

synchon merged 17 commits from refactor/fc-markers into main 2023-01-10 08:55:29 +00:00

Conversation 3 Commits 17 Files changed 13 +241 -219

synchon commented 2023-01-03 13:52:14 +00:00 (Migrated from github.com)

Copy link

We have code duplication in FunctionalConnectivity and FunctionalConnectivitySpheres and it would be better if we refactor them into superclass and subclasses as other markers like ReHo and (f)ALFF would also be FC based.

We have code duplication in `FunctionalConnectivity` and `FunctionalConnectivitySpheres` and it would be better if we refactor them into superclass and subclasses as other markers like `ReHo` and `(f)ALFF` would also be FC based.

github-actions[bot] commented 2023-01-03 13:57:13 +00:00 (Migrated from github.com)

Copy link

PR Preview Action v1.2.0
Preview removed because the pull request was closed.
2023-01-10 08:59 UTC

[PR Preview Action](https://github.com/rossjrw/pr-preview-action) v1.2.0 :---: Preview removed because the pull request was closed. 2023-01-10 08:59 UTC <!-- Sticky Pull Request Commentpr-preview -->

codecov[bot] commented 2023-01-03 14:08:53 +00:00 (Migrated from github.com)

Copy link

Codecov Report

Merging #107 (08bfd36) into main (5539cfc) will decrease coverage by 0.05%.
The diff coverage is 98.07%.

@@            Coverage Diff             @@
##             main     #107      +/-   ##
==========================================
- Coverage   93.47%   93.41%   -0.06%     
==========================================
  Files          71       73       +2     
  Lines        2804     2794      -10     
  Branches      503      502       -1     
==========================================
- Hits         2621     2610      -11     
- Misses        124      125       +1     
  Partials       59       59              

Flag	Coverage Δ
docs	100.00% <ø> (ø)
junifer	93.40% <98.07%> (-0.06%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
junifer/markers/falff/falff_parcels.py	100.00% <ø> (ø)
...ional_connectivity/functional_connectivity_base.py	97.05% <93.33%> (ø)
junifer/markers/__init__.py	100.00% <100.00%> (ø)
...unifer/markers/functional_connectivity/__init__.py	100.00% <100.00%> (ø)
...ivity/crossparcellation_functional_connectivity.py	100.00% <100.00%> (ø)
...al_connectivity/functional_connectivity_parcels.py	100.00% <100.00%> (ø)
...al_connectivity/functional_connectivity_spheres.py	100.00% <100.00%> (ø)

# [Codecov](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml) Report > Merging [#107](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml) (08bfd36) into [main](https://codecov.io/gh/juaml/junifer/commit/5539cfc27cbbfa2301d72fc9a53275a5afaeeb0c?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml) (5539cfc) will **decrease** coverage by `0.05%`. > The diff coverage is `98.07%`. [](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml) ```diff @@ Coverage Diff @@ ## main #107 +/- ## ========================================== - Coverage 93.47% 93.41% -0.06% ========================================== Files 71 73 +2 Lines 2804 2794 -10 Branches 503 502 -1 ========================================== - Hits 2621 2610 -11 - Misses 124 125 +1 Partials 59 59 ``` | Flag | Coverage Δ | | |---|---|---| | docs | `100.00% <ø> (ø)` | | | junifer | `93.40% <98.07%> (-0.06%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#carryforward-flags-in-the-pull-request-comment) to find out more. | [Impacted Files](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml) | Coverage Δ | | |---|---|---| | [junifer/markers/falff/falff\_parcels.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL2ZhbGZmL2ZhbGZmX3BhcmNlbHMucHk=) | `100.00% <ø> (ø)` | | | [...ional\_connectivity/functional\_connectivity\_base.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5L2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5X2Jhc2UucHk=) | `97.05% <93.33%> (ø)` | | | [junifer/markers/\_\_init\_\_.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL19faW5pdF9fLnB5) | `100.00% <100.00%> (ø)` | | | [...unifer/markers/functional\_connectivity/\_\_init\_\_.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5L19faW5pdF9fLnB5) | `100.00% <100.00%> (ø)` | | | [...ivity/crossparcellation\_functional\_connectivity.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5L2Nyb3NzcGFyY2VsbGF0aW9uX2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5LnB5) | `100.00% <100.00%> (ø)` | | | [...al\_connectivity/functional\_connectivity\_parcels.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5L2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5X3BhcmNlbHMucHk=) | `100.00% <100.00%> (ø)` | | | [...al\_connectivity/functional\_connectivity\_spheres.py](https://codecov.io/gh/juaml/junifer/pull/107?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=juaml#diff-anVuaWZlci9tYXJrZXJzL2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5L2Z1bmN0aW9uYWxfY29ubmVjdGl2aXR5X3NwaGVyZXMucHk=) | `100.00% <100.00%> (ø)` | |

fraimondo (Migrated from github.com) approved these changes 2023-01-10 08:43:08 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

fraimondo

Labels

Clear labels   

CRITICAL

High Priority Issue

  

Stale

  

WIP

Work in progress

  

bug

Something isn't working

  

concept

Design/Implementation concepts

  

coordinate

Issues or pull requests related to coordinates (ROIs)

  

dataset

Issues or pull requests related to datagrabbers or datasets

  

dependencies

Pull requests that update a dependency file

  

documentation

Improvements or additions to documentation

  

duplicate

This issue or pull request already exists

  

enhancement

New feature or request

  

github_actions

Pull requests that update GitHub Actions code

  

good first issue

Good for newcomers

  

help wanted

Extra attention is needed

  

invalid

This doesn't seem right

  

maintenance

Issues or pull requests related to maintenance

  

maps

Issues or pull requests related to maps (probabilistic atlases)

  

marker

Issues or pull requests related to markers

  

mask

Issues or pull requests related to masks

  

on hold

Issue waiting on other issue(s)

  

parcellation

Issues or pull requests related to parcellations (deterministic atlases)

  

preprocess

Issues or pull requests related to preprocessors

  

question

Further information is requested

  

ready

Pull request is ready for review and merge

  

storage

Issues or pull requests related to marker storage or retrieval

  

template-space

Issues or pull requests related to template spaces

  

triage

New issues waiting to be reviewed

  

wontfix

This will not be worked on

No labels

CRITICAL

Stale

WIP

bug

concept

coordinate

dataset

dependencies

documentation

duplicate

enhancement

github_actions

good first issue

help wanted

invalid

maintenance

maps

marker

mask

on hold

parcellation

preprocess

question

ready

storage

template-space

triage

wontfix

Milestone

Clear milestone

No items

No milestone

0.0.2 (alpha 1)

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

juaml/junifer!107

No description provided.