From bb71551e6b13c30cabec79574020dc901683383f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sat, 26 Dec 2015 09:37:03 +0100 Subject: [PATCH] cleaning --- main.c | 4 ++-- src/vec_match.c | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/main.c b/main.c index e5c6b0c..af034e2 100644 --- a/main.c +++ b/main.c @@ -9,12 +9,12 @@ static float reference[DATA_LEN] = { //0, 10, 20, 30, 40, 50, 40, 30, 20, 10, 0 - 0, 15.7, 0, 0, 0.1, 0.2, 0.1, 10, 24.242, 0, 0, 2, 0.2, 0.4, 0.5, 0 + 0, 15.7, 0, 0, 0.1, 0.2, 0.1, 10, 24.242, 7, 0, 2, 0.2, 0.4, 0.5, 0 }; static float data[DATA_LEN] = { //0, 10, 20, 30, 40, 50, 50, 35, 15, 15, 0 - 0, 15.7, 0, 0, 0.1, 0.2, 0.1, 10, 24, 0, 2, 2, 0.2, 0.4, 0.5, 0 + 0, 15.7, 0, 0, 0.1, 0.2, 0.1, 10, 24, 6, 3, 2, 0.2, 0.4, 0.5, 0 }; static float ref_p[REF_LEN]; diff --git a/src/vec_match.c b/src/vec_match.c index c814c13..19e950b 100644 --- a/src/vec_match.c +++ b/src/vec_match.c @@ -53,12 +53,13 @@ bool vec_match_do(const float *data, const float *ref, uint32_t ref_p_len, } // find base and peak - for (uint32_t j = a; j <= b; j++) { f = packed ? pw_get(&w, j) : ref[j]; if (peak < f) peak = f; - if (f < base) base = f; + if (f < base) { + base = f; + } } ref_at = packed ? pw_get(&w, i) : ref[i]; @@ -77,8 +78,6 @@ bool vec_match_do(const float *data, const float *ref, uint32_t ref_p_len, // within limits continue; } else { - //printf("data[%d] out of range: %f, [%f ; %f]\n", i, data[i], base, peak); - if (data[i] < base) env_err += SQ(base - data[i]); if (data[i] > peak) env_err += SQ(data[i] - peak); @@ -86,7 +85,7 @@ bool vec_match_do(const float *data, const float *ref, uint32_t ref_p_len, } } -// write error values to provided fields + // write error values to provided fields if (fuzzy_match_error != NULL) *fuzzy_match_error = env_err; if (abs_match_error != NULL) *abs_match_error = abs_err;