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

[ENH] rudimentary support for nimads #763

Merged
merged 38 commits into from
Mar 15, 2023
Merged

[ENH] rudimentary support for nimads #763

merged 38 commits into from
Mar 15, 2023

Commits on Dec 21, 2021

  1. Create nimads.py

    @tsalo
    tsalo committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    edc3521 View commit details
    Browse the repository at this point in the history

  2. Add in method skeleton and start on docstrings.

    @tsalo
    tsalo committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    562731c View commit details
    Browse the repository at this point in the history

  3. Update nimads.py

    @tsalo
    tsalo committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    83cbdc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. Improve the docstrings a bit.

    @tsalo
    tsalo committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    485faac View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2022

  1. Describe how Condition Annotations should be stored.

    @tsalo
    tsalo committed Feb 9, 2022
    Configuration menu
    Copy the full SHA
    b42c89d View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Merge branch 'main' of github.com:neurostuff/NiMARE into nimads

    @jdkent
    jdkent committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    1b0072f View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. add some basic structure for loading studysets

    @jdkent
    jdkent committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    0d1fbb3 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. wip: convert nimads to nimare object

    @jdkent
    jdkent committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    5262c61 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. wip: adding workflow run command

    @jdkent
    jdkent committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    6aa9788 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2022

  1. run black/isort

    @jdkent
    jdkent committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    cbe57cd View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Merge branch 'main' of github.com:neurostuff/NiMARE into nimads

    @jdkent
    jdkent committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    9f13241 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. fix workflows

    @jdkent
    jdkent committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    910037e View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Merge branch 'main' of github.com:neurostuff/NiMARE into nimads

    @jdkent
    jdkent committed Sep 23, 2022
    Configuration menu
    Copy the full SHA
    f8a1377 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. wip: change name of function

    @jdkent
    jdkent committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    3684e89 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2022

  1. Merge branch 'main' of github.com:neurostuff/NiMARE into nimads

    @jdkent
    jdkent committed Dec 20, 2022
    Configuration menu
    Copy the full SHA
    69cb840 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. add workflow

    @jdkent
    jdkent committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    56d935b View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. change io names

    @jdkent
    jdkent committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    9dc93b3 View commit details
    Browse the repository at this point in the history

  2. fix black style

    @jdkent
    jdkent committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    612b595 View commit details
    Browse the repository at this point in the history

  3. handle corrector_init better

    @jdkent
    jdkent committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    fab9c4f View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Merge branch 'main' of github.com:neurostuff/NiMARE into nimads

    @jdkent
    jdkent committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    7f01880 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. remove workflow from this pull request

    @jdkent
    jdkent committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    7d8394e View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. add more nimads annotation structure

    @jdkent
    jdkent committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    fb5f05c View commit details
    Browse the repository at this point in the history

  2. begin to test slicing

    @jdkent
    jdkent committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    2051086 View commit details
    Browse the repository at this point in the history

  3. formatting

    @jdkent
    jdkent committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    3ef5eb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. wip: add to_dict

    @jdkent
    jdkent committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    3993cb6 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. fix slicing of the studyset

    @jdkent
    jdkent committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    4f08818 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. refactor io code to prevent circular import

    @jdkent
    jdkent committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    afae242 View commit details
    Browse the repository at this point in the history

  2. support reading in more types

    @jdkent
    jdkent committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    4092e52 View commit details
    Browse the repository at this point in the history

  3. add more to tests

    @jdkent
    jdkent committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    e87e46c View commit details
    Browse the repository at this point in the history

  4. wip: add example

    @jdkent
    jdkent committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    c691c37 View commit details
    Browse the repository at this point in the history

  5. fix indentation and style

    @jdkent
    jdkent committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    586f603 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. refactor to prevent circular import

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    6bac7db View commit details
    Browse the repository at this point in the history

  2. did not fix circular import

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    39f91ec View commit details
    Browse the repository at this point in the history

  3. add little more detail to example

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    833bf2f View commit details
    Browse the repository at this point in the history

  4. allow studyset to be passed

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    3145965 View commit details
    Browse the repository at this point in the history

  5. complete merge

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    e27edc7 View commit details
    Browse the repository at this point in the history

  6. remove accidental fixture

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    3b55549 View commit details
    Browse the repository at this point in the history

  7. download files from url instead of reading local

    @jdkent
    jdkent committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    7d2a540 View commit details
    Browse the repository at this point in the history