diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2012-03-29 12:23:04 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2012-03-29 12:23:04 +0000 |
| commit | d78037e45f941ebf7eb1ad42e47577d749b8bc2d (patch) | |
| tree | 27dc0c6309fc804adf5cd786d6a749f34082b77f | |
| parent | 2c47459bdf912a30ba1c64c2bf538aaacf4c2aa2 (diff) | |
| download | LibXtract-d78037e45f941ebf7eb1ad42e47577d749b8bc2d.tar.gz LibXtract-d78037e45f941ebf7eb1ad42e47577d749b8bc2d.tar.bz2 LibXtract-d78037e45f941ebf7eb1ad42e47577d749b8bc2d.zip | |
- fixed build-time bug. in some cases average_deviation was commented out instead of spectral_average_deviation
| -rw-r--r-- | src/libxtract.c | 4 | ||||
| -rw-r--r-- | xtract/xtract_scalar.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libxtract.c b/src/libxtract.c index 80a710e..a77c990 100644 --- a/src/libxtract.c +++ b/src/libxtract.c @@ -27,13 +27,13 @@ int(*xtract[])(const float *, const int, const void *, float *) = { 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, diff --git a/xtract/xtract_scalar.h b/xtract/xtract_scalar.h index 96834a0..ec286c9 100644 --- a/xtract/xtract_scalar.h +++ b/xtract/xtract_scalar.h @@ -71,8 +71,8 @@ int xtract_standard_deviation(const float *data, const int N, const void *argv, * \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 @@ int xtract_spectral_standard_deviation(const float *data, const int N, const voi * \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 * |