Bugfix: create_dataset returned wrong stimulus indices

only happened for ScanpathFixations. Fixations and FixationTrains were correct. For ScanpathFixations, the `n` attributes of scanpaths and fixations were not updated to reflect the new indices. Signed-off-by: Matthias Kümmerer <[email protected]>
matthias-k · Jun 24, 2024 · 6d629d0 · 6d629d0
1 parent 8fe67e9
commit 6d629d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/pysaliency/datasets/__init__.py b/pysaliency/datasets/__init__.py
@@ -73,6 +73,7 @@ def create_subset(stimuli, fixations, stimuli_indices):
         new_image_indices = [new_pos[i] for i in fixations.scanpaths.n[scanpath_inds]]
 
         new_scanpaths = fixations.scanpaths[scanpath_inds]
+        new_scanpaths.n = np.array(new_image_indices)
 
         new_fixations = ScanpathFixations(
             scanpaths=new_scanpaths,

diff --git a/tests/datasets/test_datasets.py b/tests/datasets/test_datasets.py
@@ -117,8 +117,10 @@ def test_create_subset_scanpath_fixations(file_stimuli_with_attributes, scanpath
     sub_stimuli, sub_fixations = pysaliency.datasets.create_subset(file_stimuli_with_attributes, scanpath_fixations, stimulus_indices)
 
     expected_sub_fixations = scanpath_fixations.filter_scanpaths(scanpath_indices).copy()
-    expected_sub_fixations.scanpaths.n = sub_fixations.scanpaths.n
-    expected_sub_fixations.n = sub_fixations.n
+    expected_scanpath_n = np.array([stimulus_indices.index(n) for n in expected_sub_fixations.scanpaths.n])
+    expected_sub_fixations.scanpaths.n = expected_scanpath_n
+    expected_fixation_n = np.array([stimulus_indices.index(n) for n in expected_sub_fixations.n])
+    expected_sub_fixations.n = expected_fixation_n
 
     assert_scanpath_fixations_equal(sub_fixations, expected_sub_fixations)
 
@@ -132,8 +134,10 @@ def test_create_subset_fixation_trains(file_stimuli_with_attributes, fixation_tr
     sub_stimuli, sub_fixations = pysaliency.datasets.create_subset(file_stimuli_with_attributes, fixation_trains, stimulus_indices)
 
     expected_sub_fixations= fixation_trains.filter_scanpaths(scanpath_indices).copy()
-    expected_sub_fixations.scanpaths.n = sub_fixations.scanpaths.n
-    expected_sub_fixations.n = sub_fixations.n
+    expected_scanpath_n = np.array([stimulus_indices.index(n) for n in expected_sub_fixations.scanpaths.n])
+    expected_sub_fixations.scanpaths.n = expected_scanpath_n
+    expected_fixation_n = np.array([stimulus_indices.index(n) for n in expected_sub_fixations.n])
+    expected_sub_fixations.n = expected_fixation_n
 
     assert_fixation_trains_equal(sub_fixations, expected_sub_fixations)
 
@@ -148,8 +152,8 @@ def test_create_subset_fixations(file_stimuli_with_attributes, fixation_trains,
     sub_stimuli, sub_fixations = pysaliency.datasets.create_subset(file_stimuli_with_attributes, fixations, stimulus_indices)
 
     expected_sub_fixations= fixations[fixation_indices].copy()
-    expected_sub_fixations.n = sub_fixations.n
-
+    expected_fixation_n = np.array([stimulus_indices.index(n) for n in expected_sub_fixations.n])
+    expected_sub_fixations.n = expected_fixation_n
     assert not isinstance(sub_fixations, pysaliency.FixationTrains)
     assert_fixations_equal(sub_fixations, expected_sub_fixations)
 

diff --git a/tests/datasets/utils.py b/tests/datasets/utils.py
@@ -60,6 +60,7 @@ def assert_fixations_equal(f1, f2, crop_length=False):
     np.testing.assert_array_equal(f1.x, f2.x)
     np.testing.assert_array_equal(f1.y, f2.y)
     np.testing.assert_array_equal(f1.t, f2.t)
+    np.testing.assert_array_equal(f1.n, f2.n)
     assert_variable_length_array_equal(f1.x_hist, f2.x_hist)
     assert_variable_length_array_equal(f1.y_hist, f2.y_hist)
     assert_variable_length_array_equal(f1.t_hist, f2.t_hist)