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

0.2.8 #926

Merged
merged 76 commits into from
Apr 6, 2024
Merged

0.2.8 #926

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
fd86de2
0.2.8
DominiqueMakowski Nov 6, 2023
c13a97e
Add requests
DominiqueMakowski Nov 6, 2023
d006bf4
Update setup.py
DominiqueMakowski Nov 6, 2023
03dea78
add function head of visibility-graph detector
JonasEmrich Dec 12, 2023
c3718f6
add FastNVG implementation
JonasEmrich Dec 13, 2023
84076ce
activate detector in ecg_findpeaks()
JonasEmrich Dec 13, 2023
4c93d18
fix code formatting
JonasEmrich Dec 13, 2023
4eff069
minor
DominiqueMakowski Dec 13, 2023
d12f22f
adapt cleaning documentation
JonasEmrich Dec 14, 2023
7674b25
updated documentation and removed method by koka2022
JonasEmrich Dec 14, 2023
a3a6513
Add deprecation warning for method koka2022
JonasEmrich Dec 15, 2023
79b4888
[Hotfix] requests is not builtin anymore
DominiqueMakowski Dec 18, 2023
8b6d145
Add fig2img
DominiqueMakowski Dec 18, 2023
388b9f6
Merge branch 'master' into dev
DominiqueMakowski Dec 18, 2023
87c8c60
Update eeg_1min_200hz.pickle
DominiqueMakowski Dec 18, 2023
72e7601
Merge branch 'dev' into pr/939
DominiqueMakowski Dec 18, 2023
51b48bd
Merge pull request #939 from JonasEmrich/ecg_peaks_vgmethod
DominiqueMakowski Dec 21, 2023
11f8d59
remove tests from project
Jan 2, 2024
2c410f4
change prune to recursive-exclude tests
Jan 2, 2024
cdbefba
Merge pull request #941 from Ninebell/dev
DominiqueMakowski Jan 3, 2024
efe3269
Optimise _ecg_findpeaks_elgendi
purpl3F0x Jan 4, 2024
2a1c621
Merge pull request #943 from purpl3F0x/dev
DominiqueMakowski Jan 10, 2024
b365588
[Fix + Improvement] Faster _ecg_findpeaks_hamilton and bug-fix
purpl3F0x Jan 10, 2024
576fa90
Added minimum N in rodrigues2021 peaks detector
LucaCerina Jan 17, 2024
b25b8bb
Merge pull request #949 from LucaCerina/bugfix-function_ecg_findpeaks…
DominiqueMakowski Jan 17, 2024
7abb936
update docstring to reflect implementation of khodadad2018
danibene Jan 18, 2024
e74b5f8
update description of khodadad2018 to reflect implementation of cleaning
danibene Jan 18, 2024
ba9b3a3
Merge pull request #952 from danibene/docs/rsp_clean_khodadad2018
DominiqueMakowski Jan 19, 2024
56aba7f
Merge pull request #947 from purpl3F0x/dev
DominiqueMakowski Jan 21, 2024
c016a9b
[BUG] rr xcorr arange steps don't match
birm Feb 5, 2024
b55b383
Fix poetry config
stasinos Feb 17, 2024
d4d76a0
Make sparsEDA return a (tonic,phasic) pair
stasinos Feb 17, 2024
b5e045a
Fix wrong variable name
stasinos Feb 17, 2024
a9bae21
Add dep to cvxopt to also execute cvxEDA test
stasinos Feb 17, 2024
57184a4
Send resampled signal to sparsEDA algorithm
stasinos Feb 17, 2024
ef42a48
Fix version number
stasinos Feb 17, 2024
9bac0b6
SCR should be computed before resampling back to original sr
stasinos Feb 17, 2024
edcc563
Use new_sr instead of original sampling_rate
stasinos Feb 17, 2024
0d271d8
Comment out assigning MSE to avoid style check fail
stasinos Feb 17, 2024
1a7743b
Update ecg_hrv.ipynb
Adam-Antios Feb 29, 2024
baf4ab7
Merge pull request #967 from Adam-Antios/patch-1
danibene Mar 2, 2024
d3d2b0e
Commit style fixes
DominiqueMakowski Mar 2, 2024
092f4f0
use loc to index dataframe
danibene Mar 2, 2024
1372e75
Commit style fixes
danibene Mar 2, 2024
71cecb2
fix order of inputs to loc
danibene Mar 2, 2024
2a342f3
use .loc to index df_offsets
danibene Mar 2, 2024
0a00152
actually use .loc to index df_offsets (wow, tests are important)
danibene Mar 2, 2024
aa87bde
use .loc in utils_complexity_symbolize
danibene Mar 2, 2024
376b4cf
Update utils_complexity_symbolize.py
danibene Mar 2, 2024
e72aff1
replace "L" by "ms"
danibene Mar 2, 2024
6f0f0a2
replace with "ms" in resampling_factor
danibene Mar 2, 2024
f62627d
Merge pull request #960 from birm/patch-1
DominiqueMakowski Mar 3, 2024
0ea8a2b
Merge pull request #968 from danibene/fix/build_docs_warning
danibene Mar 3, 2024
34f3a90
refactor hamilton method
danibene Mar 10, 2024
496d5dc
add expected_ecg_findpeaks_hamilton_good_4000.csv
danibene Mar 10, 2024
7a7fd83
add expected_ecg_findpeaks_hamilton_bad_500.csv
danibene Mar 10, 2024
c794622
add regression test for ecg_findpeaks_hamilton
danibene Mar 10, 2024
8377bba
include _ecg_findpeaks_hamilton in tests_ecg_findpeaks
danibene Mar 10, 2024
2ee5a75
reformat dev version with black
danibene Mar 10, 2024
79532f5
update expected results after changes in 0.2.8
danibene Mar 11, 2024
f6c21f2
update expected bad 500 results after changes in 0.2.8
danibene Mar 11, 2024
590cda6
add flag for when missed peak is added
danibene Mar 11, 2024
6e2b150
remote extra imports
danibene Mar 11, 2024
67afccc
adding sampling rate parameter to eda_intervalrelated method
tilly111 Mar 12, 2024
3948d84
[Fix] read_acqknowledge now also imports duplicated channel names
DerAndereJohannes Mar 22, 2024
88bc754
[Feature] stim_events_find to retrieve multi-channel stimulus events
DerAndereJohannes Mar 24, 2024
2f923ce
Merge pull request #966 from stasinos/issue-964
DominiqueMakowski Mar 24, 2024
bd3939c
Merge pull request #974 from tilly111/bugfix-eda_analyze_sampling_rate
DominiqueMakowski Mar 24, 2024
24939c7
Merge pull request #975 from DerAndereJohannes/fix_acqknowledge_dupli…
DominiqueMakowski Mar 24, 2024
8e27aef
Merge pull request #973 from danibene/fix/ecg_findpeaks_refactor
danibene Mar 24, 2024
5d550d6
Rework stim_events_find into events_find
DerAndereJohannes Mar 26, 2024
deb70d0
Make the events non-overlapping
DominiqueMakowski Mar 31, 2024
016f244
[Fix] Update changelog to reflect changing find_events
DerAndereJohannes Mar 31, 2024
8da97e7
Merge pull request #976 from DerAndereJohannes/find_stimulus_events
DominiqueMakowski Apr 1, 2024
4cd9ec4
[Feature] add 'columns' selection argument in epochs_plot()
DominiqueMakowski Apr 1, 2024
8e4ee00
Remove codeclimate
DominiqueMakowski Apr 1, 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
4 changes: 2 additions & 2 deletions neurokit2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
from .video import *

# Info
__version__ = "0.2.7"
__version__ = "0.2.8"


# Maintainer info
__author__ = "The NeuroKit development team"
__email__ = "[email protected]"
__email__ = "[email protected]"


# Citation
Expand Down
10 changes: 4 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@

with open("NEWS.rst") as history_file:
history = history_file.read()
history = history.replace("\n-------------------", "\n^^^^^^^^^^^^^^^^^^^").replace(
"\n=====", "\n-----"
)
history = history.replace("\n-------------------", "\n^^^^^^^^^^^^^^^^^^^").replace("\n=====", "\n-----")


def find_version():
Expand All @@ -27,15 +25,15 @@ def find_version():


# Dependencies
requirements = ["numpy", "pandas", "scipy", "scikit-learn>=1.0.0", "matplotlib"]
requirements = ["requests", "numpy", "pandas", "scipy", "scikit-learn>=1.0.0", "matplotlib"]

# Optional Dependencies (only needed / downloaded for testing purposes, for instance to test against some other packages)
setup_requirements = ["pytest-runner", "numpy"]
test_requirements = requirements + [
"pytest",
"coverage",
"bioread",
"mne[data]",
"mne",
"pyentrp",
"antropy",
"EntropyHub",
Expand All @@ -62,7 +60,7 @@ def find_version():
license="MIT license",
# The name and contact of a maintainer
author="Dominique Makowski",
author_email="[email protected]",
author_email="[email protected]",
# Dependencies
install_requires=requirements,
setup_requires=setup_requirements,
Expand Down
Loading