diff options
author | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-05 17:02:33 +0000 |
---|---|---|
committer | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-05 17:02:33 +0000 |
commit | 8cbbd02b44341c9c4907caaa86fcc9711d53ae48 (patch) | |
tree | 3852f47af9f20a0c720c41319fb97019aec230ce | |
parent | e70d41b16e0cb598a0160d66e63ef4ce7e6abf92 (diff) | |
download | LibXtract-8cbbd02b44341c9c4907caaa86fcc9711d53ae48.tar.gz LibXtract-8cbbd02b44341c9c4907caaa86fcc9711d53ae48.tar.bz2 LibXtract-8cbbd02b44341c9c4907caaa86fcc9711d53ae48.zip |
Fixed AMDF
-rw-r--r-- | src/vector.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/vector.c b/src/vector.c index cb64110..9827bbe 100644 --- a/src/vector.c +++ b/src/vector.c @@ -89,12 +89,14 @@ int xtract_amdf(float *data, int N, void *argv, float *result){ int n = N, i; - float md; + float md, temp; while(n--){ md = 0; for(i = 0; i < N - n; i++){ - md += abs(data[i] - data[i + n]); + temp = data[i] - data[i + n]; + temp = (temp < 0 ? -temp : temp); + md += temp; } result[n] = md / N; } @@ -109,7 +111,7 @@ int xtract_asdf(float *data, int N, void *argv, float *result){ while(n--){ sd = 0; for(i = 0; i < N - n; i++){ - sd = 1; + /*sd = 1;*/ sd += SQ(data[i] - data[i + n]); } result[n] = sd / N; |