annotate maths/MathUtilities.h @ 321:f1e6be2de9a5

A threshold (delta) is added in the peak picking parameters structure (PPickParams). It is used as an offset when computing the smoothed detection function. A constructor for the structure PPickParams is also added to set the parameters to 0 when a structure instance is created. Hence programmes using the peak picking parameter structure and which do not set the delta parameter (e.g. QM Vamp note onset detector) won't be affected by the modifications. Functions modified: - dsp/onsets/PeakPicking.cpp - dsp/onsets/PeakPicking.h - dsp/signalconditioning/DFProcess.cpp - dsp/signalconditioning/DFProcess.h
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Mon, 20 Jun 2011 19:01:48 +0100
parents d5014ab8b0e5
children 50fae18236ee
rev   line source
c@241 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
c@241 2
c@241 3 /*
c@241 4 QM DSP Library
c@241 5
c@241 6 Centre for Digital Music, Queen Mary, University of London.
c@309 7 This file 2005-2006 Christian Landone.
c@309 8
c@309 9 This program is free software; you can redistribute it and/or
c@309 10 modify it under the terms of the GNU General Public License as
c@309 11 published by the Free Software Foundation; either version 2 of the
c@309 12 License, or (at your option) any later version. See the file
c@309 13 COPYING included with this distribution for more information.
c@241 14 */
c@241 15
c@241 16 #ifndef MATHUTILITIES_H
c@241 17 #define MATHUTILITIES_H
c@241 18
c@241 19 #include <vector>
c@241 20
c@304 21 #include "nan-inf.h"
c@304 22
c@241 23 class MathUtilities
c@241 24 {
c@241 25 public:
c@241 26 static double round( double x );
c@259 27
c@241 28 static void getFrameMinMax( const double* data, unsigned int len, double* min, double* max );
c@259 29
c@241 30 static double mean( const double* src, unsigned int len );
c@279 31 static double mean( const std::vector<double> &data,
c@279 32 unsigned int start, unsigned int count );
c@241 33 static double sum( const double* src, unsigned int len );
c@259 34 static double median( const double* src, unsigned int len );
c@259 35
c@241 36 static double princarg( double ang );
c@241 37 static double mod( double x, double y);
c@259 38
c@241 39 static void getAlphaNorm(const double *data, unsigned int len, unsigned int alpha, double* ANorm);
c@241 40 static double getAlphaNorm(const std::vector <double> &data, unsigned int alpha );
c@259 41
c@241 42 static void circShift( double* data, int length, int shift);
c@259 43
c@279 44 static int getMax( double* data, unsigned int length, double* max = 0 );
c@279 45 static int getMax( const std::vector<double> &data, double* max = 0 );
c@241 46 static int compareInt(const void * a, const void * b);
c@259 47
c@259 48 enum NormaliseType {
c@259 49 NormaliseNone,
c@259 50 NormaliseUnitSum,
c@259 51 NormaliseUnitMax
c@259 52 };
c@259 53
c@259 54 static void normalise(double *data, int length,
c@259 55 NormaliseType n = NormaliseUnitMax);
c@259 56
c@259 57 static void normalise(std::vector<double> &data,
c@259 58 NormaliseType n = NormaliseUnitMax);
c@279 59
c@279 60 // moving mean threshholding:
c@279 61 static void adaptiveThreshold(std::vector<double> &data);
c@280 62
c@280 63 static bool isPowerOfTwo(int x);
c@280 64 static int nextPowerOfTwo(int x); // e.g. 1300 -> 2048, 2048 -> 2048
c@280 65 static int previousPowerOfTwo(int x); // e.g. 1300 -> 1024, 2048 -> 2048
c@280 66 static int nearestPowerOfTwo(int x); // e.g. 1300 -> 1024, 1700 -> 2048
c@241 67 };
c@241 68
c@241 69 #endif