Skip to content

Commit

Permalink
Merge pull request #287 from NeuroTechX/develop
Browse files Browse the repository at this point in the history
Merge 0.4.6 into master
  • Loading branch information
Sylvain Chevallier authored Apr 7, 2022
2 parents bc046ea + 5312214 commit 3889e2b
Show file tree
Hide file tree
Showing 10 changed files with 701 additions and 113 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ one of the sections below, or just scroll down to find out more.
- [Supported datasets](#supported-datasets)
- [Who are we? n](#who-are-we)
- [Get in touch](#contact-us)
- [Documentation](#documentation)
- [Documentation][link_moabb_docs]
- [Architecture and main concepts](#architecture-and-main-concepts)
- [Citing MOABB and related publications](#citing-moabb-and-related-publications)

Expand Down
8 changes: 8 additions & 0 deletions docs/source/datasets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,21 @@ ERP Datasets
:toctree: generated/
:template: class.rst

bi2012a
bi2013a
bi2014a
bi2014b
bi2015a
bi2015b
BNCI2014008
BNCI2014009
BNCI2015003
DemonsP300
EPFLP300
Huebner2017
Huebner2018
Lee2019_ERP
Sosulski2019


--------------
Expand Down
21 changes: 19 additions & 2 deletions docs/source/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,30 @@ API changes

- None


Version - 0.4.5 (Stable - PyPi)
Version - 0.4.6 (Stable - PyPi)
---------------------------------

Enhancements
~~~~~~~~~~~~

- Add P300 BrainInvaders datasets (:gh:`283` by `Sylvain Chevallier`_)
- Add explicit warning when lambda function are used to parametrize pipelines (:gh:`278` by `Jan Sosulski`_)


Bugs
~~~~

- Correct default path for ERP visualization (:gh:`279` by `Jan Sosulski`_)
- Correct documentation (:gh:`282` and :gh:`284` by `Jan Sosulski`_)



Version - 0.4.5
---------------

Enhancements
~~~~~~~~~~~~

- Progress bars, pooch, tqdm (:gh:`258` by `Divyesh Narayanan`_ and `Sylvain Chevallier`_)
- Adding test and example for set_download_dir (:gh:`249` by `Divyesh Narayanan`_)
- Update to newer version of Schirrmeister2017 dataset (:gh:`265` by `Robin Schirrmeister`_)
Expand Down
2 changes: 1 addition & 1 deletion moabb/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# flake8: noqa
__version__ = "0.4.5"
__version__ = "0.4.6"

from moabb.utils import set_log_level
10 changes: 10 additions & 0 deletions moabb/analysis/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import os
import os.path as osp
import re
import warnings
from datetime import datetime

import h5py
Expand All @@ -17,6 +18,15 @@ def get_string_rep(obj):
str_repr = repr(obj.get_params())
else:
str_repr = repr(obj)
if "<lambda> at " in str_repr:
warnings.warn(
"You are probably using a classifier with a lambda function"
" as an attribute. Lambda functions can only be identified"
" by memory address which MOABB does not consider. To avoid"
" issues you can use named functions defined using the def"
" keyword instead.",
RuntimeWarning,
)
str_no_addresses = re.sub("0x[a-z0-9]*", "0x__", str_repr)
return str_no_addresses.replace("\n", "").encode("utf8")

Expand Down
2 changes: 1 addition & 1 deletion moabb/datasets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
BNCI2015003,
BNCI2015004,
)
from .braininvaders import bi2013a
from .braininvaders import bi2012, bi2013a, bi2014a, bi2014b, bi2015a, bi2015b
from .epfl import EPFLP300
from .gigadb import Cho2017
from .huebner_llp import Huebner2017, Huebner2018
Expand Down
Loading

0 comments on commit 3889e2b

Please sign in to comment.