diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2011-03-30 10:51:39 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2011-03-30 10:51:39 +0000 |
| commit | d88ff54ee9be978bbdb44cedacb9b3df598b1017 (patch) | |
| tree | cf80ee4d0959024fc598aba8741e1b592f7e6147 /xtract | |
| parent | d43418e0293c2f1f9954e193a9dcc5b82f5ce0c3 (diff) | |
| download | LibXtract-d88ff54ee9be978bbdb44cedacb9b3df598b1017.tar.gz LibXtract-d88ff54ee9be978bbdb44cedacb9b3df598b1017.tar.bz2 LibXtract-d88ff54ee9be978bbdb44cedacb9b3df598b1017.zip | |
- reimplemented xtract_spectral_variance() xtract_spectral_skewness() and xtract_spectral_kurtosis() using correct maths
- removed xtract_spectral_average_deviation()
Diffstat (limited to 'xtract')
| -rw-r--r-- | xtract/libxtract.h | 4 | ||||
| -rw-r--r-- | xtract/xtract_scalar.h | 3 |
2 files changed, 4 insertions, 3 deletions
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 * |