Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix COCO-Search 18: Adaptation to Refactoring was missing #77

Merged
merged 1 commit into from
Jun 25, 2024
Merged

Bugfix COCO-Search 18: Adaptation to Refactoring was missing #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions pysaliency/external_datasets/coco_search18.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Loading