Braindecode 1.8.0.dev183370663__tar.gz → 1.8.0.dev183527593__tar.gz

{braindecode-1.8.0.dev183370663/braindecode.egg-info → braindecode-1.8.0.dev183527593}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.8.0.dev183370663
+Version: 1.8.0.dev183527593
 Summary: Deep learning software to decode EEG, ECG or MEG signals
 Author-email: Robin Tibor Schirrmeister <robintibor@gmail.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Alexandre Gramfort <agramfort@meta.com>
 Maintainer-email: Alexandre Gramfort <agramfort@meta.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Robin Tibor Schirrmeister <robintibor@gmail.com>

{braindecode-1.8.0.dev183370663 → braindecode-1.8.0.dev183527593}/braindecode/datasets/base.py

@@ -59,7 +59,6 @@ def _html_row(label, value):
 
 _METADATA_INTERNAL_COLS = {
     "i_window_in_trial",
-    "i_trial_in_dataset",
     "i_start_in_trial",
     "i_stop_in_trial",
     "target",
@@ -1375,20 +1374,6 @@ class BaseConcatDataset(ConcatDataset, HubDatasetMixin, Generic[T]):
                 "datasets are WindowsDataset."
             )
 
-        for ds in self.datasets:
-            if hasattr(ds, "_windows") and ds._windows is not None:
-                df = ds._windows.metadata
-            else:
-                df = ds.metadata
-            if (
-                "i_trial_in_dataset" in df.columns
-                and "i_trial_in_dataset" in ds.description
-            ):
-                raise ValueError(
-                    "Dataset descriptions cannot contain the reserved window "
-                    "metadata key 'i_trial_in_dataset'."
-                )
-
         all_dfs = list()
         for ds in self.datasets:
             if hasattr(ds, "_windows") and ds._windows is not None:

{braindecode-1.8.0.dev183370663 → braindecode-1.8.0.dev183527593}/braindecode/preprocessing/windowers.py

@@ -354,13 +354,6 @@ def create_windows_from_events(
     -------
     windows_datasets: BaseConcatDataset[WindowsDataset | EEGWindowsDataset]
         Concatenated datasets of WindowsDataset containing the extracted windows.
-
-    Notes
-    -----
-    Event-window metadata contains the recording-local annotation row
-    ``i_trial_in_dataset``. This name is reserved: a same-named annotation
-    extra is discarded with a warning, and a same-named dataset description
-    cannot be combined by :meth:`BaseConcatDataset.get_metadata`.
     """
     on_last_window = _resolve_on_last_window(
         drop_last_window,
@@ -698,20 +691,14 @@ def _create_windows_from_events(
     events, events_id = mne.events_from_annotations(ds.raw, mapping, verbose=verbose)
     onsets = events[:, 0]
     ann = ds.raw.annotations
-    filtered_annotations = [
-        (i, annotation)
-        for i, annotation in enumerate(ann)
-        if annotation["description"] in events_id
-    ]
-    source_annotation_rows = np.array([i for i, _ in filtered_annotations], dtype=int)
     # Onsets are relative to the beginning of the recording
     filtered_durations = np.array(
-        [annotation["duration"] for _, annotation in filtered_annotations]
+        [a["duration"] for a in ann if a["description"] in events_id]
     )
 
     extras = None
     if hasattr(ann, "extras"):
-        extras = [annotation["extras"] for _, annotation in filtered_annotations]
+        extras = [a["extras"] for a in ann if a["description"] in events_id]
         if not any(extras):
             extras = None
 
@@ -829,7 +816,6 @@ def _create_windows_from_events(
                 events = events[checker_trials_size]
                 onsets = onsets[checker_trials_size]
                 stops = stops[checker_trials_size]
-                source_annotation_rows = source_annotation_rows[checker_trials_size]
                 if extras is not None:
                     extras = [e for i, e in enumerate(extras) if checker_trials_size[i]]
         description = events[:, -1]
@@ -837,11 +823,6 @@ def _create_windows_from_events(
         if not use_mne_epochs:
             onsets = onsets - ds.raw.first_samp
             stops = stops - ds.raw.first_samp
-        good_event_indices = np.flatnonzero(
-            window_size_samples
-            <= (stops + trial_stop_offset_samples)
-            - (onsets + trial_start_offset_samples)
-        )
         i_trials, i_window_in_trials, starts, stops = _compute_window_inds(
             onsets,
             stops,
@@ -852,7 +833,6 @@ def _create_windows_from_events(
             drop_last_window,
             accepted_bads_ratio,
         )
-        i_trials = [good_event_indices[i_trial] for i_trial in i_trials]
 
     if (on_overlapping_events != "ignore") and any(np.diff(starts) <= 0):
         msg = "Overlapping trials detected. You can ignore, warn, or raise an error, using the on_overlapping_events argument."
@@ -875,16 +855,13 @@ def _create_windows_from_events(
     metadata = pd.DataFrame(
         {
             "i_window_in_trial": i_window_in_trials,
-            "i_trial_in_dataset": source_annotation_rows[
-                np.asarray(i_trials, dtype=int)
-            ],
             "i_start_in_trial": starts,
             "i_stop_in_trial": stops,
             "target": description,
         }
     )
     if extras is not None:
-        extras_df = pd.DataFrame([dict(extra) for extra in extras])
+        extras_df = pd.DataFrame(extras)
         if forbidden_cols := set(metadata.columns).intersection(extras_df.columns):
             warnings.warn(
                 f"Dropping extra columns that conflict with windowing metadata: {forbidden_cols}"

braindecode-1.8.0.dev183527593/braindecode/version.py

@@ -0,0 +1 @@
+__version__ = "1.8.0.dev183527593"

{braindecode-1.8.0.dev183370663 → braindecode-1.8.0.dev183527593/braindecode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: braindecode
-Version: 1.8.0.dev183370663
+Version: 1.8.0.dev183527593
 Summary: Deep learning software to decode EEG, ECG or MEG signals
 Author-email: Robin Tibor Schirrmeister <robintibor@gmail.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Alexandre Gramfort <agramfort@meta.com>
 Maintainer-email: Alexandre Gramfort <agramfort@meta.com>, Bruno Aristimunha Pinto <b.aristimunha@gmail.com>, Robin Tibor Schirrmeister <robintibor@gmail.com>

{braindecode-1.8.0.dev183370663 → braindecode-1.8.0.dev183527593}/docs/whats_new.rst

@@ -28,14 +28,6 @@ Current 1.8.0 (GitHub)
 Enhancements
 ============
 
-- Preserve the recording-local row of each canonical MNE annotation as
-  ``i_trial_in_dataset`` in event-window metadata, keeping it aligned with
-  targets and annotation extras through event mapping, duration filtering,
-  and dropped short trials. Conflicting annotation extras are dropped with a
-  warning, while conflicting dataset descriptions are rejected during
-  metadata aggregation.
-  (:gh:`1130` by `Bruno Aristimunha`_)
-
 - Models with TorchScript-compatible forward paths can now be passed straight
   to :func:`torch.jit.script`, without first being rebuilt as a plain
   :class:`torch.nn.Module`.

braindecode-1.8.0.dev183370663/braindecode/version.py

@@ -1 +0,0 @@
-__version__ = "1.8.0.dev183370663"