From 7910a29ca031a42b067e0bf602a3a6f038a48bb1 Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Wed, 18 Jan 2017 14:18:40 -0700
Subject: [PATCH] Fixed typo in test data directory name

---
 bob/bio/base/database/filelist/query.py                       | 1 +
 .../data/model4_session1_sample2.pos                          | 0
 .../{example_fielist => example_filelist}/dev/for_models.lst  | 0
 .../{example_fielist => example_filelist}/dev/for_probes.lst  | 0
 .../{example_fielist => example_filelist}/dev/for_scores.lst  | 0
 .../{example_fielist => example_filelist}/dev/for_tnorm.lst   | 0
 .../{example_fielist => example_filelist}/dev/for_znorm.lst   | 0
 .../{example_fielist => example_filelist}/eval/for_models.lst | 0
 .../{example_fielist => example_filelist}/eval/for_probes.lst | 0
 .../{example_fielist => example_filelist}/eval/for_scores.lst | 0
 .../{example_fielist => example_filelist}/eval/for_tnorm.lst  | 0
 .../{example_fielist => example_filelist}/eval/for_znorm.lst  | 0
 .../norm/train_optional_world_1.lst                           | 0
 .../norm/train_optional_world_2.lst                           | 0
 .../norm/train_world.lst                                      | 0
 bob/bio/base/test/test_filelist.py                            | 4 ++--
 16 files changed, 3 insertions(+), 2 deletions(-)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/data/model4_session1_sample2.pos (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/dev/for_models.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/dev/for_probes.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/dev/for_scores.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/dev/for_tnorm.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/dev/for_znorm.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/eval/for_models.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/eval/for_probes.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/eval/for_scores.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/eval/for_tnorm.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/eval/for_znorm.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/norm/train_optional_world_1.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/norm/train_optional_world_2.lst (100%)
 rename bob/bio/base/test/data/{example_fielist => example_filelist}/norm/train_world.lst (100%)

diff --git a/bob/bio/base/database/filelist/query.py b/bob/bio/base/database/filelist/query.py
index f1e5a051..8ddc505e 100644
--- a/bob/bio/base/database/filelist/query.py
+++ b/bob/bio/base/database/filelist/query.py
@@ -125,6 +125,7 @@ class FileListBioDatabase(ZTBioDatabase):
         and the given sub-directories and file names (which default to useful values if not given)."""
 
         super(FileListBioDatabase, self).__init__(
+            filelists_directory=filelists_directory,
             name=name,
             protocol=protocol,
             original_directory=original_directory,
diff --git a/bob/bio/base/test/data/example_fielist/data/model4_session1_sample2.pos b/bob/bio/base/test/data/example_filelist/data/model4_session1_sample2.pos
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/data/model4_session1_sample2.pos
rename to bob/bio/base/test/data/example_filelist/data/model4_session1_sample2.pos
diff --git a/bob/bio/base/test/data/example_fielist/dev/for_models.lst b/bob/bio/base/test/data/example_filelist/dev/for_models.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/dev/for_models.lst
rename to bob/bio/base/test/data/example_filelist/dev/for_models.lst
diff --git a/bob/bio/base/test/data/example_fielist/dev/for_probes.lst b/bob/bio/base/test/data/example_filelist/dev/for_probes.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/dev/for_probes.lst
rename to bob/bio/base/test/data/example_filelist/dev/for_probes.lst
diff --git a/bob/bio/base/test/data/example_fielist/dev/for_scores.lst b/bob/bio/base/test/data/example_filelist/dev/for_scores.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/dev/for_scores.lst
rename to bob/bio/base/test/data/example_filelist/dev/for_scores.lst
diff --git a/bob/bio/base/test/data/example_fielist/dev/for_tnorm.lst b/bob/bio/base/test/data/example_filelist/dev/for_tnorm.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/dev/for_tnorm.lst
rename to bob/bio/base/test/data/example_filelist/dev/for_tnorm.lst
diff --git a/bob/bio/base/test/data/example_fielist/dev/for_znorm.lst b/bob/bio/base/test/data/example_filelist/dev/for_znorm.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/dev/for_znorm.lst
rename to bob/bio/base/test/data/example_filelist/dev/for_znorm.lst
diff --git a/bob/bio/base/test/data/example_fielist/eval/for_models.lst b/bob/bio/base/test/data/example_filelist/eval/for_models.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/eval/for_models.lst
rename to bob/bio/base/test/data/example_filelist/eval/for_models.lst
diff --git a/bob/bio/base/test/data/example_fielist/eval/for_probes.lst b/bob/bio/base/test/data/example_filelist/eval/for_probes.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/eval/for_probes.lst
rename to bob/bio/base/test/data/example_filelist/eval/for_probes.lst
diff --git a/bob/bio/base/test/data/example_fielist/eval/for_scores.lst b/bob/bio/base/test/data/example_filelist/eval/for_scores.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/eval/for_scores.lst
rename to bob/bio/base/test/data/example_filelist/eval/for_scores.lst
diff --git a/bob/bio/base/test/data/example_fielist/eval/for_tnorm.lst b/bob/bio/base/test/data/example_filelist/eval/for_tnorm.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/eval/for_tnorm.lst
rename to bob/bio/base/test/data/example_filelist/eval/for_tnorm.lst
diff --git a/bob/bio/base/test/data/example_fielist/eval/for_znorm.lst b/bob/bio/base/test/data/example_filelist/eval/for_znorm.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/eval/for_znorm.lst
rename to bob/bio/base/test/data/example_filelist/eval/for_znorm.lst
diff --git a/bob/bio/base/test/data/example_fielist/norm/train_optional_world_1.lst b/bob/bio/base/test/data/example_filelist/norm/train_optional_world_1.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/norm/train_optional_world_1.lst
rename to bob/bio/base/test/data/example_filelist/norm/train_optional_world_1.lst
diff --git a/bob/bio/base/test/data/example_fielist/norm/train_optional_world_2.lst b/bob/bio/base/test/data/example_filelist/norm/train_optional_world_2.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/norm/train_optional_world_2.lst
rename to bob/bio/base/test/data/example_filelist/norm/train_optional_world_2.lst
diff --git a/bob/bio/base/test/data/example_fielist/norm/train_world.lst b/bob/bio/base/test/data/example_filelist/norm/train_world.lst
similarity index 100%
rename from bob/bio/base/test/data/example_fielist/norm/train_world.lst
rename to bob/bio/base/test/data/example_filelist/norm/train_world.lst
diff --git a/bob/bio/base/test/test_filelist.py b/bob/bio/base/test/test_filelist.py
index 15a8d5ae..2063ea55 100644
--- a/bob/bio/base/test/test_filelist.py
+++ b/bob/bio/base/test/test_filelist.py
@@ -24,7 +24,7 @@ import bob.io.base.test_utils
 from bob.bio.base.database import FileListBioDatabase
 
 
-example_dir = os.path.realpath(bob.io.base.test_utils.datafile('.', __name__, 'data/example_fielist'))
+example_dir = os.path.realpath(bob.io.base.test_utils.datafile('.', __name__, 'data/example_filelist'))
 
 
 def test_query():
@@ -77,7 +77,7 @@ def test_query():
 
 
 def test_query_protocol():
-    db = FileListBioDatabase(os.path.dirname(example_dir), 'test', protocol='example_fielist', use_dense_probe_file_list=False)
+    db = FileListBioDatabase(os.path.dirname(example_dir), 'test', protocol='example_filelist', use_dense_probe_file_list=False)
 
     assert len(db.groups()) == 5  # 5 groups (dev, eval, world, optional_world_1, optional_world_2)
 
-- 
GitLab