Skip to content
This repository was archived by the owner on Dec 7, 2021. It is now read-only.

Commit 211f36d

Browse files
committed
Merge branch 'develop'
2 parents ac66b88 + c22ddd2 commit 211f36d

53 files changed

Lines changed: 625 additions & 750 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ jobs:
88
os: linux
99
dist: xenial
1010
python: 3.6
11+
before_install:
12+
- python3.6 -m pip install dataclasses
1113
- name: "Python 3.7.0 on Bionic Linux"
1214
dist: bionic
1315
python: 3.7

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
### Removed
1313
### Fixed
1414

15+
## [0.9.2] - 2020-06-04
16+
### Added
17+
* DOI reference link using Zenodo
18+
* @dataclass decorator to datadabase tables ORM
19+
* Install instruction for Python 3.6 dataclasses
20+
21+
### Changed
22+
* Renamed JoinedPreprocessor to ForkedPreprocessor
23+
* Renamed JoinDataFrames to ToMergedDataframes
24+
* Renamed SinglePickleCache to PickleCache
25+
26+
### Removed
27+
* Python 3.6 full support due to @dataclass
28+
(workaround: python3.6 -m pip install dataclasses)
29+
* Conda environment.yml configuration file
30+
* ChunksPickleCache cache manager
31+
* VerticalPipeline pipeline executor
32+
* TextMiner textual analysis
33+
1534
## [0.9.1] - 2020-06-03
1635
### Added
1736
* Add min_value and max_value for each file Metadata

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PyEEGLab
22

3-
[![Project Status: WIP – Initial development is in progress, but there has not yet been a stable, usable release suitable for the public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip) [![Build Status](https://travis-ci.org/AlessioZanga/PyEEGLab.svg?branch=master)](https://travis-ci.org/AlessioZanga/PyEEGLab) [![Documentation Status](https://readthedocs.org/projects/pyeeglab/badge/?version=latest)](https://pyeeglab.readthedocs.io/en/latest/?badge=latest) [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AlessioZanga/PyEEGLab) [![codecov](https://codecov.io/gh/AlessioZanga/PyEEGLab/branch/master/graph/badge.svg)](https://codecov.io/gh/AlessioZanga/PyEEGLab) [![Maintainability](https://api.codeclimate.com/v1/badges/c55f67ee28e9e8bd8038/maintainability)](https://codeclimate.com/github/AlessioZanga/PyEEGLab/maintainability)
3+
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3874461.svg)](https://doi.org/10.5281/zenodo.3874461) [![Project Status: WIP – Initial development is in progress, but there has not yet been a stable, usable release suitable for the public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip) [![Build Status](https://travis-ci.org/AlessioZanga/PyEEGLab.svg?branch=master)](https://travis-ci.org/AlessioZanga/PyEEGLab) [![Documentation Status](https://readthedocs.org/projects/pyeeglab/badge/?version=latest)](https://pyeeglab.readthedocs.io/en/latest/?badge=latest) [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/AlessioZanga/PyEEGLab) [![codecov](https://codecov.io/gh/AlessioZanga/PyEEGLab/branch/master/graph/badge.svg)](https://codecov.io/gh/AlessioZanga/PyEEGLab) [![Maintainability](https://api.codeclimate.com/v1/badges/c55f67ee28e9e8bd8038/maintainability)](https://codeclimate.com/github/AlessioZanga/PyEEGLab/maintainability)
44

55
Analyze and manipulate EEG data using PyEEGLab.
66

@@ -18,6 +18,10 @@ PyEEGLab is distributed using the pip repository:
1818

1919
pip install PyEEGLab
2020

21+
If you use Python 3.6, the dataclasses package must be installed as backport of Python 3.7 dataclasses:
22+
23+
pip install dataclasses
24+
2125
If you need a bleeding edge version, you can install it directly from GitHub:
2226

2327
pip install git+https://github.com/AlessioZanga/PyEEGLab@develop
@@ -48,6 +52,8 @@ If you use this code in your project use the citation below:
4852
title={PyEEGLab: A simple tool for EEG manipulation},
4953
author={Alessio Zanga},
5054
year={2019},
55+
doi={10.5281/zenodo.3874461},
56+
url={https://dx.doi.org/10.5281/zenodo.3874461},
5157
howpublished={\url{https://github.com/AlessioZanga/PyEEGLab}},
5258
}
5359

environment.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

examples/tuh_eeg_abnormal/example_cnn_dense_classification.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import sys
2222

2323
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
24-
from pyeeglab import TUHEEGAbnormalDataset, SinglePickleCache, Pipeline, CommonChannelSet, \
24+
from pyeeglab import TUHEEGAbnormalDataset, PickleCache, Pipeline, CommonChannelSet, \
2525
LowestFrequency, ToDataframe, DynamicWindow, BinarizedSpearmanCorrelation, \
2626
ToNumpy
2727

2828
dataset = TUHEEGAbnormalDataset('../../data/tuh_eeg_abnormal/v2.0.0/edf')
29-
dataset.set_cache_manager(SinglePickleCache('../../export'))
29+
dataset.set_cache_manager(PickleCache('../../export'))
3030

3131
preprocessing = Pipeline([
3232
CommonChannelSet(),

examples/tuh_eeg_abnormal/example_cnn_dense_classification_with_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import sys
2222

2323
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
24-
from pyeeglab import TUHEEGAbnormalDataset, SinglePickleCache, Pipeline, CommonChannelSet, \
24+
from pyeeglab import TUHEEGAbnormalDataset, PickleCache, Pipeline, CommonChannelSet, \
2525
LowestFrequency, BandPassFrequency, ToDataframe, DynamicWindow, \
2626
BinarizedSpearmanCorrelation, ToNumpy
2727

2828
dataset = TUHEEGAbnormalDataset('../../data/tuh_eeg_abnormal/v2.0.0/edf')
29-
dataset.set_cache_manager(SinglePickleCache('../../export'))
29+
dataset.set_cache_manager(PickleCache('../../export'))
3030

3131
preprocessing = Pipeline([
3232
CommonChannelSet(),

examples/tuh_eeg_abnormal/example_cnn_lstm_classification.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import sys
2222

2323
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
24-
from pyeeglab import TUHEEGAbnormalDataset, SinglePickleCache, Pipeline, CommonChannelSet, \
24+
from pyeeglab import TUHEEGAbnormalDataset, PickleCache, Pipeline, CommonChannelSet, \
2525
LowestFrequency, ToDataframe, DynamicWindow, BinarizedSpearmanCorrelation, \
2626
ToNumpy
2727

2828
dataset = TUHEEGAbnormalDataset('../../data/tuh_eeg_abnormal/v2.0.0/edf')
29-
dataset.set_cache_manager(SinglePickleCache('../../export'))
29+
dataset.set_cache_manager(PickleCache('../../export'))
3030

3131
preprocessing = Pipeline([
3232
CommonChannelSet(),

examples/tuh_eeg_abnormal/example_cnn_lstm_classification_with_filter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import sys
2222

2323
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
24-
from pyeeglab import TUHEEGAbnormalDataset, SinglePickleCache, Pipeline, CommonChannelSet, \
24+
from pyeeglab import TUHEEGAbnormalDataset, PickleCache, Pipeline, CommonChannelSet, \
2525
LowestFrequency, BandPassFrequency, ToDataframe, DynamicWindow, \
2626
BinarizedSpearmanCorrelation, ToNumpy
2727

2828
dataset = TUHEEGAbnormalDataset('../../data/tuh_eeg_abnormal/v2.0.0/edf')
29-
dataset.set_cache_manager(SinglePickleCache('../../export'))
29+
dataset.set_cache_manager(PickleCache('../../export'))
3030

3131
preprocessing = Pipeline([
3232
CommonChannelSet(),

examples/tuh_eeg_abnormal/example_gat_lstm_classification.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
import sys
2424

2525
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
26-
from pyeeglab import TUHEEGAbnormalDataset, SinglePickleCache, Pipeline, CommonChannelSet, \
26+
from pyeeglab import TUHEEGAbnormalDataset, PickleCache, Pipeline, CommonChannelSet, \
2727
LowestFrequency, ToDataframe, DynamicWindow, BinarizedSpearmanCorrelation, \
28-
CorrelationToAdjacency, Bandpower, GraphWithFeatures, JoinedPreprocessor
28+
CorrelationToAdjacency, Bandpower, GraphWithFeatures, ForkedPreprocessor
2929

3030
dataset = TUHEEGAbnormalDataset('../../data/tuh_eeg_abnormal/v2.0.0/edf')
31-
dataset.set_cache_manager(SinglePickleCache('../../export'))
31+
dataset.set_cache_manager(PickleCache('../../export'))
3232

3333
preprocessing = Pipeline([
3434
CommonChannelSet(),
3535
LowestFrequency(),
3636
ToDataframe(),
3737
DynamicWindow(8),
38-
JoinedPreprocessor(
38+
ForkedPreprocessor(
3939
inputs=[
4040
[BinarizedSpearmanCorrelation(), CorrelationToAdjacency()],
4141
Bandpower()

examples/tuh_eeg_abnormal/example_gat_lstm_classification_with_filter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323
import sys
2424

2525
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
26-
from pyeeglab import TUHEEGAbnormalDataset, SinglePickleCache, Pipeline, CommonChannelSet, \
26+
from pyeeglab import TUHEEGAbnormalDataset, PickleCache, Pipeline, CommonChannelSet, \
2727
LowestFrequency, BandPassFrequency, ToDataframe, DynamicWindow, \
2828
BinarizedSpearmanCorrelation, CorrelationToAdjacency, Bandpower, \
29-
GraphWithFeatures, JoinedPreprocessor
29+
GraphWithFeatures, ForkedPreprocessor
3030

3131
dataset = TUHEEGAbnormalDataset('../../data/tuh_eeg_abnormal/v2.0.0/edf')
32-
dataset.set_cache_manager(SinglePickleCache('../../export'))
32+
dataset.set_cache_manager(PickleCache('../../export'))
3333

3434
preprocessing = Pipeline([
3535
CommonChannelSet(),
3636
LowestFrequency(),
3737
BandPassFrequency(0.1, 47),
3838
ToDataframe(),
3939
DynamicWindow(8),
40-
JoinedPreprocessor(
40+
ForkedPreprocessor(
4141
inputs=[
4242
[BinarizedSpearmanCorrelation(), CorrelationToAdjacency()],
4343
Bandpower()

0 commit comments

Comments
 (0)