Bugfix COCO-Search 18: Adaptation to Refactoring was missing

Signed-off-by: Matthias Kümmerer <[email protected]>
matthias-k · Jun 25, 2024 · 4d81430 · 4d81430
1 parent 5843378
commit 4d81430
Showing 1 changed file with 19 additions and 26 deletions.
diff --git a/pysaliency/external_datasets/coco_search18.py b/pysaliency/external_datasets/coco_search18.py
@@ -1,25 +1,17 @@
 import glob
-from hashlib import md5
 import json
 import os
 import shutil
-from subprocess import check_call
 import zipfile
-
+from hashlib import md5
 
 import numpy as np
 from PIL import Image
 from tqdm import tqdm
 
-from ..datasets import FixationTrains, create_subset
-from ..utils import (
-    TemporaryDirectory,
-    filter_files,
-    download_and_check,
-    atomic_directory_setup)
-
-from .utils import create_stimuli, _load
-
+from ..datasets import ScanpathFixations, Scanpaths, create_subset
+from ..utils import TemporaryDirectory, atomic_directory_setup, download_and_check, filter_files
+from .utils import _load, create_stimuli
 
 condition_mapping = {
     'present': 1,
@@ -153,11 +145,11 @@ def get_COCO_Search18(location=None, split=1, merge_tasks=True, unique_images=Tr
 
             all_scanpaths = _get_COCO_Search18_fixations(json_data_tp_train + json_data_tp_val + json_data_ta, orig_filenames, task_in_filename=not merge_tasks)
 
-            scanpaths_train = all_scanpaths.filter_fixation_trains(all_scanpaths.scanpath_attributes['split'] == 'train')
-            scanpaths_validation = all_scanpaths.filter_fixation_trains(all_scanpaths.scanpath_attributes['split'] == 'valid')
+            scanpaths_train = all_scanpaths.filter_scanpaths(all_scanpaths.scanpaths.scanpath_attributes['split'] == 'train')
+            scanpaths_validation = all_scanpaths.filter_scanpaths(all_scanpaths.scanpaths.scanpath_attributes['split'] == 'valid')
 
-            del scanpaths_train.scanpath_attributes['split']
-            del scanpaths_validation.scanpath_attributes['split']
+            del scanpaths_train.scanpaths.scanpath_attributes['split']
+            del scanpaths_validation.scanpaths.scanpath_attributes['split']
 
             ns_train = sorted(set(scanpaths_train.n))
             stimuli_train, fixations_train = create_subset(stimuli, scanpaths_train, ns_train)
@@ -313,21 +305,22 @@ def _get_COCO_Search18_fixations(json_data, filenames, task_in_filename):
         'reaction_time': reaction_time,
         'split': split,
     }
-    scanpath_fixation_attributes = {
+    fixation_attributes = {
         'durations': train_durations,
     }
     scanpath_attribute_mapping = {
         'durations': 'duration'
     }
-    fixations = FixationTrains.from_fixation_trains(
-        train_xs,
-        train_ys,
-        train_ts,
-        train_ns,
-        train_subjects,
+
+    fixations = ScanpathFixations(Scanpaths(
+        xs=train_xs,
+        ys=train_ys,
+        ts=train_ts,
+        n=train_ns,
+        subject=train_subjects,
         scanpath_attributes=scanpath_attributes,
-        scanpath_fixation_attributes=scanpath_fixation_attributes,
-        scanpath_attribute_mapping=scanpath_attribute_mapping,
-    )
+        fixation_attributes=fixation_attributes,
+        attribute_mapping=scanpath_attribute_mapping,
+    ))
 
     return fixations