From 31e99d383ab71e6200cc99c0a401d06856e860f1 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Tue, 1 Dec 2020 20:08:31 +0100
Subject: [PATCH] [py] Added json as default annotation type
---
bob/bio/base/database/csv_dataset.py | 6 +++---
bob/bio/base/test/test_filelist.py | 8 ++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/bob/bio/base/database/csv_dataset.py b/bob/bio/base/database/csv_dataset.py
index 9e22d238..7600f856 100644
--- a/bob/bio/base/database/csv_dataset.py
+++ b/bob/bio/base/database/csv_dataset.py
@@ -31,7 +31,7 @@ class AnnotationsLoader:
self,
annotation_directory=None,
annotation_extension=".json",
- annotation_type="eyecenter",
+ annotation_type="json",
):
self.annotation_directory = annotation_directory
self.annotation_extension = annotation_extension
@@ -172,7 +172,7 @@ class CSVToSampleLoader(CSVBaseSampleLoader):
kwargs = dict([[str(h).lower(), r] for h, r in zip(header[2:], row[2:])])
if self.metadata_loader is not None:
- metadata = self.metadata_loader(row)
+ metadata = self.metadata_loader(row, header=header)
kwargs.update(metadata)
return DelayedSample(
@@ -220,7 +220,7 @@ class LSTToSampleLoader(CSVBaseSampleLoader):
kwargs = {"subject": str(subject)}
if self.metadata_loader is not None:
- metadata = self.metadata_loader(row)
+ metadata = self.metadata_loader(row, header=header)
kwargs.update(metadata)
return DelayedSample(
diff --git a/bob/bio/base/test/test_filelist.py b/bob/bio/base/test/test_filelist.py
index 07871637..69f0c99d 100644
--- a/bob/bio/base/test/test_filelist.py
+++ b/bob/bio/base/test/test_filelist.py
@@ -111,7 +111,9 @@ def test_csv_file_list_dev_eval():
csv_to_sample_loader=CSVToSampleLoader(
data_loader=bob.io.base.load,
metadata_loader=AnnotationsLoader(
- annotation_directory=annotation_directory, annotation_extension=".pos"
+ annotation_directory=annotation_directory,
+ annotation_extension=".pos",
+ annotation_type="eyecenter",
),
dataset_original_directory="",
extension="",
@@ -159,7 +161,9 @@ def test_csv_file_list_dev_eval_sparse():
csv_to_sample_loader=CSVToSampleLoader(
data_loader=bob.io.base.load,
metadata_loader=AnnotationsLoader(
- annotation_directory=annotation_directory, annotation_extension=".pos"
+ annotation_directory=annotation_directory,
+ annotation_extension=".pos",
+ annotation_type="eyecenter",
),
dataset_original_directory="",
extension="",
--
GitLab