Mercurial > hg > libxtract
changeset 125:2bdf5e248870
- fixed build-time bug. in some cases average_deviation was commented out instead of spectral_average_deviation
| author | Jamie Bullock <jamie@postlude.co.uk> |
|---|---|
| date | Thu, 29 Mar 2012 12:23:04 +0000 |
| parents | fc4bc58b92da |
| children | 0d49e1502159 |
| files | src/libxtract.c xtract/xtract_scalar.h |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libxtract.c Thu Mar 31 12:22:29 2011 +0000 +++ b/src/libxtract.c Thu Mar 29 12:23:04 2012 +0000 @@ -27,13 +27,13 @@ xtract_mean, xtract_variance, xtract_standard_deviation, - /* xtract_average_deviation, */ + xtract_average_deviation, xtract_skewness, xtract_kurtosis, xtract_spectral_mean, xtract_spectral_variance, xtract_spectral_standard_deviation, - xtract_spectral_average_deviation, + /* xtract_spectral_average_deviation, */ xtract_spectral_skewness, xtract_spectral_kurtosis, xtract_spectral_centroid,
--- a/xtract/xtract_scalar.h Thu Mar 31 12:22:29 2011 +0000 +++ b/xtract/xtract_scalar.h Thu Mar 29 12:23:04 2012 +0000 @@ -71,8 +71,8 @@ * \param *argv: a pointer to a float representing the mean of the input vector * \param *result: the average deviation of N values from the array pointed to by *data */ -/*int xtract_average_deviation(const float *data, const int N, const void *argv, float *result); - */ +int xtract_average_deviation(const float *data, const int N, const void *argv, float *result); + /** \brief Extract the skewness of an input vector * @@ -127,7 +127,9 @@ * \param *argv: a pointer to a float representing the spectral mean of the input spectrum * \param *result: the average deviation of the spectrum pointed to by *data */ +/* int xtract_spectral_average_deviation(const float *data, const int N, const void *argv, float *result); +*/ /** \brief Extract the skewness of an input spectrum *