comparison xtract/xtract_scalar.h @ 230:b786a835df59

updated docs and removed commented out code
author Sean Enderby <sean.enderby@gmail.com>
date Tue, 25 Feb 2014 14:27:25 +0000
parents 223febe2688b
children 611e521cb701
comparison
equal deleted inserted replaced
229:a2f66a305e53 230:b786a835df59
180 */ 180 */
181 int xtract_irregularity_j(const double *data, const int N, const void *argv, double *result); 181 int xtract_irregularity_j(const double *data, const int N, const void *argv, double *result);
182 182
183 /** \brief Calculate the Tristimulus of an input vector using a method described by Pollard and Jansson (1982) 183 /** \brief Calculate the Tristimulus of an input vector using a method described by Pollard and Jansson (1982)
184 * 184 *
185 * \param *data: a pointer to the first element in an array of doubles representing the magnitude coefficients of the harmonic spectrum of an audio vector e.g. a pointer to the first half of the array pointed to by *result from xtract_harmonics(). The amplitudes of the peak spectrum (e.g. *result from xtract_peak_spectrum()) can be used if one wishes to consider all partials not just harmonics. 185 * \param *data: a pointer to the first element in an array of doubles representing a harmonic spectrum of size N/2, and a frequency spectrum of size N/2 (This is the output format of xtract_harmonic_spectrum())
186 * \param N: the number of elements to be considered 186 * \param N: the number of elements to be considered
187 * \param *argv: a pointer to NULL 187 * \param *argv: a pointer to a double representing the fundamental frequency of the input vector.
188 * \param *result: the tristimulus of N values from the array pointed to by *data 188 * \param *result: the tristimulus of N values from the array pointed to by *data
189 * 189 *
190 * These three functions provide the first, second and third order tristimulus formulae 190 * These three functions provide the first, second and third order tristimulus formulae
191 * 191 *
192 */ 192 */