Skip to content

Conversation

Remi-Gau
Copy link
Contributor

@Remi-Gau Remi-Gau commented Jan 12, 2022

  • add MACS toolbox submodule (using the fork on the CPP orga as upstream)
  • add MACS toolbox check (install into SPM/toolboxes directory if necessary)
  • add MACS toolbox options
  • add a stats/bidsModelSelection workflow
  • allow this workflow to be run in separate steps
  • add test and update test dummy data for it
  • allow specifying dummy regressors in subject level GLMs to make sure that all sessions have same number of regressors
    • for conditions
    • for confounds

includes also:

  • move src some files into their appropriate sub-folders
  • move tests into sub folders to match the structure of the src folder
  • fixes Standardising timespamps #471

@codecov
Copy link

codecov bot commented Jan 12, 2022

Codecov Report

Merging #472 (23c6c3d) into dev (76ca3e1) will increase coverage by 0.98%.
The diff coverage is 88.01%.

❗ Current head 23c6c3d differs from pull request most recent head 93b6e87. Consider uploading reports for the commit 93b6e87 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##              dev     #472      +/-   ##
==========================================
+ Coverage   72.23%   73.22%   +0.98%     
==========================================
  Files         175      182       +7     
  Lines        3537     3738     +201     
==========================================
+ Hits         2555     2737     +182     
- Misses        982     1001      +19     
Flag Coverage Δ
unittests 73.22% <88.01%> (+0.98%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/batches/saveMatlabBatch.m 100.00% <ø> (ø)
src/infra/elapsedTime.m 100.00% <ø> (ø)
src/infra/returnRootDir.m 0.00% <0.00%> (ø)
src/messages/printCredits.m 16.66% <0.00%> (ø)
src/subject_level/createAndReturnOnsetFile.m 100.00% <ø> (ø)
src/workflows/bidsRename.m 79.16% <0.00%> (-1.61%) ⬇️
src/workflows/preproc/bidsSpatialPrepro.m 78.26% <ø> (ø)
src/workflows/returnDependency.m 55.55% <25.00%> (-24.45%) ⬇️
src/infra/checkToolbox.m 71.87% <71.87%> (-8.13%) ⬇️
src/workflows/stats/bidsModelSelection.m 89.47% <89.47%> (ø)
... and 15 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2979cdc...93b6e87. Read the comment docs.

@Remi-Gau Remi-Gau force-pushed the remi-model_selection branch from eedb1c1 to b1d0c1c Compare January 12, 2022 23:24
@Remi-Gau
Copy link
Contributor Author

Getting some errors on some subjects.

------------------------------------------------------------------------
13-Jan-2022 10:28:28 - Running job #3
------------------------------------------------------------------------
13-Jan-2022 10:28:28 - Running 'MA: define model space'
13-Jan-2022 10:28:28 - Done    'MA: define model space'
13-Jan-2022 10:28:28 - Running 'MA: calculate cvLME (automatic)'

-> Subject 1 (1 out of 1):
   - Model hrf (1 out of 6) ... 13-Jan-2022 10:30:12 - Failed  'MA: calculate cvLME (automatic)'
Error using chol
Matrix must be positive definite.
In file "/home/remi/matlab/SPM/spm12/toolbox/MACS/MD_mvn_logdet.m" (???), function "MD_mvn_logdet" at line 59.
In file "/home/remi/matlab/SPM/spm12/toolbox/MACS/ME_GLM_NG_LME.m" (???), function "ME_GLM_NG_LME" at line 49.
In file "/home/remi/matlab/SPM/spm12/toolbox/MACS/MA_cvLME_multi.m" (???), function "MA_cvLME_multi" at line 333.
In file "/home/remi/matlab/SPM/spm12/toolbox/MACS/batch_MA_cvLME_auto.m" (???), function "run_module" at line 75.

The following modules did not run:
Failed: MA: calculate cvLME (automatic)

Error using MATLABbatch system
Job execution failed. The full log of this run can be found in MATLAB command window, starting with the
lines (look for the line showing the exact #job as displayed in this error message)
------------------
Running job #3
------------------

@Remi-Gau Remi-Gau linked an issue Jan 14, 2022 that may be closed by this pull request
@Remi-Gau Remi-Gau self-assigned this Jan 14, 2022
@Remi-Gau Remi-Gau merged commit 59cdbdd into dev Jan 14, 2022
@Remi-Gau Remi-Gau deleted the remi-model_selection branch January 16, 2022 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Standardising timespamps
1 participant