Mercurial > hg > svcore
changeset 1385:b061b9f8fca5
Debug notes, tidying
| author | Chris Cannam |
|---|---|
| date | Thu, 23 Feb 2017 09:22:56 +0000 |
| parents | 368449629a30 |
| children | 9b52f1a952b5 |
| files | base/LogRange.cpp data/osc/demoscript.sh |
| diffstat | 2 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/base/LogRange.cpp Wed Feb 22 12:01:39 2017 +0000 +++ b/base/LogRange.cpp Thu Feb 23 09:22:56 2017 +0000 @@ -23,25 +23,30 @@ void LogRange::mapRange(double &min, double &max, double logthresh) { + // ensure that max > min: if (min > max) std::swap(min, max); if (max == min) max = min + 1; // cerr << "LogRange::mapRange: min = " << min << ", max = " << max << endl; - if (min >= 0.f) { + if (min >= 0.0) { - max = log10(max); // we know max != 0 + // and max > min, so we know min >= 0 and max > 0 + + max = log10(max); - if (min == 0.f) min = std::min(logthresh, max); + if (min == 0.0) min = std::min(logthresh, max); else min = log10(min); // cerr << "LogRange::mapRange: positive: min = " << min << ", max = " << max << endl; - } else if (max <= 0.f) { + } else if (max <= 0.0) { + + // and max > min, so we know min < 0 and max <= 0 - min = log10(-min); // we know min != 0 - - if (max == 0.f) max = std::min(logthresh, min); + min = log10(-min); + + if (max == 0.0) max = std::min(logthresh, min); else max = log10(-max); std::swap(min, max); @@ -64,7 +69,7 @@ double LogRange::map(double value, double thresh) { - if (value == 0.f) return thresh; + if (value == 0.0) return thresh; return log10(fabs(value)); } @@ -77,7 +82,7 @@ static double sd(const std::vector<double> &values, int start, int n) { - double sum = 0.f, mean = 0.f, variance = 0.f; + double sum = 0.0, mean = 0.0, variance = 0.0; for (int i = 0; i < n; ++i) { sum += values[start + i]; }