From 9b8ec8a0d19b420f6eb2a81b9e465825a821ebed Mon Sep 17 00:00:00 2001
From: Marc Ferras <marc.ferras@idiap.ch>
Date: Fri, 11 Nov 2016 22:24:33 +0100
Subject: [PATCH] nist_sre12 update
---
bob/bio/spear/config/database/nist_sre12.py | 1 -
bob/bio/spear/database/nist_sre12.py | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/bob/bio/spear/config/database/nist_sre12.py b/bob/bio/spear/config/database/nist_sre12.py
index a9b38ea..e540086 100644
--- a/bob/bio/spear/config/database/nist_sre12.py
+++ b/bob/bio/spear/config/database/nist_sre12.py
@@ -3,7 +3,6 @@
from bob.bio.spear.database import NistSre12BioDatabase
-#nist_sre12_directory = "/idiap/resource/database/nist_sre"
nist_sre12_directory = "[YOUR_NIST_SRE12_DIRECTORY]"
diff --git a/bob/bio/spear/database/nist_sre12.py b/bob/bio/spear/database/nist_sre12.py
index 09b13a0..360dc4b 100644
--- a/bob/bio/spear/database/nist_sre12.py
+++ b/bob/bio/spear/database/nist_sre12.py
@@ -23,11 +23,11 @@ class NistSre12BioFile(AudioBioFile):
"""
super(NistSre12BioFile, self).__init__(client_id=f.client_id, path=f.path, file_id=f.id)
- self.__f = f
- self.path = os.path.join( os.path.dirname(self.__f.path), self.__f.id)
+ self.f = f
+ self.path = os.path.join( os.path.dirname(self.f.path), self.f.id)
def load(self, directory=None, extension='.sph'):
- rate, data = self.__f.load(directory, extension)
+ rate, data = self.f.load(directory, extension)
data= np.cast['float'](data)
return rate, data
@@ -49,7 +49,7 @@ class NistSre12BioFile(AudioBioFile):
"""
# assure that directory and extension are actually strings
# create the path
- return str(os.path.join(directory or '', os.path.dirname(self.__f.path), self.__f.id + (extension or '')))
+ return str(os.path.join(directory or '', os.path.dirname(self.f.path), self.f.id + (extension or '')))
class NistSre12BioDatabase(BioDatabase):
--
GitLab