Skip to content

Fix: for matlab2025a and later #36

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

Open
neuroiwm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: for matlab2025a and later #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions fooof_mat/fooof.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,30 @@
f_range = py.list(f_range);

% Initialize FOOOF object
fm = py.fooof.FOOOF(settings.peak_width_limits, ...
peak_width_limits = py.list(settings.peak_width_limits);
verbose = py.numpy.array(settings.verbose);
fm = py.fooof.FOOOF(peak_width_limits, ...
settings.max_n_peaks, ...
settings.min_peak_height, ...
settings.peak_threshold, ...
settings.aperiodic_mode, ...
settings.verbose);
verbose);

% Run FOOOF fit
fm.fit(freqs, power_spectrum, f_range)

% Extract outputs
fooof_results = fm.get_results();
fooof_results = fooof_unpack_results(fooof_results);

% Re-calculating r-squared
% r_squared doesn't seem to get computed properly (in NaN).
% It is unclear why this happens, other than the error can be traced
% back to the internal call to `np.cov`, and fails when this function
% gets two arrays as input.
% Therefore, we can simply recalculate r-squared
coefs = corrcoef(double(py.array.array('d', fm.power_spectrum)), ...
double(py.array.array('d', fm.fooofed_spectrum_)));
double(py.array.array('d', fm.fooofed_spectrum_)));
fooof_results.r_squared = coefs(2);

% Also return the actual model fit, if requested
Expand All @@ -75,6 +77,7 @@

% Get the model, and add outputs to fooof_results
model_out = fooof_get_model(fm);

for field = fieldnames(model_out)'
fooof_results.(field{1}) = model_out.(field{1});
end
Expand Down