From 17649fcb387fe3d03525fbf1583a5d595343e91c Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Tue, 1 Jul 2014 13:42:52 +0200 Subject: [PATCH] chore(irit_noise_startSilences): clean up name, comments and move prototypes to trainedmodels directory --- timeside/analyzer/irit_noise_startSilences.py | 17 ++++++++++++----- .../irit_noise_startSilences_protoStart1.dat} | Bin .../irit_noise_startSilences_protoStart2.dat} | Bin 3 files changed, 12 insertions(+), 5 deletions(-) rename timeside/analyzer/{irit_noise_startSilences_protoStart2.dat => trained_models/irit_noise_startSilences_protoStart1.dat} (100%) rename timeside/analyzer/{irit_noise_startSilences_protoStart3.dat => trained_models/irit_noise_startSilences_protoStart2.dat} (100%) diff --git a/timeside/analyzer/irit_noise_startSilences.py b/timeside/analyzer/irit_noise_startSilences.py index 50d784b..a4c2c03 100644 --- a/timeside/analyzer/irit_noise_startSilences.py +++ b/timeside/analyzer/irit_noise_startSilences.py @@ -20,6 +20,7 @@ from __future__ import absolute_import +import timeside from timeside.core import implements, interfacedoc from timeside.analyzer.core import Analyzer from timeside.analyzer.preprocessors import frames_adapter @@ -27,12 +28,13 @@ from timeside.api import IAnalyzer import numpy from scipy.signal import firwin, lfilter from scipy.ndimage.morphology import binary_opening, binary_closing +import os class IRITStartSeg(Analyzer): implements(IAnalyzer) ''' - Segmentor MOnophony/Polyphony based on the analalysis of yin confidence. + Segmentation of recording sessions into 'start' and 'session' segments Properties: ''' @@ -74,7 +76,7 @@ class IRITStartSeg(Analyzer): @staticmethod @interfacedoc def name(): - return "IRIT Monophony / Polyphony classification" + return "IRIT Start/Session segmentation" @staticmethod @interfacedoc @@ -82,7 +84,7 @@ class IRITStartSeg(Analyzer): return "" def __str__(self): - return "Labeled Monophonic/Polyphonic segments" + return "Labeled Start/session segments" @frames_adapter def process(self, frames, eod=False): @@ -105,8 +107,13 @@ class IRITStartSeg(Analyzer): step = float(self.input_stepsize) / float(self.samplerate()) - prototype = numpy.load('timeside/analyzer/protoStart2.dat') - prototype2 = numpy.load('timeside/analyzer/protoStart3.dat') + models_dir = os.path.join(timeside.__path__[0], + 'analyzer', 'trained_models') + prototype1_file = os.path.join(models_dir, 'protoStart1.dat') + prototype2_file = os.path.join(models_dir, 'protoStart2.dat') + + prototype = numpy.load(prototype1_file) + prototype2 = numpy.load(prototype2_file) # Lissage pour éliminer les petits segments dans un sens ou l'autre struct = [1] * len(prototype) diff --git a/timeside/analyzer/irit_noise_startSilences_protoStart2.dat b/timeside/analyzer/trained_models/irit_noise_startSilences_protoStart1.dat similarity index 100% rename from timeside/analyzer/irit_noise_startSilences_protoStart2.dat rename to timeside/analyzer/trained_models/irit_noise_startSilences_protoStart1.dat diff --git a/timeside/analyzer/irit_noise_startSilences_protoStart3.dat b/timeside/analyzer/trained_models/irit_noise_startSilences_protoStart2.dat similarity index 100% rename from timeside/analyzer/irit_noise_startSilences_protoStart3.dat rename to timeside/analyzer/trained_models/irit_noise_startSilences_protoStart2.dat -- 2.39.5