Skip to content

[REL] 0.2.0 #28

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

Merged
merged 41 commits into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bc3b01a
Merge pull request #18 from cpp-lln-lab/dev_fmriprep
Remi-Gau Jun 1, 2021
f559bfc
Merge branch 'main' into dev
Remi-Gau Sep 1, 2021
fa6820b
add removeSpmPrefix
Remi-Gau Sep 4, 2021
b64dd2f
Merge branch 'main' into dev
Remi-Gau Oct 2, 2021
9f65833
update CI
Remi-Gau Oct 2, 2021
0efb6ac
remove blank in zMap name + correct for typo
CerenB Oct 13, 2021
433b866
interpolation type change
CerenB Oct 13, 2021
b81c7e3
Tmaps interpolation
CerenB Oct 13, 2021
0aee404
add removeSpmPrefix
Remi-Gau Sep 4, 2021
5f503fa
update CI
Remi-Gau Oct 2, 2021
ed61411
add removeSpmPrefix
Remi-Gau Sep 4, 2021
4516176
use bids.File
Remi-Gau Nov 1, 2021
92375ca
add uninit function
Remi-Gau Nov 16, 2021
8088791
fix order of initialization
Remi-Gau Nov 16, 2021
3cd8413
fix path init on windows
Remi-Gau Dec 10, 2021
e0888cd
Merge branch 'fix-win_path' into dev
Remi-Gau Dec 10, 2021
720a92d
Update version.txt
Remi-Gau Dec 15, 2021
d7c3a88
Update version.txt
Remi-Gau Dec 15, 2021
a813876
update gitignore
Remi-Gau Dec 19, 2021
bfbf490
allow to threshold image with with cluster size
Remi-Gau Dec 19, 2021
92b11d4
clean up
Remi-Gau Dec 19, 2021
282d8b4
add thresholding description to mask filename
Remi-Gau Dec 19, 2021
c92fc61
Merge branch 'olf_blind' into dev
Remi-Gau Dec 19, 2021
0b74c0e
fix typos
Remi-Gau Dec 19, 2021
2117cd3
fix hemi entity order when extracting ROI from atlas
Remi-Gau Dec 19, 2021
10df799
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 27, 2021
1e6d05a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 27, 2021
36bc53d
remove roi based glm scripts
Remi-Gau Jan 7, 2022
c106d8d
Merge branch 'main' into dev
Remi-Gau Jan 7, 2022
39b5778
add copy button to doc
Remi-Gau Jan 14, 2022
ef79d17
update to bids matlab 0.1.0
Remi-Gau Jan 28, 2022
f5896b6
update CI and doc
Remi-Gau Jan 28, 2022
89d6e63
Merge pull request #24 from cpp-lln-lab/bump_bids_matlab
Remi-Gau Jan 28, 2022
22915ce
Merge branch 'dev' into dev
Remi-Gau Jan 28, 2022
55f6053
Merge pull request #22 from CerenB/dev
Remi-Gau Jan 28, 2022
85851b5
update demos
Remi-Gau Jan 28, 2022
98a690a
update renameFile
Remi-Gau Jan 28, 2022
5c4a43d
fix tests in CI
Remi-Gau May 9, 2022
4c7d048
Merge pull request #27 from cpp-lln-lab/fix_test_ci_dev
Remi-Gau May 9, 2022
856965d
add release drafter
Remi-Gau May 9, 2022
8a77a60
update version
Remi-Gau May 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
template: |
## Release Notes

## CHANGES
$CHANGES
7 changes: 4 additions & 3 deletions .github/workflows/miss_hit_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ name: miss_hit_quality
on:
push:
branches:
- main
- master
- dev
pull_request:
branches: ['*']

Expand All @@ -14,7 +16,8 @@ jobs:

steps:

- uses: actions/checkout@v2
- name: Install CPP_ROI
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 1
Expand All @@ -28,8 +31,6 @@ jobs:
run: |
python -m pip install --upgrade pip setuptools
pip3 install -r requirements.txt
cd tests
make data

- name: MISS_HIT Metrics
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/miss_hit_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ name: miss_hit_style
on:
push:
branches:
- main
- master
- dev
pull_request:
branches: '*'
branches: ['*']

jobs:
build:
Expand All @@ -14,7 +16,8 @@ jobs:

steps:

- uses: actions/checkout@v2
- name: Install CPP_ROI
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 1
Expand All @@ -28,8 +31,6 @@ jobs:
run: |
python -m pip install --upgrade pip setuptools
pip3 install -r requirements.txt
cd tests
make data

- name: MISS_HIT Code style
run: |
Expand Down
78 changes: 0 additions & 78 deletions .github/workflows/run_tests.yml

This file was deleted.

63 changes: 63 additions & 0 deletions .github/workflows/run_tests_matlab.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: tests and coverage with matlab

on:
push:
branches:
- dev
- main
- master
pull_request:
branches: ['*']
schedule:
- cron: "1 1 1 * *"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-20.04

steps:
- name: Install MATLAB
uses: matlab-actions/setup-matlab@v1.0.1
with:
# MATLAB release to set up R2020a
release: R2020a

- name: Install CPP_ROI
uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 1

- name: Install SPM
run: |
git clone https://github.com/spm/spm12.git --depth 1

- name: Install Moxunit and MOcov
run: |
git clone https://github.com/MOxUnit/MOxUnit.git --depth 1
git clone https://github.com/MOcov/MOcov.git --depth 1

- name: Add bids-matlab
run: |
git clone https://github.com/bids-standard/bids-matlab.git --depth 1

- name: Run commands
uses: matlab-actions/run-command@v1.0.1
with:
command: cd(fullfile(getenv('GITHUB_WORKSPACE'), '.github', 'workflows')); run tests_matlab;

- name: Run tests
run: |
cat test_report.log | grep 0
bash <(curl -s https://codecov.io/bash)

- name: Code coverage
uses: codecov/codecov-action@v1
with:
file: coverage.xml # optional
flags: unittests # optional
name: codecov-umbrella # optional
fail_ci_if_error: true # optional (default = false)
17 changes: 17 additions & 0 deletions .github/workflows/tests_matlab.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
%
% (C) Copyright 2022 CPP ROI developers

root_dir = getenv('GITHUB_WORKSPACE');

addpath(fullfile(root_dir, 'spm12'));
addpath(fullfile(root_dir, 'bids-matlab'));
addpath(fullfile(root_dir, 'MOcov', 'MOcov'));

cd(fullfile(root_dir, 'MOxUnit', 'MOxUnit'));
run moxunit_set_path();

cd(fullfile(root_dir));

initCppRoi();

run run_tests();
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@

.DS_Store

*.nii

*.xml
*.log
*.asv
*.m~
*.mat

<<<<<<< HEAD
*.html

# files in the demo folder related to running the demo analysis
# demos/roi
=======

atlas/visual_topography_probability_atlas/
>>>>>>> 4a2a3830905dfad9b61804bf99e2941a49e4e2fa

# test folder and dummy data

Expand All @@ -28,3 +28,5 @@ envs/*
demos/*/*.json
demos/*/*/*.json
demos/*/derivatives

atlas/*.json
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ repos:
additional_dependencies: [miss_hit]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.0.1
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand Down
30 changes: 8 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
<!-- lint disable -->

**Documentation**

**Code quality and style**

**Unit tests and coverage**

**How to cite**

**Contributors**

# CPP ROI

## :warning: :warning: :warning:
---

## :warning:

**This code is fairly unstable (:boom:) and might still change a lot.**
**This code is fairly unstable and might still change.**

Also this code currently has 0% test coverage...
So make sure you "pin" which version or commit you are using for a given
project, if you don't want your code to break in the future.

---

Expand Down Expand Up @@ -57,8 +48,7 @@ as a submodule, and intitialized when running `initCppSpm`.

### Dependencies

=======
TODO
======= TODO

| Dependencies | Used version |
| ---------------------------------------------------------- | ------------ |
Expand Down Expand Up @@ -98,8 +88,4 @@ TODO
Also includes:

- Yeo's 7 networks "atlas"
- add REF and URL

## Contributing

## Contributors
<!-- add REF and URL -->
2 changes: 1 addition & 1 deletion src/atlas/returnAtlasDir.m → atlas/returnAtlasDir.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%
% (C) Copyright 2021 CPP ROI developers

atlasDir = fullfile(fileparts(mfilename('fullpath')), '..', '..', 'atlas');
atlasDir = fileparts(mfilename('fullpath'));

if nargin > 0

Expand Down
Loading