Skip to content

5.7.0 - #273

Merged
jones-michael-s merged 73 commits into
automaticanalysis:masterfrom
tiborauer:5.7.0
Nov 12, 2021
Merged

5.7.0#273
jones-michael-s merged 73 commits into
automaticanalysis:masterfrom
tiborauer:5.7.0

Conversation

@tiborauer

Copy link
Copy Markdown
Member

Major implementations

  • M/EEG connectivity statistics and diagnostics with (scripted) BNV
  • TDT: feature selection
  • CONN toolbox with decoding using TDT
  • toolboxes: global workspace variables, documentation

A few small fixes and enhancements

  • M/EEG: contrasts on source level
  • For aas_getsourcestage with branched tasklists. It has one (plausible) caveat that one branchname MUST NOT contain the other + '_', which would not be good for readability anyway.
  • omit .github folder when adding aa to path
  • options for aas_checktasksettingconsistency. Useful when using it as a standalone workflow diagnostic tool

tiborauer and others added 30 commits July 22, 2021 15:36
N.B.: one branchname MUST NOT contains the other
N.B.: one branchname MUST NOT contains the other
…com:tiborauer/automaticanalysis into meeg_connectivity
N.B.: aap.options.aaworkermaximumretry MUST be zero otherwise the whole folder is wiped out
@jones-michael-s

Copy link
Copy Markdown
Collaborator

Running into some problems with toolbox initialization when testing this.

For example:

FAIL - aatest_ds000114_fmri.m aatest_ds000114_fmri.m had an error: Too many input arguments. in /Users/peellelab/automaticanalysis/aa_tools/toolboxes/bwtClass.m (line 23) in /Users/peellelab/automaticanalysis/aa_tools/toolboxes/aas_inittoolbox.m (line 22) in /Users/peellelab/automaticanalysis/aa_engine/aa_init.m (line 119) in /Users/peellelab/automaticanalysis/aa_engine/aa_doprocessing.m (line 79) in /Users/peellelab/automaticanalysis/developer/testscripts/aatest_ds000114_fmri.m (line 75) in /Users/peellelab/automaticanalysis/developer/aa_test.m (line 156) in /Users/peellelab/automaticanalysis/developer/aa_test.m (line 121)

I suspect this is a parameter file issue. Here is my current bwt toolbox setup:

<toolbox desc='Toolbox with implemented interface in extrafunctions/toolboxes' ui='custom'>
    <name desc='Name corresponding to the name of the interface without the "Class" suffix' ui='text'>bwt</name>
    <dir ui='dir'>/Users/peellelab/MATLAB_THIRDPARTY/BrainWavelet</dir>
</toolbox>

My previous version had an extraparameters block that I removed (cf. aap_parameters_defaults_CBSU.xml). However, aa also crashes if the extraparameter block is present.

@tiborauer

Copy link
Copy Markdown
Member Author

I am afraid I forgot to update your toolboxes. The doKeepInPath parameter has been removed because it has no effect. This was the missing bit to make the code and the documentation fully aligned. It did not raise a flag because they are not part of the CI (yet - WIP).
I have updated them.

@jones-michael-s

Copy link
Copy Markdown
Collaborator

That seems to have got it working.

Thanks much.

@tiborauer

Copy link
Copy Markdown
Member Author

I am sorry for the lack of transparency.

@jones-michael-s jones-michael-s left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passed all tests (run locally). Good to merge.

@tiborauer

Copy link
Copy Markdown
Member Author

Thanks, @jones-michael-s. However, I'd rather first sort out the new tests including AROMA and scrubbing. I think I have sorted them out. I currently run the test on my repo, and if it passes, I submit a PR.
So, please, hold off with merging this one.

@tiborauer tiborauer mentioned this pull request Nov 11, 2021
@tiborauer

tiborauer commented Nov 11, 2021

Copy link
Copy Markdown
Member Author

I take a look at the conflict.
I probably have to resync the central master to this branch and update the new toolbox classes, as well. Please, wait for a new CI test before merging.

@tiborauer

Copy link
Copy Markdown
Member Author

Now it is ready to be merged.

@jones-michael-s
jones-michael-s merged commit f694f71 into automaticanalysis:master Nov 12, 2021
@tiborauer
tiborauer deleted the 5.7.0 branch November 13, 2021 09:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants