Skip to content
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

[ENH] - Define new object organization (Data / Results / Base / Algorithm) #291

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
f484bce
test out base model object
TomDonoghue Jul 19, 2023
a4238ba
small doc tweaks
TomDonoghue Jul 19, 2023
89d45b5
trial a new BaseData object
TomDonoghue Jul 20, 2023
b9fe0e1
continue exploration of BaseData object
TomDonoghue Jul 20, 2023
93450c2
trial out BaseFit object
TomDonoghue Jul 20, 2023
5bc1891
Merge branch 'name' into basemodel
TomDonoghue Jul 22, 2023
f65f012
fix / finish merge
TomDonoghue Jul 25, 2023
188e183
interim test update - use sub objects for group
TomDonoghue Jul 29, 2023
43658fa
interim update: move things around
TomDonoghue Jul 31, 2023
557d157
reorg to use base object & do renames
TomDonoghue Jul 31, 2023
6f6fa3b
updates of tests for new object org
TomDonoghue Jul 31, 2023
a2a0b8e
merge name
TomDonoghue Aug 3, 2023
fea9559
interim merge
TomDonoghue Aug 3, 2023
b548e01
fix merge of get_data & get_model
TomDonoghue Aug 3, 2023
a9060a1
merge data / model checks in get functions
TomDonoghue Aug 3, 2023
50286af
Merge branch 'name' into basemodel
TomDonoghue Aug 3, 2023
327861e
fix merge name
TomDonoghue Sep 13, 2023
85b647a
Merge branch 'main' into basemodel
TomDonoghue Feb 15, 2024
f902ac6
fix merge
TomDonoghue Mar 27, 2024
a1880d0
fix for model object
TomDonoghue Apr 6, 2024
b1963df
reorg where fit funcs are & associated
TomDonoghue Apr 6, 2024
8215331
add base object 2DT
TomDonoghue Apr 7, 2024
063cb1d
add data object 2DT
TomDonoghue Apr 7, 2024
a16b827
add fit object 2DT
TomDonoghue Apr 7, 2024
5526020
move save / load to base objects
TomDonoghue Apr 8, 2024
6bc1f86
add getters to fit obj
TomDonoghue Apr 8, 2024
65ec2b8
move stuff to base / fit
TomDonoghue Apr 8, 2024
fa6298a
rework time obj to use new obj org - move methods
TomDonoghue Apr 8, 2024
83ae693
lints from updates
TomDonoghue Apr 8, 2024
97e0531
update data checks for 3D properly
TomDonoghue Apr 8, 2024
371383f
add base3d
TomDonoghue Apr 9, 2024
f9f1553
add data3d
TomDonoghue Apr 9, 2024
c993ab5
add fit3f
TomDonoghue Apr 9, 2024
4d832f1
rework event to use new objs
TomDonoghue Apr 9, 2024
facd87e
add plot methods to data objects
TomDonoghue Apr 9, 2024
4383b1a
FitObjects -> ResultsObjects
TomDonoghue Apr 10, 2024
6951711
fix up verboseness & warnings
TomDonoghue Apr 10, 2024
20b6dc2
add load funcs & io updates
TomDonoghue Apr 10, 2024
dd621d7
update event reset data for consistency
TomDonoghue Apr 10, 2024
b8927fe
lints
TomDonoghue Apr 10, 2024
9ff8763
bump version number
TomDonoghue Apr 10, 2024
31bb7f9
fix quirk in example
TomDonoghue Apr 10, 2024
ccb376d
add custom css for header
TomDonoghue Apr 30, 2024
41509d8
ignore sphinx build time file
TomDonoghue Apr 30, 2024
42abfed
fix issue of not passing freq_range through in BaseModel
TomDonoghue Apr 30, 2024
944b803
update changelog for 2.0
TomDonoghue May 4, 2024
1b10104
fix line
TomDonoghue May 4, 2024
a7ed4d9
update actions
TomDonoghue Jun 8, 2024
4cea065
Merge pull request #325 from fooof-tools/acts
TomDonoghue Jun 8, 2024
3599dbc
Merge branch 'main' into basemodel
TomDonoghue Aug 3, 2024
cd2de42
Merge branch 'main' into basemodel
TomDonoghue Nov 28, 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
8 changes: 5 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -37,4 +37,6 @@ jobs:
run: |
pytest --doctest-modules --ignore=$MODULE_NAME/tests $MODULE_NAME
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Loading