From 041c2cbce55a9798001647e806aff263b46a3872 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Tue, 24 Jun 2014 00:47:14 +0200 Subject: [PATCH] refactor(analyzer.core): refactor AnalyzerResult - Put frame_metadata and label_metadata inside data_object - No more subclasses for analyzerResult - Put subclasses in data_object (subclasses of DataObject: one per (data_mode, time_mode) combination - Add 'y_value' and 'y_unit' key for data_object (to deal with 2D array where the y-value is a data and may have a unit like spectrogram (y_value = frequnecies, y_unit=Hz)) --- timeside/analyzer/irit_monopoly.py | 2 +- timeside/analyzer/irit_speech_4hz.py | 2 +- timeside/analyzer/irit_speech_entropy.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/timeside/analyzer/irit_monopoly.py b/timeside/analyzer/irit_monopoly.py index 2afe821..b1f82c2 100644 --- a/timeside/analyzer/irit_monopoly.py +++ b/timeside/analyzer/irit_monopoly.py @@ -118,7 +118,7 @@ class IRITMonopoly(Analyzer): segs.id_metadata.id += '.' + 'segments' segs.id_metadata.name += ' ' + 'Segments' - segs.label_metadata.label = label + segs.data_object.label_metadata.label = label segs.data_object.label = [convert[s[2]] for s in segList] segs.data_object.time = [(float(s[0]+0.5) * self.decisionLen) for s in segList] diff --git a/timeside/analyzer/irit_speech_4hz.py b/timeside/analyzer/irit_speech_4hz.py index 73579f9..b6df6cf 100644 --- a/timeside/analyzer/irit_speech_4hz.py +++ b/timeside/analyzer/irit_speech_4hz.py @@ -152,7 +152,7 @@ class IRITSpeech4Hz(Analyzer): segs.id_metadata.id += '.' + 'segments' segs.id_metadata.name += ' ' + 'Segments' - segs.label_metadata.label = label + segs.data_object.label_metadata.label = label segs.data_object.label = [convert[s[2]] for s in segList] segs.data_object.time = [(float(s[0]) * self.blocksize() / diff --git a/timeside/analyzer/irit_speech_entropy.py b/timeside/analyzer/irit_speech_entropy.py index febf1a4..b33f7bf 100644 --- a/timeside/analyzer/irit_speech_entropy.py +++ b/timeside/analyzer/irit_speech_entropy.py @@ -95,7 +95,7 @@ class IRITSpeechEntropy(Analyzer): segs.id_metadata.id += '.' + 'segments' segs.id_metadata.name += ' ' + 'Segments' - segs.label_metadata.label = label + segs.data_object.label_metadata.label = label segs.data_object.label = [convert[s[2]] for s in segList] segs.data_object.time = [(float(s[0]) * self.blocksize() / -- 2.39.5