eegdash 0.3.1__py3-none-any.whl → 0.3.1.dev51__py3-none-any.whl

eegdash/__init__.py

@@ -5,4 +5,4 @@ from .utils import __init__mongo_client
 __init__mongo_client()
 
 __all__ = ["EEGDash", "EEGDashDataset", "EEGChallengeDataset"]
-__version__ = "0.3.1"
+__version__ = "0.3.1.dev51"

eegdash/data_utils.py

@@ -55,21 +55,25 @@ class EEGDashBaseDataset(BaseDataset):
         self.cache_dir = Path(cache_dir)
         bids_kwargs = self.get_raw_bids_args()
 
-        self.bidspath = BIDSPath(
-            root=self.cache_dir / record["dataset"],
-            datatype="eeg",
-            suffix="eeg",
-            **bids_kwargs,
-        )
         if s3_bucket:
             self.s3_bucket = s3_bucket
             self.s3_open_neuro = False
+            bids_root = self.cache_dir
+            self.filecache = self.cache_dir / record["bidspath"]
         else:
             self.s3_bucket = self._AWS_BUCKET
             self.s3_open_neuro = True
+            bids_root = self.cache_dir / record["dataset"]
+            self.filecache = self.cache_dir / record["bidspath"]
+
+        self.bidspath = BIDSPath(
+            root=bids_root,
+            datatype="eeg",
+            suffix="eeg",
+            **bids_kwargs,
+        )
 
         self.s3file = self.get_s3path(record["bidspath"])
-        self.filecache = self.cache_dir / record["bidspath"]
         self.bids_dependencies = record["bidsdependencies"]
         # Temporary fix for BIDS dependencies path
         # just to release to the competition
@@ -85,14 +89,18 @@ class EEGDashBaseDataset(BaseDataset):
         return f"{self.s3_bucket}/{filepath}"
 
     def _download_s3(self) -> None:
-        """Fetch the given data from its S3 location and cache it locally."""
-        self.filecache.parent.mkdir(parents=True, exist_ok=True)
+        """Download function that gets the raw EEG data from S3."""
         filesystem = s3fs.S3FileSystem(
             anon=True, client_kwargs={"region_name": "us-east-2"}
         )
         if not self.s3_open_neuro:
             self.s3file = re.sub(r"(^|/)ds\d{6}/", r"\1", self.s3file, count=1)
+            self.filecache = re.sub(
+                r"(^|/)ds\d{6}/", r"\1", str(self.filecache), count=1
+            )
+            self.filecache = Path(self.filecache)
 
+        self.filecache.parent.mkdir(parents=True, exist_ok=True)
         filesystem.download(self.s3file, self.filecache)
         self.filenames = [self.filecache]
 
@@ -106,6 +114,8 @@ class EEGDashBaseDataset(BaseDataset):
         for dep in self.bids_dependencies:
             s3path = self.get_s3path(dep)
             filepath = self.cache_dir / dep
+            # here, we download the dependency and it is fine
+            # in the case of the competition.
             if not filepath.exists():
                 filepath.parent.mkdir(parents=True, exist_ok=True)
                 filesystem.download(s3path, filepath)

eegdash/features/feature_bank/complexity.py

@@ -71,7 +71,7 @@ def complexity_svd_entropy(x, m=10, tau=1):
 @FeaturePredecessor(*SIGNAL_PREDECESSORS)
 @univariate_feature
 @nb.njit(cache=True, fastmath=True)
-def complexity_lempel_ziv(x, threshold=None):
+def complexity_lempel_ziv(x, threshold=None, normalize=True):
     lzc = np.empty(x.shape[:-1])
     for i in np.ndindex(x.shape[:-1]):
         t = np.median(x[i]) if threshold is None else threshold
@@ -97,4 +97,6 @@ def complexity_lempel_ziv(x, threshold=None):
                     j, k, k_max = 0, 1, 1
                 else:
                     k = 1
+        if normalize:
+            lzc[i] *= np.log2(n) / n
     return lzc

eegdash/features/feature_bank/csp.py

@@ -97,5 +97,5 @@ class CommonSpatialPattern(TrainableFeature):
                 + "all weights were filtered out."
             )
         proj = (self.transform_input(x) - self._mean) @ w
-        proj = proj.reshape(x.shape[0], x.shape[2], -1).mean(axis=1)
+        proj = proj.reshape(x.shape[0], x.shape[2], -1).var(axis=1)
         return {f"{i}": proj[:, i] for i in range(proj.shape[-1])}

{eegdash-0.3.1.dist-info → eegdash-0.3.1.dev51.dist-info}/METADATA

@@ -1,14 +1,16 @@
 Metadata-Version: 2.4
 Name: eegdash
-Version: 0.3.1
+Version: 0.3.1.dev51
 Summary: EEG data for machine learning
-Author-email: Young Truong <dt.young112@gmail.com>, Arnaud Delorme <adelorme@gmail.com>, Bruno Aristimunha <b.aristimunha@gmail.com>
+Author-email: Young Truong <dt.young112@gmail.com>, Arnaud Delorme <adelorme@gmail.com>, Aviv Dotan <avivd220@gmail.com>, Oren Shriki <oren70@gmail.com>, Bruno Aristimunha <b.aristimunha@gmail.com>
 License: GNU General Public License
         
         Copyright (C) 2024-2025
         
         Young Truong, UCSD, dt.young112@gmail.com
         Arnaud Delorme, UCSD, adelorme@ucsd.edu
+        Aviv Dotan, BGU, avivdot@bgu.post.ac.il
+        Oren Shriki, BGU, shrikio@bgu.ac.il
         Bruno Aristimunha, b.aristimunha@gmail.com
         
         This program is free software; you can redistribute it and/or modify

{eegdash-0.3.1.dist-info → eegdash-0.3.1.dev51.dist-info}/RECORD

@@ -1,7 +1,7 @@
-eegdash/__init__.py,sha256=sNP5x1-Ek6HhCM9KzACR7_WvkY7NYvvw3Iv6um43gfw,232
+eegdash/__init__.py,sha256=gfDfEiCyZNcpnl_NcJnYqr4r9XfSMxxSwIrAmP56K-8,238
 eegdash/api.py,sha256=igpkLTCjH6NNQf8tEizA6SF8cYa1gE22-hNVxNRPszg,26747
 eegdash/data_config.py,sha256=OS6ERO-jHrnEOfMJUehY7ieABdsRw_qWzOKJ4pzSfqw,1323
-eegdash/data_utils.py,sha256=hUjSO-2hBZF_f7We7RSXbm3H15-j58rBZZxmFFggyJE,24191
+eegdash/data_utils.py,sha256=-K_S5rGBUDYZl7U7b27DBPeQKt0jIf-pbj3H6ExnHoY,24603
 eegdash/dataset.py,sha256=BngXb9TtAo0Sjc3o5bRC0fJkQrThdsqzx2Zpvp7xtvs,2374
 eegdash/mongodb.py,sha256=GD3WgA253oFgpzOHrYaj4P1mRjNtDMT5Oj4kVvHswjI,2006
 eegdash/preprocessing.py,sha256=7S_TTRKPKEk47tTnh2D6WExBt4cctAMxUxGDjJqq5lU,2221
@@ -14,15 +14,15 @@ eegdash/features/inspect.py,sha256=PmbWhx5H_WqpnorUpWONUSkUtaIHkZblRa_Xyk7Szyc,1
 eegdash/features/serialization.py,sha256=snXuHVd0CoT2ese0iWi5RwZrVHCGc0oCZ8-SXqGY88I,2848
 eegdash/features/utils.py,sha256=eM6DdyOpdVfNh7dSPykJ0WaTDtaGvkCQWAmW0G8v60Y,3784
 eegdash/features/feature_bank/__init__.py,sha256=YsMXLC1FEtHL3IEw9pYw1fc5IY0x_hr2qWQowI5gZj8,2991
-eegdash/features/feature_bank/complexity.py,sha256=Ds1GAXZ0LGM32xB4EZC2jbMljUBv0yicf2SkuyLvN5I,3183
+eegdash/features/feature_bank/complexity.py,sha256=iy9uaLInsYdxKZlXHTWlgEpP9fVI-v9TqLGfnS15-Eg,3258
 eegdash/features/feature_bank/connectivity.py,sha256=bQ6KlxWm5GNpCS9ypLqBUr2L171Yq7wpBQT2tRQKTZ4,2159
-eegdash/features/feature_bank/csp.py,sha256=YOzieLnOcqjvfrcjvg8R3S4SWuC1BqK5J5WXVNCCTc0,3304
+eegdash/features/feature_bank/csp.py,sha256=jKPrmqBj7FliybNbg035cVZddvVSkhk9OazcscDpipU,3303
 eegdash/features/feature_bank/dimensionality.py,sha256=j_Ds71Y1AbV2uLFQj8EuXQ4kzofLBlQtPV5snMkF7i4,3965
 eegdash/features/feature_bank/signal.py,sha256=3Tb8z9gX7iZipxQJ9DSyy30JfdmW58kgvimSyZX74p8,3404
 eegdash/features/feature_bank/spectral.py,sha256=bNB7skusePs1gX7NOU6yRlw_Gr4UOCkO_ylkCgybzug,3319
 eegdash/features/feature_bank/utils.py,sha256=DGh-Q7-XFIittP7iBBxvsJaZrlVvuY5mw-G7q6C-PCI,1237
-eegdash-0.3.1.dist-info/licenses/LICENSE,sha256=KykUD4H3kw3HLz5bZ0kxMWwZotnk8rhkfCCerGyX2sk,855
-eegdash-0.3.1.dist-info/METADATA,sha256=XPr6_yorRXXsHSRWILffJ09I9yrLfs8m_36Gd7-mIZY,10621
-eegdash-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eegdash-0.3.1.dist-info/top_level.txt,sha256=zavO69HQ6MyZM0aQMR2zUS6TAFc7bnN5GEpDpOpFZzU,8
-eegdash-0.3.1.dist-info/RECORD,,
+eegdash-0.3.1.dev51.dist-info/licenses/LICENSE,sha256=asisR-xupy_NrQBFXnx6yqXeZcYWLvbAaiETl25iXT0,931
+eegdash-0.3.1.dev51.dist-info/METADATA,sha256=eiLWVqqlZi3hgMEXOkcJk2vDlc5eTHNQ7drdh8CKyCQ,10784
+eegdash-0.3.1.dev51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eegdash-0.3.1.dev51.dist-info/top_level.txt,sha256=zavO69HQ6MyZM0aQMR2zUS6TAFc7bnN5GEpDpOpFZzU,8
+eegdash-0.3.1.dev51.dist-info/RECORD,,

{eegdash-0.3.1.dist-info → eegdash-0.3.1.dev51.dist-info}/licenses/LICENSE

@@ -4,6 +4,8 @@ Copyright (C) 2024-2025
 
 Young Truong, UCSD, dt.young112@gmail.com
 Arnaud Delorme, UCSD, adelorme@ucsd.edu
+Aviv Dotan, BGU, avivdot@bgu.post.ac.il
+Oren Shriki, BGU, shrikio@bgu.ac.il
 Bruno Aristimunha, b.aristimunha@gmail.com
 
 This program is free software; you can redistribute it and/or modify