Merge branch 'dev' into diadems

diff --cc timeside/analyzer/core.py
Simple merge

diff --cc timeside/analyzer/irit_speech_4hz.py
index 2e34cf58d7aa1281525df23c939d6e69251e78b1,c04e43885a161836d444d4fe64da83a7e415d53a..0deed58034a3e0a3afbc55925c77fa823f4a31c9
--- 1/timeside/analyzer/irit_speech_4hz.py
--- 2/timeside/analyzer/irit_speech_4hz.py
+++ b/timeside/analyzer/irit_speech_4hz.py
@@@ -24,15 -24,13 +24,15 @@@ from timeside.analyzer.core import Anal
  from timeside.analyzer.utils import melFilterBank, computeModulation
  from timeside.analyzer.utils import segmentFromValues
  from timeside.api import IAnalyzer
- from numpy import array, hamming, dot, mean, float
+ from numpy import array, hamming, dot, mean, float, isnan
  from numpy.fft import rfft
  from scipy.signal import firwin, lfilter
 -
 +from timeside.analyzer.preprocessors import frames_adapter
  
  class IRITSpeech4Hz(Analyzer):
 -    '''Speech Segmentor based on the 4Hz energy modulation analysis.
 +    implements(IAnalyzer)
 +    '''
 +    Segmentor based on the analysis of the 4Hz energy modulation.
  
      Properties:
          - energy4hz           (list)          : List of the 4Hz energy by frame for the modulation computation
@@@ -123,12 -118,12 +123,12 @@@
          energy = sum(energy)
  
          # Normalization
-         if self.normalizeEnergy:
+         if self.normalizeEnergy and energy.any():
              energy = energy / mean(energy)
  
 +      
          # Energy Modulation
 -        frameLenModulation = int(
 -            self.modulLen * self.samplerate() / self.blocksize())
 +        frameLenModulation = self.modulLen/self.wStep 
          modEnergyValue = computeModulation(energy, frameLenModulation, True)
  
          # Confidence Index