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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 38 commits into from
Sep 28, 2023
Merged

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

merged 38 commits into from
Sep 28, 2023

Commits on Sep 13, 2023

  1. fixed compute_fixed_effects for F contrasts

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    6f0ccb3 View commit details
    Browse the repository at this point in the history

  2. tests pass

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    8c6bcd5 View commit details
    Browse the repository at this point in the history

  3. pep8

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    313506d View commit details
    Browse the repository at this point in the history

  4. added tests

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    cf7de55 View commit details
    Browse the repository at this point in the history

  5. ci fixe

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    918fdfe View commit details
    Browse the repository at this point in the history

  6. Update nilearn/glm/contrasts.py 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @bthirion @ymzayek
    bthirion and ymzayek committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    61e5c6f View commit details
    Browse the repository at this point in the history

  7. Update nilearn/glm/contrasts.py 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @bthirion @ymzayek
    bthirion and ymzayek committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    fbd9ef5 View commit details
    Browse the repository at this point in the history

  8. fixed argument name in docstring

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    05b747a View commit details
    Browse the repository at this point in the history

  9. Applying suggestions

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    5fbbc04 View commit details
    Browse the repository at this point in the history

  10. Apply suggestions from code review

    @Remi-Gau @bthirion
    Remi-Gau authored and bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    e3cfa74 View commit details
    Browse the repository at this point in the history

  11. Apply suggestions from code review

    @Remi-Gau @bthirion
    Remi-Gau authored and bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    436e7b1 View commit details
    Browse the repository at this point in the history

  12. Apply suggestions from code review

    @Remi-Gau @bthirion
    Remi-Gau authored and bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    77ce231 View commit details
    Browse the repository at this point in the history

  13. Apply suggestions from code review

    @Remi-Gau @bthirion
    Remi-Gau authored and bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    fbb4f77 View commit details
    Browse the repository at this point in the history

  14. flake8

    @Remi-Gau @bthirion
    Remi-Gau authored and bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    409f5c1 View commit details
    Browse the repository at this point in the history

  15. Apply suggestions from code review 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @Remi-Gau @ymzayek @bthirion
    2 people authored and bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    63800c6 View commit details
    Browse the repository at this point in the history

  16. starting a refactoring

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    7074c60 View commit details
    Browse the repository at this point in the history

  17. Fixing tests

    @bthirion
    bthirion committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    78798e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Update nilearn/glm/contrasts.py 

    Co-authored-by: Remi Gau <remi_gau@hotmail.com>
    @bthirion @Remi-Gau
    bthirion and Remi-Gau committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    3266ba6 View commit details
    Browse the repository at this point in the history

  2. started to address comments

    @bthirion
    bthirion committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    0cd72c2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fix-fixed-effects' of github.com:bthirion/nilearn into … 

    …fix-fixed-effects
    @bthirion
    bthirion committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    3742c05 View commit details
    Browse the repository at this point in the history

  4. added futurewarning

    @bthirion
    bthirion committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    068e735 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. applied black/isort

    @bthirion
    bthirion committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    6c6d7a4 View commit details
    Browse the repository at this point in the history

  2. Update nilearn/glm/contrasts.py 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @bthirion @ymzayek
    bthirion and ymzayek committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a807805 View commit details
    Browse the repository at this point in the history

  3. Update nilearn/glm/contrasts.py 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @bthirion @ymzayek
    bthirion and ymzayek committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    2017abf View commit details
    Browse the repository at this point in the history

  4. Update nilearn/glm/contrasts.py 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @bthirion @ymzayek
    bthirion and ymzayek committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    e24e6cc View commit details
    Browse the repository at this point in the history

  5. Update nilearn/glm/tests/test_contrasts.py 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @bthirion @ymzayek
    bthirion and ymzayek committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    35fc460 View commit details
    Browse the repository at this point in the history

  6. Removed False option for dofs

    @bthirion
    bthirion committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    1879a73 View commit details
    Browse the repository at this point in the history

  7. Fixed wrong docstring

    @bthirion
    bthirion committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    a7dee67 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. increasing coverage

    @bthirion
    bthirion committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    e055954 View commit details
    Browse the repository at this point in the history

  2. applied black

    @bthirion
    bthirion committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    b66d7b4 View commit details
    Browse the repository at this point in the history

  3. fixed flake8

    @bthirion
    bthirion committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    89767cc View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
    @Remi-Gau @ymzayek
    Remi-Gau and ymzayek committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    2c935ed View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. updated pyproject and pre-commit-config

    @bthirion
    bthirion committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    5488a79 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. black reformatting

    @bthirion
    bthirion committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    e4bc43e View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. docs fix + whatsnew

    @bthirion
    bthirion committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    a3dba6e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Update nilearn/glm/contrasts.py 

    Co-authored-by: Remi Gau <remi_gau@hotmail.com>
    @bthirion @Remi-Gau
    bthirion and Remi-Gau committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    e93a754 View commit details
    Browse the repository at this point in the history

  2. Update nilearn/glm/contrasts.py

    @ymzayek
    ymzayek committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    f4d415d View commit details
    Browse the repository at this point in the history

  3. Update nilearn/glm/contrasts.py

    @ymzayek
    ymzayek committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    961bd81 View commit details
    Browse the repository at this point in the history