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

[FIX] improve support for F statistics in compute_fixed_effects #3203

Merged
merged 38 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6f0ccb3
fixed compute_fixed_effects for F contrasts
bthirion Mar 26, 2022
8c6bcd5
tests pass
bthirion Mar 30, 2022
313506d
pep8
bthirion Mar 31, 2022
cf7de55
added tests
bthirion Sep 16, 2022
918fdfe
ci fixe
bthirion Sep 16, 2022
61e5c6f
Update nilearn/glm/contrasts.py
bthirion Sep 26, 2022
fbd9ef5
Update nilearn/glm/contrasts.py
bthirion Sep 26, 2022
05b747a
fixed argument name in docstring
bthirion Sep 26, 2022
5fbbc04
Applying suggestions
bthirion Mar 1, 2023
e3cfa74
Apply suggestions from code review
Remi-Gau Apr 26, 2023
436e7b1
Apply suggestions from code review
Remi-Gau Apr 26, 2023
77ce231
Apply suggestions from code review
Remi-Gau Apr 26, 2023
fbb4f77
Apply suggestions from code review
Remi-Gau Apr 26, 2023
409f5c1
flake8
Remi-Gau Apr 26, 2023
63800c6
Apply suggestions from code review
Remi-Gau Apr 26, 2023
7074c60
starting a refactoring
bthirion May 9, 2023
78798e5
Fixing tests
bthirion Sep 13, 2023
3266ba6
Update nilearn/glm/contrasts.py
bthirion Sep 20, 2023
0cd72c2
started to address comments
bthirion Sep 20, 2023
3742c05
Merge branch 'fix-fixed-effects' of github.com:bthirion/nilearn into …
bthirion Sep 20, 2023
068e735
added futurewarning
bthirion Sep 20, 2023
6c6d7a4
applied black/isort
bthirion Sep 21, 2023
a807805
Update nilearn/glm/contrasts.py
bthirion Sep 21, 2023
2017abf
Update nilearn/glm/contrasts.py
bthirion Sep 21, 2023
e24e6cc
Update nilearn/glm/contrasts.py
bthirion Sep 21, 2023
35fc460
Update nilearn/glm/tests/test_contrasts.py
bthirion Sep 21, 2023
1879a73
Removed False option for dofs
bthirion Sep 21, 2023
a7dee67
Fixed wrong docstring
bthirion Sep 21, 2023
e055954
increasing coverage
bthirion Sep 22, 2023
b66d7b4
applied black
bthirion Sep 22, 2023
89767cc
fixed flake8
bthirion Sep 22, 2023
2c935ed
Apply suggestions from code review
Remi-Gau Sep 22, 2023
5488a79
updated pyproject and pre-commit-config
bthirion Sep 23, 2023
e4bc43e
black reformatting
bthirion Sep 24, 2023
a3dba6e
docs fix + whatsnew
bthirion Sep 25, 2023
e93a754
Update nilearn/glm/contrasts.py
bthirion Sep 27, 2023
f4d415d
Update nilearn/glm/contrasts.py
ymzayek Sep 27, 2023
961bd81
Update nilearn/glm/contrasts.py
ymzayek Sep 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ exclude: |
| nilearn/_utils/data_gen.py
| nilearn/reporting/html_report.py
| nilearn/reporting/tests/test_html_report.py
| nilearn/glm/contrasts.py
| nilearn/glm/tests/test_contrasts.py
| nilearn/glm/tests/test_first_level.py
| nilearn/interfaces/fmriprep/load_confounds_compcor.py
| nilearn/interfaces/fmriprep/tests/test_load_confounds_utils.py
| nilearn/interfaces/fmriprep/tests/test_load_confounds_strategy.py
Expand Down
2 changes: 2 additions & 0 deletions doc/changes/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ Enhancements

- Improve ``generate_report`` method of maskers by allowing users to pass a cmap argument for plotting image (:gh:`3897` by `Yasmin Mzayek`_)

- Improve ``contrasts`` allowing fixed effects on F contrasts (:gh:`3203` by `Bertrand Thirion`_)

Changes
-------

Expand Down