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

Add Parcel and Searchlight Hyperalignment methods #74

Merged
merged 77 commits into from
Mar 11, 2024
Merged

Add Parcel and Searchlight Hyperalignment methods #74

merged 77 commits into from
Mar 11, 2024

Commits on Dec 7, 2023

  1. add: Feilong's Hyperalignment method in TemplateAlignment

    Denis Fouchard committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3042dd7 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. adding pcha and slha

    Denis Fouchard committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    b538a93 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. edit pyproject.toml

    Denis Fouchard committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    baa8995 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. rework hyperalignment incorporation

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    c0995b2 View commit details
    Browse the repository at this point in the history

  2. fix ot/ott import problems

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    4ce6f10 View commit details
    Browse the repository at this point in the history

  3. fix: rm hyperalignment requirements and fix tests

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    21201dd View commit details
    Browse the repository at this point in the history

  4. fix: doc

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    15078fd View commit details
    Browse the repository at this point in the history

  5. fix: delete procrustes.py

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    12fe4a8 View commit details
    Browse the repository at this point in the history

  6. fix: minor fixes to template

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    8a14eed View commit details
    Browse the repository at this point in the history

  7. fix: rm dss variable (strange name)

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    a0295ea View commit details
    Browse the repository at this point in the history

  8. black formating

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    16bde56 View commit details
    Browse the repository at this point in the history

  9. fix: memory issues

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    3d68576 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into hyperalignment

    @denisfouchard
    denisfouchard authored Jan 3, 2024
    Configuration menu
    Copy the full SHA
    85b848a View commit details
    Browse the repository at this point in the history

  11. rm all refs to the hyperalignment package

    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    b25f905 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'hyperalignment' of github.com:denisfouchard/fmralign in… 

    …to hyperalignment
    Denis Fouchard committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    1e3c9c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. PR adjustments

    Denis Fouchard committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    f034a55 View commit details
    Browse the repository at this point in the history

  2. fix imports

    Denis Fouchard committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    a0fd075 View commit details
    Browse the repository at this point in the history

  3. add docstring to int

    Denis Fouchard committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    fde7b3e View commit details
    Browse the repository at this point in the history

  4. remove shady variable names

    Denis Fouchard committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    5d08ebd View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. add: toy experiment + more precise test with correlation

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    49ed356 View commit details
    Browse the repository at this point in the history

  2. fixed doc and argumets

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    45dd245 View commit details
    Browse the repository at this point in the history

  3. add int plot and better int testing

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    1d431c8 View commit details
    Browse the repository at this point in the history

  4. citing Feilong

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    a74f0a8 View commit details
    Browse the repository at this point in the history

  5. remove caching (might add joblib caching later)

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    40af9b8 View commit details
    Browse the repository at this point in the history

  6. better naming and doc

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    c788ffa View commit details
    Browse the repository at this point in the history

  7. improve doc

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    9cb5e50 View commit details
    Browse the repository at this point in the history

  8. fix tests

    Denis Fouchard committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    f6a3950 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Delete any reference to Feilong Ma #streisandeffect

    Denis Fouchard committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    2fd46d3 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. bug fixes + rm tqdm dependency

    Denis Fouchard committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e35c01b View commit details
    Browse the repository at this point in the history

  2. bug fixes + interesting results

    Denis Fouchard committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    4a8ddaa View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. rm ref to ha in template alignment

    Denis Fouchard committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    dbf694e View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. fix searchlight toy

    Denis Fouchard committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    e78747a View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. better doc and parameters

    Denis Fouchard committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    027154b View commit details
    Browse the repository at this point in the history

  2. fix nilearn depreciation

    Denis Fouchard committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    de8cf24 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'hyperalignment' of https://github.com/denisfouchard/fmr… 

    …align into hyperalignment
    Denis Fouchard committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    391d5ff View commit details
    Browse the repository at this point in the history

  4. fix experiments + add return betas to ridge

    Denis Fouchard committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0e71995 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'hyperalignment' of github.com:denisfouchard/fmralign in… 

    …to hyperalignment
    Denis Fouchard committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    f85b1c6 View commit details
    Browse the repository at this point in the history

  6. Add _ridge function for ridge regression

    FOUCHARD Denis committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    9b38655 View commit details
    Browse the repository at this point in the history

  7. Fix indentation in piece_ridge function

    FOUCHARD Denis committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1ee469c View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. some tweaks

    Denis Fouchard committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    29faee8 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Merge branch 'main' into hyperalignment

    @denisfouchard
    denisfouchard authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    8dafa40 View commit details
    Browse the repository at this point in the history

  2. fix INT plot and last tweaks

    FOUCHARD Denis committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    890e4a1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'hyperalignment' of github.com:denisfouchard/fmralign in… 

    …to hyperalignment
    FOUCHARD Denis committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    8d00cce View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2024

  1. Merging and correcting PR remarks

    Denis Fouchard committed Feb 13, 2024
    Configuration menu
    Copy the full SHA
    e38a144 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Merge branch 'main' into hyperalignment

    @denisfouchard
    denisfouchard authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    fdebc78 View commit details
    Browse the repository at this point in the history

  2. Update examples/plot_int_alignment.py 

    Co-authored-by: Pierre-Louis Barbarant <[email protected]>
    @denisfouchard @pbarbarant
    denisfouchard and pbarbarant authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    b207f61 View commit details
    Browse the repository at this point in the history

  3. some fixes

    Denis Fouchard committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    cbbd37e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'hyperalignment' of https://github.com/denisfouchard/fmr… 

    …align into hyperalignment
    Denis Fouchard committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    6a7997a View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Adressing latest PR comments

    @emdupre
    emdupre authored and FOUCHARD Denis committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    41d243a View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Update examples/plot_int_alignment.py 

    Co-authored-by: Elizabeth DuPre <[email protected]>
    @denisfouchard @emdupre
    denisfouchard and emdupre authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    9b11b86 View commit details
    Browse the repository at this point in the history

  2. Update fmralign/alignment_methods.py 

    Co-authored-by: Elizabeth DuPre <[email protected]>
    @denisfouchard @emdupre
    denisfouchard and emdupre authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    ace93e4 View commit details
    Browse the repository at this point in the history

  3. Adressing first part of reviews

    FOUCHARD Denis committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    ac39ced View commit details
    Browse the repository at this point in the history

  4. fix more doc

    FOUCHARD Denis committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    5853656 View commit details
    Browse the repository at this point in the history

  5. fix stimulus + fix doc

    FOUCHARD Denis committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    c1fc200 View commit details
    Browse the repository at this point in the history

  6. adressing plot code issues

    FOUCHARD Denis committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    ffd13ac View commit details
    Browse the repository at this point in the history

  7. better variable names

    FOUCHARD Denis committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    eb4a8df View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. delete useless srm experiment (should already be in templateAlignment… 

    … anyway)
    FOUCHARD Denis committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    5bc1482 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. fix linting issues

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    8e691e4 View commit details
    Browse the repository at this point in the history

  2. adressing other PR comments

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a9a329d View commit details
    Browse the repository at this point in the history

  3. Fix typo in flavor parameter description

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    4074bf9 View commit details
    Browse the repository at this point in the history

  4. update int tests

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    008422e View commit details
    Browse the repository at this point in the history

  5. Better rst in alignment_methods.py

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    8fd6863 View commit details
    Browse the repository at this point in the history

  6. Update fmralign/hyperalignment/correlation.py 

    Co-authored-by: bthirion <[email protected]>
    @denisfouchard @bthirion
    denisfouchard and bthirion authored Feb 26, 2024
    Configuration menu
    Copy the full SHA
    dad2a61 View commit details
    Browse the repository at this point in the history

  7. PR comments adress

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    923f100 View commit details
    Browse the repository at this point in the history

  8. Refactor dissimilarity measure in matrix_MDS function

    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a70b4a8 View commit details
    Browse the repository at this point in the history

  9. Refactor test_hyperalignment.py to include decomposition and searchli… 

    …ght input
    FOUCHARD Denis committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    1711823 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Add toy experiment to examples

    FOUCHARD Denis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    995f82a View commit details
    Browse the repository at this point in the history

  2. RM wrapper

    FOUCHARD Denis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    e033097 View commit details
    Browse the repository at this point in the history

  3. adress PR comments

    FOUCHARD Denis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    70c0d00 View commit details
    Browse the repository at this point in the history

  4. flake8

    FOUCHARD Denis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    850a2a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. rm region arguments from fit method + refined doc for example

    FOUCHARD Denis committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    657233a View commit details
    Browse the repository at this point in the history

  2. fix toy example with new API

    FOUCHARD Denis committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    c5131db View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Update examples/plot_int_alignment.py 

    Co-authored-by: Elizabeth DuPre <[email protected]>
    @denisfouchard @emdupre
    denisfouchard and emdupre authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    c2943f1 View commit details
    Browse the repository at this point in the history

  2. Update examples/plot_int_alignment.py 

    Co-authored-by: Elizabeth DuPre <[email protected]>
    @denisfouchard @emdupre
    denisfouchard and emdupre authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    a7525b0 View commit details
    Browse the repository at this point in the history

  3. Update examples/plot_toy_int_experiment.py 

    Co-authored-by: Elizabeth DuPre <[email protected]>
    @denisfouchard @emdupre
    denisfouchard and emdupre authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    a19aefb View commit details
    Browse the repository at this point in the history

  4. Update fmralign/hyperalignment/piecewise_alignment.py 

    Co-authored-by: Elizabeth DuPre <[email protected]>
    @denisfouchard @emdupre
    denisfouchard and emdupre authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    3a1ccc9 View commit details
    Browse the repository at this point in the history

  5. adressing last PR comments

    @denisfouchard
    denisfouchard committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    5e4b904 View commit details
    Browse the repository at this point in the history