Commit 104407b3 authored by Manuel Günther's avatar Manuel Günther Committed by Amir Mohammadi
Browse files

Removed the superflouos original_data_list_files from the FileSelector and...

Removed the superflouos original_data_list_files from the FileSelector and updated preprocessor accordingly
parent b88c4e60
Pipeline #4240 passed with stages
in 30 minutes and 43 seconds
......@@ -144,7 +144,6 @@ def test_verify_parallel():
'-e', 'bob.bio.base.test.dummy.extractor.DummyExtractor()',
'-a', 'dummy',
'--zt-norm',
'--allow-missing-files',
'-vs', 'test_parallel',
'--temp-directory', test_dir,
'--result-directory', test_dir,
......
......@@ -107,12 +107,12 @@ class FileSelector(object):
### List of files that will be used for all files
def original_data_list(self, groups = None):
"""Returns the list of original data that can be used for preprocessing."""
return self.database.original_file_names(self.database.all_files(groups=groups))
"""Returns the list of original ``BioFile`` objects that can be used for preprocessing."""
return self.database.all_files(groups=groups)
def original_data_list_files(self, groups = None):
"""Returns the list of original data that can be used for preprocessing."""
return (self.database.all_files(groups=groups), self.database.original_directory, self.database.original_extension)
def original_directory_and_extension(self):
"""Returns the directory and extension of the original files."""
return self.database.original_directory, self.database.original_extension
def annotation_list(self, groups = None):
"""Returns the list of annotations objects."""
......
......@@ -42,7 +42,8 @@ def preprocess(preprocessor, groups = None, indices = None, allow_missing_files
fs = FileSelector.instance()
# get the file lists
data_files, original_directory, original_extension = fs.original_data_list_files(groups=groups)
data_files = fs.original_data_list(groups=groups)
original_directory, original_extension = fs.original_directory_and_extension()
preprocessed_data_files = fs.preprocessed_data_list(groups=groups)
# select a subset of keys to iterate
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment