From d88ff54ee9be978bbdb44cedacb9b3df598b1017 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Wed, 30 Mar 2011 10:51:39 +0000 Subject: - reimplemented xtract_spectral_variance() xtract_spectral_skewness() and xtract_spectral_kurtosis() using correct maths - removed xtract_spectral_average_deviation() --- xtract/libxtract.h | 4 ++-- xtract/xtract_scalar.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'xtract') diff --git a/xtract/libxtract.h b/xtract/libxtract.h index d0ece81..181ae26 100644 --- a/xtract/libxtract.h +++ b/xtract/libxtract.h @@ -68,7 +68,7 @@ extern "C" { * @{ */ -#define XTRACT_FEATURES 60 +#define XTRACT_FEATURES 59 /** \brief Enumeration of features, elements are used as indixes to an array of pointers to feature extracton functions */ enum xtract_features_ { @@ -81,7 +81,7 @@ enum xtract_features_ { 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 fdfb42a..96834a0 100644 --- a/xtract/xtract_scalar.h +++ b/xtract/xtract_scalar.h @@ -71,7 +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 * -- cgit v1.2.3