.

aeye-lab · Sep 14, 2023 · e106667 · e106667
1 parent 9de020f
commit e106667
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 92 deletions.
diff --git a/src/pymovements/gaze/integration.py b/src/pymovements/gaze/integration.py
@@ -26,7 +26,6 @@
 import pandas as pd
 import polars as pl
 
-from pymovements.events.frame import EventDataFrame
 from pymovements.gaze.experiment import Experiment
 from pymovements.gaze.gaze_dataframe import GazeDataFrame
 from pymovements.utils import checks
@@ -35,7 +34,6 @@
 def from_numpy(
         data: np.ndarray | None = None,
         experiment: Experiment | None = None,
-        events: EventDataFrame | None = None,
         *,
         time: np.ndarray | None = None,
         pixel: np.ndarray | None = None,
@@ -68,8 +66,6 @@ def from_numpy(
         Two-dimensional data represented as a numpy ndarray.
     experiment : Experiment
         The experiment definition.
-    events: EventDataFrame
-        A dataframe of events in the gaze signal.
     time:
         Array of timestamps.
     pixel:
@@ -204,7 +200,6 @@ def from_numpy(
         return GazeDataFrame(
             data=df,
             experiment=experiment,
-            events=events,
             time_column=time_column,
             pixel_columns=pixel_columns,
             position_columns=position_columns,
@@ -250,7 +245,6 @@ def from_numpy(
     return GazeDataFrame(
         data=df,
         experiment=experiment,
-        events=events,
         time_column=time_column,
         pixel_columns=pixel_columns,
         position_columns=position_columns,
@@ -262,7 +256,6 @@ def from_numpy(
 def from_pandas(
         data: pd.DataFrame,
         experiment: Experiment | None = None,
-        events: EventDataFrame | None = None,
         *,
         time_column: str | None = None,
         pixel_columns: list[str] | None = None,
@@ -278,8 +271,6 @@ def from_pandas(
         Data represented as a pandas DataFrame.
     experiment : Experiment
         The experiment definition.
-    events: EventDataFrame
-        A dataframe of events in the gaze signal.
     time_column:
         The name of the timestamp column in the input data frame.
     pixel_columns:
@@ -299,7 +290,6 @@ def from_pandas(
     return GazeDataFrame(
         data=df,
         experiment=experiment,
-        events=events,
         time_column=time_column,
         pixel_columns=pixel_columns,
         position_columns=position_columns,

diff --git a/tests/gaze/integration_numpy_test.py b/tests/gaze/integration_numpy_test.py
@@ -20,7 +20,6 @@
 """Test from gaze.from_numpy."""
 import numpy as np
 import polars as pl
-import pytest
 from polars.testing import assert_frame_equal
 
 import pymovements as pm
@@ -186,41 +185,3 @@ def test_from_numpy_all_none():
 
     assert_frame_equal(gaze.frame, expected)
     assert gaze.n_components is None
-
-
-@pytest.mark.parametrize(
-    'events',
-    [
-        pytest.param(
-            None,
-            id='events_none',
-        ),
-
-        pytest.param(
-            pm.EventDataFrame(),
-            id='events_empty',
-        ),
-
-        pytest.param(
-            pm.EventDataFrame(name='fixation', onsets=[123], offsets=[345]),
-            id='fixation',
-        ),
-
-        pytest.param(
-            pm.EventDataFrame(name='saccade', onsets=[34123], offsets=[67345]),
-            id='saccade',
-        ),
-
-    ],
-)
-def test_from_numpy_events(events):
-    if events is None:
-        expected_events = pm.EventDataFrame().frame
-    else:
-        expected_events = events.frame
-
-    gaze = pm.gaze.from_numpy(events=events)
-
-    assert_frame_equal(gaze.events.frame, expected_events)
-    # We don't want the events point to the same reference.
-    assert gaze.events.frame is not expected_events
diff --git a/tests/gaze/integration_pandas_test.py b/tests/gaze/integration_pandas_test.py
@@ -20,7 +20,6 @@
 """Test from gaze.from_pandas."""
 import pandas as pd
 import polars as pl
-import pytest
 from polars.testing import assert_frame_equal
 
 import pymovements as pm
@@ -72,45 +71,3 @@ def test_from_pandas_explicit_columns():
     })
 
     assert_frame_equal(gaze.frame, expected)
-
-
-@pytest.mark.parametrize(
-    ('df', 'events'),
-    [
-        pytest.param(
-            pd.DataFrame(),
-            None,
-            id='events_none',
-        ),
-
-        pytest.param(
-            pd.DataFrame(),
-            pm.EventDataFrame(),
-            id='events_empty',
-        ),
-
-        pytest.param(
-            pd.DataFrame(),
-            pm.EventDataFrame(name='fixation', onsets=[123], offsets=[345]),
-            id='fixation',
-        ),
-
-        pytest.param(
-            pd.DataFrame(),
-            pm.EventDataFrame(name='saccade', onsets=[34123], offsets=[67345]),
-            id='saccade',
-        ),
-
-    ],
-)
-def test_from_pandas_events(df, events):
-    if events is None:
-        expected_events = pm.EventDataFrame().frame
-    else:
-        expected_events = events.frame
-
-    gaze = pm.gaze.from_pandas(data=df, events=events)
-
-    assert_frame_equal(gaze.events.frame, expected_events)
-    # We don't want the events point to the same reference.
-    assert gaze.events.frame is not expected_events