Skip to content

[MAINT] update MACS to avoid GoF visualization errors on Octave #1146

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ WORKDIR /home/neuro

COPY . /home/neuro/bidspm
WORKDIR /home/neuro/bidspm
RUN cp -rv lib/MACS /opt/spm12/toolbox/MACS
RUN pip install --no-cache-dir --upgrade pip && \
pip3 --no-cache-dir install -r requirements.txt && \
pip3 --no-cache-dir install . && \
2 changes: 2 additions & 0 deletions bidspm.m
Original file line number Diff line number Diff line change
@@ -142,6 +142,8 @@ function initBidspm(dev)
dev = false;
end

more off;

opt.verbosity = 2;
opt.msg.color = '';

2 changes: 1 addition & 1 deletion demos/MoAE/Makefile
Original file line number Diff line number Diff line change
@@ -43,5 +43,5 @@ octave_all: octave_roi
octave_stats: moae_01_bids_app.m
octave $(OCTFLAGS) --eval "run('moae_01_bids_app.m');exit;"

octave_roi: moae_03_create_roi_extract_data.m
octave_roi: moae_02_create_roi_extract_data.m
octave $(OCTFLAGS) --eval "run('moae_02_create_roi_extract_data.m');exit;"
14 changes: 7 additions & 7 deletions src/batches/stats/setBatchGoodnessOfFit.m
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

% (C) Copyright 2023 bidspm developers

if bids.internal.is_octave()
% https://github.com/cpp-lln-lab/bidspm/pull/1135#issuecomment-1722455363
notImplemented(mfilename(), ...
'Goodness of fit not implemented in Octave.', ...
opt);
return
end
% if bids.internal.is_octave()
% % https://github.com/cpp-lln-lab/bidspm/pull/1135#issuecomment-1722455363
% notImplemented(mfilename(), ...
% 'Goodness of fit not implemented in Octave.', ...
% opt);
% return
% end

MA_inspect_GoF.SPM_mat(1) = cfg_dep('Model estimation: SPM.mat File', ...
returnDependency(opt, 'estimate'), ...
Loading
Oops, something went wrong.