annotate maths/MathAliases.h @ 298:255e431ae3d4

* Key detector: when returning key strengths, use the peak value of the three underlying chromagram correlations (from 36-bin chromagram) corresponding to each key, instead of the mean. Rationale: This is the same method as used when returning the key value, and it's nice to have the same results in both returned value and plot. The peak performed better than the sum with a simple test set of triads, so it seems reasonable to change the plot to match the key output rather than the other way around. * FFT: kiss_fftr returns only the non-conjugate bins, synthesise the rest rather than leaving them (perhaps dangerously) undefined. Fixes an uninitialised data error in chromagram that could cause garbage results from key detector. * Constant Q: remove precalculated values again, I reckon they're not proving such a good tradeoff.
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 05 Jun 2009 15:12:39 +0000
parents c8908cdc8c32
children d5014ab8b0e5
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@241 7 This file copyright 2005-2006 Christian Landone.
c@241 8 All rights reserved.
c@241 9 */
c@241 10
c@241 11 #ifndef MATHALIASES_H
c@241 12 #define MATHALIASES_H
c@241 13
c@241 14 #include <cmath>
c@241 15 #include <complex>
c@241 16
c@241 17 using namespace std;
c@241 18 typedef complex<double> ComplexData;
c@241 19
c@241 20
c@241 21 #ifndef PI
c@241 22 #define PI (3.14159265358979232846)
c@241 23 #endif
c@241 24
c@279 25 #define TWO_PI (2. * PI)
c@241 26
c@241 27 #define EPS 2.2204e-016
c@241 28
c@241 29 /* aliases to math.h functions */
c@241 30 #define EXP exp
c@241 31 #define COS cos
c@241 32 #define SIN sin
c@241 33 #define ABS fabs
c@241 34 #define POW powf
c@241 35 #define SQRT sqrtf
c@241 36 #define LOG10 log10f
c@241 37 #define LOG logf
c@241 38 #define FLOOR floorf
c@241 39 #define TRUNC truncf
c@241 40
c@241 41 /* aliases to complex.h functions */
c@241 42 /** sample = EXPC(complex) */
c@241 43 #define EXPC cexpf
c@241 44 /** complex = CEXPC(complex) */
c@241 45 #define CEXPC cexp
c@241 46 /** sample = ARGC(complex) */
c@241 47 #define ARGC cargf
c@241 48 /** sample = ABSC(complex) norm */
c@241 49 #define ABSC cabsf
c@241 50 /** sample = REAL(complex) */
c@241 51 #define REAL crealf
c@241 52 /** sample = IMAG(complex) */
c@241 53 #define IMAG cimagf
c@241 54
c@241 55 #endif