From fc1077f683ee2e1b8af44a28bb95a318d3671399 Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Mon, 11 Apr 2016 15:54:05 -0600
Subject: [PATCH] Handled issue with missing probes in fileset protocol
---
bob/bio/base/test/test_scripts.py | 4 ----
bob/bio/base/tools/scoring.py | 9 +++++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/bob/bio/base/test/test_scripts.py b/bob/bio/base/test/test_scripts.py
index b7d2bfbc..1ef855f5 100644
--- a/bob/bio/base/test/test_scripts.py
+++ b/bob/bio/base/test/test_scripts.py
@@ -266,10 +266,6 @@ def test_verify_filelist():
def test_verify_missing():
- try:
- import bob.db.verification.filelist
- except ImportError:
- raise SkipTest("Skipping test since bob.db.verification.filelist is not available")
test_dir = tempfile.mkdtemp(prefix='bobtest_')
# define dummy parameters
parameters = [
diff --git a/bob/bio/base/tools/scoring.py b/bob/bio/base/tools/scoring.py
index ab240af8..e00b142e 100644
--- a/bob/bio/base/tools/scoring.py
+++ b/bob/bio/base/tools/scoring.py
@@ -29,13 +29,14 @@ def _scores(algorithm, model, probes, allow_missing_files):
for i, probe_element in enumerate(probes):
if fs.uses_probe_file_sets():
assert isinstance(probe_element, list)
- # read probe from probe_set
- probe = [algorithm.read_probe(probe_file) for probe_file in probe_element]
+ # filter missing files
if allow_missing_files:
- probe = utils.filter_missing_files(probe)
- if not probe:
+ probe_element = utils.filter_missing_files(probe_element)
+ if not probe_element:
# we keep the NaN score
continue
+ # read probe from probe_set
+ probe = [algorithm.read_probe(probe_file) for probe_file in probe_element]
# compute score
scores[0,i] = algorithm.score_for_multiple_probes(model, probe)
else:
--
GitLab