From 664141f85db84d2bd810c17a6d2835e65245f08a Mon Sep 17 00:00:00 2001 From: nbara <10333715+nbara@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:39:04 +0100 Subject: [PATCH 1/4] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f19d848e..eb93525c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ codespell pydocstyle tqdm statsmodels -pyriemann @ git+https://github.com/alexandrebarachant/pyRiemann.git@1ecaa372b7c432f13e82685b2541ee48424a11c9 +git+git://github.com/alexandrebarachant/pyRiemann.git@1ecaa372b7c432f13e82685b2541ee48424a11c9#egg=pyriemann From 414aef42a601bb7b288a00802fa324bedf5e1504 Mon Sep 17 00:00:00 2001 From: nbara <10333715+nbara@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:42:04 +0100 Subject: [PATCH 2/4] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index eb93525c..f364b50f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ codespell pydocstyle tqdm statsmodels -git+git://github.com/alexandrebarachant/pyRiemann.git@1ecaa372b7c432f13e82685b2541ee48424a11c9#egg=pyriemann +git+git://github.com/ErikBjare/pyRiemann.git@1ecaa372b7c432f13e82685b2541ee48424a11c9#egg=pyriemann From 41c223230d639560d74e0d49c2ff051df2359a5f Mon Sep 17 00:00:00 2001 From: nbara <10333715+nbara@users.noreply.github.com> Date: Tue, 23 Feb 2021 13:58:21 +0100 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 2 +- requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8800fb7a..a1d84d49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ os: linux dist: xenial python: # We don't actually use the Travis Python, but this keeps it organized. - - "3.7" + - "3.8" install: - sudo apt-get update - pip install -r requirements.txt diff --git a/requirements.txt b/requirements.txt index f364b50f..7d34f17a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,7 @@ numpy scipy matplotlib scikit-learn +pandas sphinx pillow sphinx-gallery From 1a3b5c67bc4ed536189bea5e37ddbf1762336db7 Mon Sep 17 00:00:00 2001 From: nbara <10333715+nbara@users.noreply.github.com> Date: Tue, 23 Feb 2021 14:24:17 +0100 Subject: [PATCH 4/4] fix inline examples --- meegkit/ress.py | 2 ++ meegkit/utils/matrix.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meegkit/ress.py b/meegkit/ress.py index cdd8f022..7bc854c1 100644 --- a/meegkit/ress.py +++ b/meegkit/ress.py @@ -45,6 +45,7 @@ def RESS(X, sfreq: int, peak_freq: float, neig_freq: float = 1, -------- To project the RESS components back into sensor space, one can proceed as follows: + >>> # First apply RESS >>> from meegkit.utils import matmul3d # handles 3D matrix multiplication >>> out, fromRESS, _ = ress.RESS(data, sfreq, peak_freq, return_maps=True) @@ -53,6 +54,7 @@ def RESS(X, sfreq: int, peak_freq: float, neig_freq: float = 1, To transform a new observation into RESS component space (e.g. in the context of a cross-validation, with separate train/test sets): + >>> # Start by applying RESS to the train set: >>> out, _, toRESS = ress.RESS(data, sfreq, peak_freq, return_maps=True) >>> # Then multiply your test data by the toRESS: diff --git a/meegkit/utils/matrix.py b/meegkit/utils/matrix.py index 1501eb59..2264959b 100644 --- a/meegkit/utils/matrix.py +++ b/meegkit/utils/matrix.py @@ -91,8 +91,8 @@ def widen_mask(mask, widen=4, axis=0): Examples -------- - >> test = widen_mask(np.array([False, False, False, True, False], 1) - >> print(test) + >>> test = widen_mask(np.array([False, False, False, True, False], 1) + >>> print(test) [False False False True True]] """