Skip to content

[MNT] - Small fix up for null models #280

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

Merged
TomDonoghue merged 1 commit into from
Jul 7, 2023
Merged

[MNT] - Small fix up for null models #280

Show file tree
Hide file tree
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
5 changes: 1 addition & 4 deletions fooof/core/strings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,6 @@ def gen_results_fg_str(fg, concise=False):
kns = fg.get_params('aperiodic_params', 'knee') \
if fg.aperiodic_mode == 'knee' else np.array([0])

# Check if there are any power spectra that failed to fit
n_failed = sum(np.isnan(exps))

str_lst = [

# Header
Expand All @@ -369,7 +366,7 @@ def gen_results_fg_str(fg, concise=False):

# Group information
'Number of power spectra in the Group: {}'.format(len(fg.group_results)),
*[el for el in ['{} power spectra failed to fit'.format(n_failed)] if n_failed],
*[el for el in ['{} power spectra failed to fit'.format(fg.n_null_)] if fg.n_null_],
'',

# Frequency range and resolution
Expand Down
8 changes: 4 additions & 4 deletions fooof/objs/group.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ class FOOOFGroup(FOOOF):
Whether model results are available in the object.
n_peaks_ : int
The number of peaks fit in the model.
n_failed_fits_ : int
The number of models that failed to fit.
failed_fit_inds_ : list of int
The indices of any models that failed to fit.
n_null_ : int
The number of models that failed to fit and/or that are marked as null.
null_inds_ : list of int
The indices of any models that are null.

Notes
-----
Expand Down