Merge branch 'develop' into add-weibo2014-test

Author: bruAristimunha

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ exclude: ".*svg"
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-yaml
       - id: check-json
@@ -34,22 +34,22 @@ repos:
         args: [ "--autofix", "--no-sort-keys", "--indent=4" ]
 
 
-  - repo: https://github.com/psf/black
-    rev: 25.1.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 25.9.0
     hooks:
       - id: black
         language_version: python3
         args: [ --line-length=90, --target-version=py38 ]
 
   -   repo: https://github.com/asottile/blacken-docs
-      rev: 1.19.1
+      rev: 1.20.0
       hooks:
       -   id: blacken-docs
           additional_dependencies: [black==23.3.0]
           exclude: ^.github/
 
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.1
+    rev: 6.1.0
     hooks:
       - id: isort
 
@@ -69,7 +69,7 @@ repos:
         exclude: ^docs/ | ^setup\.py$ |
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.13.3
     hooks:
       - id: ruff
         args: [ --fix, --exit-non-zero-on-fix, --ignore, E501 ]

docs/source/api.rst

@@ -88,6 +88,8 @@ ERP/P300 Datasets
     ErpCore2021_N170
     ErpCore2021_N400
     ErpCore2021_P3
+    Kojima2024A
+    Kojima2024B
 
 --------------
 SSVEP Datasets

docs/source/whats_new.rst

@@ -5,6 +5,7 @@
 What's new
 ==========
 
+
 .. NOTE: there are 3 separate sections for changes, based on type:
 
 - "Enhancements" for new features
@@ -18,11 +19,13 @@ Develop branch  - 1.4  (dev)
 --------------------------------------
 Enhancements
 ~~~~~~~~~~~~
-
+- Adding :class:`moabb.datasets.Kojima2024A` (:gh:`807` by `Simon Kojima`_)
+- Adding :class:`moabb.datasets.Kojima2024B` (:gh:`806` by `Simon Kojima`_)
 - Add new dataset :class:`moabb.datasets.BNCI2003_IVa` dataset (:gh:`811` by `Griffin Keeler`_)
 
 Bugs
 ~~~~
+- Fixing label swapped issue with  :class:`moabb.datasets.Kalunga2016` dataset (:gh:`814` by `Griffin Keeler`_)
 
 API changes
 ~~~~~~~~~~~
@@ -596,4 +599,6 @@ API changes
 .. _Radovan Vodila: https://github.com/rvodila
 .. _Ulysse Durand: https://github.com/UlysseDurand
 .. _Lucas Heck: https://github.com/lucas-heck
+.. _Simon Kojima: https://github.com/simonkojima
 .. _Griffin Keeler: https://github.com/griffinkeeler
+.. _ Kosei Nakada: https://github.com/ponpopon

moabb/datasets/__init__.py

@@ -72,6 +72,8 @@
 from .gigadb import Cho2017
 from .hinss2021 import Hinss2021
 from .huebner_llp import Huebner2017, Huebner2018
+from .kojima2024a import Kojima2024A
+from .kojima2024b import Kojima2024B
 from .Lee2019 import Lee2019_ERP, Lee2019_MI, Lee2019_SSVEP
 from .liu2024 import Liu2024
 from .mpi_mi import MunichMI  # noqa: F401

moabb/datasets/base.py

@@ -13,6 +13,7 @@
 from typing import Any, Dict, Union
 
 import mne_bids
+import numpy as np
 import pandas as pd
 from sklearn.pipeline import Pipeline
 
@@ -404,6 +405,50 @@ def _create_process_pipeline(self):
             ]
         )
 
+    def _block_rep(self, block, repetition):
+        raise NotImplementedError()
+
+    def get_block_repetition(self, paradigm, subjects, block_list, repetition_list):
+        """Select data for all provided subjects, blocks and repetitions.
+
+        subject -> session -> run -> block -> repetition
+
+        See also
+        --------
+        BaseDataset.get_data
+
+        Parameters
+        ----------
+        subjects: List of int
+            List of subject number
+        block_list: List of int
+            List of block number
+        repetition_list: List of int
+            List of repetition number inside a block
+
+        Returns
+        -------
+        data: Dict
+            dict containing the raw data
+        """
+        X, labels, meta = paradigm.get_data(self, subjects)
+        X_select = []
+        labels_select = []
+        meta_select = []
+        for block in block_list:
+            for repetition in repetition_list:
+                run = self._block_rep(block, repetition)
+                X_select.append(X[meta["run"] == run])
+                labels_select.append(labels[meta["run"] == run])
+                meta_select.append(meta[meta["run"] == run])
+        X_select = np.concatenate(X_select)
+        labels_select = np.concatenate(labels_select)
+        meta_select = np.concatenate(meta_select)
+        df = pd.DataFrame(meta_select, columns=meta.columns)
+        meta_select = df
+
+        return X_select, labels_select, meta_select
+
     def get_data(
         self,
         subjects=None,

moabb/datasets/braininvaders.py

@@ -7,7 +7,6 @@
 
 import mne
 import numpy as np
-import pandas as pd
 import yaml
 from mne.channels import make_standard_montage
 from mne.utils import _open_lock
@@ -852,50 +851,5 @@ def data_path(
     ):
         return _bi_data_path(self, subject, path, force_update, update_path, verbose)
 
-    def get_block_repetition(self, paradigm, subjects, block_list, repetition_list):
-        """Select data for all provided subjects, blocks and repetitions. Each
-        subject has 12 blocks of 5 repetitions.
-
-        The returned data is a dictionary with the following structure::
-
-            data = {'subject_id' :
-                        {'session_id':
-                            {'run_id': raw}
-                        }
-                    }
-
-        See also
-        --------
-        BaseDataset.get_data
-
-        Parameters
-        ----------
-        subjects: List of int
-            List of subject number
-        block_list: List of int
-            List of block number (from 0 to 11)
-        repetition_list: List of int
-            List of repetition number inside a block (from 0 to 4)
-
-        Returns
-        -------
-        data: Dict
-            dict containing the raw data
-        """
-        X, labels, meta = paradigm.get_data(self, subjects)
-        X_select = []
-        labels_select = []
-        meta_select = []
-        for block in block_list:
-            for repetition in repetition_list:
-                run = block_rep(block, repetition, self.n_repetitions)
-                X_select.append(X[meta["run"] == run])
-                labels_select.append(labels[meta["run"] == run])
-                meta_select.append(meta[meta["run"] == run])
-        X_select = np.concatenate(X_select)
-        labels_select = np.concatenate(labels_select)
-        meta_select = np.concatenate(meta_select)
-        df = pd.DataFrame(meta_select, columns=meta.columns)
-        meta_select = df
-
-        return X_select, labels_select, meta_select
+    def _block_rep(self, block, repetition):
+        return block_rep(block, repetition, self.n_repetitions)

moabb/datasets/fake.py

@@ -8,7 +8,6 @@
 from mne.io import RawArray
 
 from moabb.datasets.base import BaseDataset
-from moabb.datasets.braininvaders import Cattan2019_VR
 from moabb.datasets.utils import block_rep
 
 
@@ -197,37 +196,5 @@ def _get_single_subject_data(self, subject):
                     ] = self._generate_raw(n, d)
         return data
 
-    def get_block_repetition(self, paradigm, subjects, block_list, repetition_list):
-        """Select data for all provided subjects, blocks and repetitions. Each
-        subject has 5 blocks of 12 repetitions.
-
-        The returned data is a dictionary with the following structure::
-
-            data = {'subject_id' :
-                        {'session_id':
-                            {'run_id': raw}
-                        }
-                    }
-
-        See also
-        --------
-        BaseDataset.get_data
-        Cattan2019_VR.get_block_repetition
-
-        Parameters
-        ----------
-        subjects: List of int
-            List of subject number
-        block_list: List of int
-            List of block number (from 1 to 5)
-        repetition_list: List of int
-            List of repetition number inside a block (from 1 to 12)
-
-        Returns
-        -------
-        data: Dict
-            dict containing the raw data
-        """
-        return Cattan2019_VR.get_block_repetition(
-            self, paradigm, subjects, block_list, repetition_list
-        )
+    def _block_rep(self, block, repetition):
+        return block_rep(block, repetition, self.n_repetitions)