Mercurial > hg > qm-vamp-plugins

changeset 111:a8292af48062

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Restore vital calculation that I foolishly removed "as a tiny optimisation"
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 18 May 2009 12:34:12 +0000
parents be419e04899a
children 2e25bdc9f826
files plugins/AdaptiveSpectrogram.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/AdaptiveSpectrogram.cpp	Thu May 14 12:45:27 2009 +0000
+++ b/plugins/AdaptiveSpectrogram.cpp	Mon May 18 12:34:12 2009 +0000
@@ -263,7 +263,7 @@
 
     m_threadsInUse = false;
 
-//    std::cerr << "maxwid/2 = " << maxwid/2 << ", minwid/2 = " << minwid/2 << ", n+1 = " << m_n+1 << ", 2^(n+1) = " << (2<<m_n) << std::endl;
+    std::cerr << "maxwid/2 = " << maxwid/2 << ", minwid/2 = " << minwid/2 << ", n+1 = " << m_n+1 << ", 2^(n+1) = " << (2<<m_n) << std::endl;
 
     Cutting *cutting = cut(s, maxwid/2, 0, 0, maxwid/2, 0);
 
@@ -404,6 +404,7 @@
             cutting->first = left;
             cutting->second = right;
             cutting->cost = hcost;
+            cutting->value = left->value + right->value;
             top->erase();
             bottom->erase();
             return cutting;
@@ -415,6 +416,7 @@
             cutting->first = top;
             cutting->second = bottom;
             cutting->cost = vcost;
+            cutting->value = top->value + bottom->value;
             left->erase();
             right->erase();
             return cutting;