Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
bb69219
initialize files / object for SpectralTimeModel
TomDonoghue Jul 4, 2023
2f6bda7
Merge branch 'name' into time
TomDonoghue Jul 9, 2023
3fb81a8
add sim_spectrogram
TomDonoghue Jul 10, 2023
edd6b3f
add plot_spectrogram
TomDonoghue Jul 10, 2023
8979a92
add data utils, including get_periodic_labels
TomDonoghue Jul 10, 2023
37156e4
add param over time template plots
TomDonoghue Jul 10, 2023
9fa9340
add plot_time_model func
TomDonoghue Jul 10, 2023
da2d657
add time model str gen func
TomDonoghue Jul 10, 2023
096c79f
add report gen & save for time model
TomDonoghue Jul 10, 2023
caa656a
plot updates related to time object
TomDonoghue Jul 10, 2023
0fa4d58
add get_results_by_ind
TomDonoghue Jul 10, 2023
a34fa6e
add SpectralTimeModel object
TomDonoghue Jul 10, 2023
2dd55cc
add tests for SpectralTimeModel
TomDonoghue Jul 10, 2023
7d1fb86
add tests for saving SpectralTimeModel
TomDonoghue Jul 10, 2023
5f1ed66
fix up time docs & add to init
TomDonoghue Jul 10, 2023
656532e
fix docs (group -> time)
TomDonoghue Jul 10, 2023
59eb3f4
tweak for knee params in time string
TomDonoghue Jul 10, 2023
8e60389
add explicit x-axis vals pass in to plot_params time plots
TomDonoghue Jul 10, 2023
258fb59
add data funcs
TomDonoghue Jul 10, 2023
ada4150
add plot_yshade template function
TomDonoghue Jul 10, 2023
77a82ff
fix up some time docstrings
TomDonoghue Jul 10, 2023
5f3b0ab
docstring cleans and moves
TomDonoghue Jul 10, 2023
5a28592
add plot_param_over_time_yshade
TomDonoghue Jul 10, 2023
a1a3e7f
update tests for data funcs
TomDonoghue Jul 10, 2023
62cd05c
use plot_yshade in spectra shade plot
TomDonoghue Jul 10, 2023
3d82e09
add str func for event model
TomDonoghue Jul 11, 2023
af7543b
add event object plot & test
TomDonoghue Jul 11, 2023
36ff83b
add get_results_by_row
TomDonoghue Jul 11, 2023
ebc7b20
update group object iter
TomDonoghue Jul 11, 2023
b7b71c5
misc small updates / fixes for time object
TomDonoghue Jul 11, 2023
8d2df8f
fix time reports save & test
TomDonoghue Jul 11, 2023
25fddab
add event object report save
TomDonoghue Jul 11, 2023
8f10c52
add SpectralTimeEventModel object
TomDonoghue Jul 11, 2023
f65aedb
add test for SpectralTimeEventModel
TomDonoghue Jul 11, 2023
57d4592
add SpectralTimeEventModel to inits
TomDonoghue Jul 11, 2023
b97efe2
test & fix event plot
TomDonoghue Jul 11, 2023
dd5b83b
lint cleanups
TomDonoghue Jul 11, 2023
21e90dc
add get_band_labels
TomDonoghue Jul 12, 2023
1d523ed
add band labels to model plots
TomDonoghue Jul 12, 2023
67d91bc
add get_model method to event object
TomDonoghue Jul 12, 2023
94a2272
add extract data utils & convs (include refactor out of event obj)
TomDonoghue Jul 12, 2023
3ce46c9
update time / event to_df & associated
TomDonoghue Jul 12, 2023
0c762b7
try actions tweak to run on all PRs
TomDonoghue Jul 13, 2023
164ef59
move min support to 3.6
TomDonoghue Jul 13, 2023
2a0402d
update n_peaks_ property
TomDonoghue Jul 13, 2023
ccd7c48
add tests for to_df
TomDonoghue Jul 13, 2023
da78eea
updates to save_model_report across objects
TomDonoghue Jul 13, 2023
ed8c31b
update naming & labels in data conversions
TomDonoghue Jul 13, 2023
feb8f82
move / refactor underlying funcs for get_params to own funcs
TomDonoghue Jul 13, 2023
a539ece
use new get_params funcs across all objs
TomDonoghue Jul 13, 2023
165b459
tweaks: clear time group_resulst & make time_results arrays
TomDonoghue Jul 14, 2023
91adcd0
update get_group method for time object
TomDonoghue Jul 14, 2023
0ab3562
event object accepts 3d arrays
TomDonoghue Jul 14, 2023
0cb32da
add get_group to event object and associated / related changes
TomDonoghue Jul 14, 2023
648e70e
add drop to time object
TomDonoghue Jul 14, 2023
9b133c2
add drop to event object and associated
TomDonoghue Jul 15, 2023
b947748
add plot_text helper plot function
TomDonoghue Jul 15, 2023
7a08faf
use plot_text in report generation
TomDonoghue Jul 15, 2023
ef4a909
make convert_results an explicitly public method
TomDonoghue Jul 15, 2023
6c3e11a
update arg input to spectrogram in time object
TomDonoghue Jul 17, 2023
4328513
add use of progress bar & parallelization to event object
TomDonoghue Jul 17, 2023
407bc4a
add get_files helper func
TomDonoghue Jul 17, 2023
8860aa4
fix select form get_files
TomDonoghue Jul 17, 2023
f34a59f
add save & load to event object
TomDonoghue Jul 17, 2023
3872e1b
refactor get_group, including add to get model with no inds
TomDonoghue Jul 17, 2023
551c870
use empty get_group
TomDonoghue Jul 17, 2023
457a250
apply same logic of upate to get_group to get_model
TomDonoghue Jul 17, 2023
0c832de
add length option to check_inds
TomDonoghue Jul 17, 2023
93b35b8
fix event get_group
TomDonoghue Jul 17, 2023
d972614
drop equivalent implementation event get_group subselection
TomDonoghue Jul 17, 2023
d2a48cb
add test for event parallel (& fix in doing so)
TomDonoghue Jul 17, 2023
bd81432
extend event get_group to support sub-object export
TomDonoghue Jul 17, 2023
addd59e
use new event get_group functionality
TomDonoghue Jul 17, 2023
409db0d
refactor event save to match others
TomDonoghue Jul 17, 2023
041067e
add tests & corresponding updates / fixes for event loading and assoc…
TomDonoghue Jul 17, 2023
aba8941
update plot_yshade to make avg / shade optional
TomDonoghue Jul 19, 2023
921a064
add shade options to pe & ap params
TomDonoghue Jul 19, 2023
14fbde0
fix specptrogram sim docstring
TomDonoghue Jul 20, 2023
d7e7165
Merge pull request #290 from fooof-tools/paramshade
TomDonoghue Jul 21, 2023
14aafbf
merge from name
TomDonoghue Jul 22, 2023
36efc12
fix / finish merge
TomDonoghue Jul 25, 2023
4c4802f
Merge branch 'name' into time
TomDonoghue Aug 3, 2023
f7fd489
Merge branch 'name' into time
TomDonoghue Aug 3, 2023
5bdb46e
Merge branch 'name' into time
TomDonoghue Aug 3, 2023
282d9e9
Merge branch 'name' into time
TomDonoghue Aug 3, 2023
97e45db
Merge branch 'name' into time
TomDonoghue Aug 3, 2023
9507039
merge name
TomDonoghue Sep 13, 2023
77a1fbb
fix merge
TomDonoghue Feb 15, 2024
c7375a7
plot_group -> plot_group_model (for consistency)
TomDonoghue Mar 26, 2024
9e7fb55
io updates, make consistent set of load funcs, and updates test
TomDonoghue Mar 26, 2024
5a561c7
update API for updates here
TomDonoghue Mar 26, 2024
62dba14
misc small doc fixes
TomDonoghue Mar 26, 2024
1a768e5
lints
TomDonoghue Mar 26, 2024
5f1d94a
add helper func to replace docstring params
TomDonoghue Mar 26, 2024
4f53829
finish lint: use docs updates & other small fixes
TomDonoghue Mar 26, 2024
3c049ff
small fix to periodic tests
TomDonoghue Mar 26, 2024
34db090
add get_band_peak_event function
TomDonoghue Mar 26, 2024
682c4a2
enforce consistent xlims on time & event param plots
TomDonoghue Mar 26, 2024
2698f8f
update event plots to plot even with nans
TomDonoghue Mar 26, 2024
21a1848
add compute_presence helper function
TomDonoghue Mar 26, 2024
0858a6c
refactor compute_presence
TomDonoghue Mar 26, 2024
6e641a4
add compute_arr_desc
TomDonoghue Mar 26, 2024
626479f
update string gen with new helpers
TomDonoghue Mar 26, 2024
e5161d0
tweak plots
TomDonoghue Mar 26, 2024
b6de612
tweak printing in event object
TomDonoghue Mar 27, 2024
508c0ba
add presence plot to event plots / reports
TomDonoghue Mar 27, 2024
0288fc4
add time tutorial
TomDonoghue Mar 27, 2024
c302af5
fix import
TomDonoghue Mar 27, 2024
2fa0aca
move tutorials for new addition
TomDonoghue Mar 27, 2024
ebba007
bump version number
TomDonoghue Mar 27, 2024
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
Prev Previous commit
Next Next commit
misc small doc fixes
  • Loading branch information
TomDonoghue committed Mar 26, 2024
commit 62dba145dca5e2b7fd672977a35f41eb71135d24
4 changes: 2 additions & 2 deletions examples/manage/plot_fit_models_3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
from specparam.sim import sim_group_power_spectra
from specparam.sim.utils import create_freqs
from specparam.sim.params import param_sampler
from specparam.utils.io import load_group
from specparam.utils.io import load_group_model

###################################################################################################
# Example Set-Up
Expand Down Expand Up @@ -229,7 +229,7 @@
###################################################################################################

# Reload our list of SpectralGroupModels
fgs = [load_group(file_name, file_path='results') \
fgs = [load_group_model(file_name, file_path='results') \
for file_name in os.listdir('results')]

###################################################################################################
Expand Down
2 changes: 1 addition & 1 deletion specparam/core/strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def gen_methods_report_str(concise=False):
'',

# Methods report information
'To report on using spectral parameterization, you should report (at minimum):',
'Reports using spectral parameterization should include (at minimum):',
'',
'- the code version that was used',
'- the algorithm settings that were used',
Expand Down
2 changes: 1 addition & 1 deletion specparam/plts/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Plots sub-module."""

from .spectra import plot_spectra
from .spectra import plot_spectra, plot_spectrogram
11 changes: 3 additions & 8 deletions tutorials/plot_09-Reporting.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@
# sphinx_gallery_start_ignore
# Note: this code gets hidden, but serves to create the text plot for the icon
from specparam.core.strings import gen_methods_report_str
from specparam.core.reports import REPORT_FONT
import matplotlib.pyplot as plt
text = gen_methods_report_str(concise=True)
text = text[0:142] + '\n' + text[142:]
_, ax = plt.subplots(figsize=(8, 3))
ax.text(0.5, 0.5, text, REPORT_FONT, ha='center', va='center')
ax.set_frame_on(False)
_ = ax.set(xticks=[], yticks=[])
from specparam.plts.templates import plot_text
text = gen_methods_report_str()
plot_text(text, 0.5, 0.5, figsize=(12, 3))
# sphinx_gallery_end_ignore

###################################################################################################
Expand Down