# HG changeset patch
# User cannam
# Date 1220544901 0
# Node ID 3fcac0f3afdcff6d4b16be668693f9b1b04bbb4d
# Parent  cd16cbf80c878517e76d69eedfddea415b99894c
* More fixes to continuous time averaging

diff -r cd16cbf80c87 -r 3fcac0f3afdc vamp-sdk/hostext/PluginSummarisingAdapter.cpp
--- a/vamp-sdk/hostext/PluginSummarisingAdapter.cpp	Thu Sep 04 15:19:24 2008 +0000
+++ b/vamp-sdk/hostext/PluginSummarisingAdapter.cpp	Thu Sep 04 16:15:01 2008 +0000
@@ -296,7 +296,12 @@
     for (FeatureSet::const_iterator i = fs.begin(); i != fs.end(); ++i) {
         for (FeatureList::const_iterator j = i->second.begin();
              j != i->second.end(); ++j) {
-            accumulate(i->first, *j, timestamp, final);
+            if (j->hasTimestamp) {
+                accumulate(i->first, *j, j->timestamp, final);
+            } else {
+                //!!! is this correct?
+                accumulate(i->first, *j, timestamp, final);
+            }
         }
     }
 }
@@ -311,6 +316,15 @@
 
     m_accumulators[output].count++;
 
+    std::cerr << "output " << output << ": timestamp " << timestamp << ", prev timestamp " << m_prevTimestamps[output] << std::endl;
+
+    //!!! m_prevDuration needs to be per output
+
+    //!!! also, this will not work if we are called repeatedly with
+    //!!! the same timestamp -- no values will be registered until a
+    //!!! new timestamp is seen -- we need a better test for "not
+    //!!! first result" below
+
     if (m_prevDuration == RealTime::zeroTime) {
         if (m_prevTimestamps.find(output) != m_prevTimestamps.end()) {
             m_prevDuration = timestamp - m_prevTimestamps[output];
@@ -378,7 +392,7 @@
         int output = i->first;
         OutputAccumulator &accumulator = i->second;
 
-        double totalDuration;
+        double totalDuration = 0.0;
         for (int k = 0; k < accumulator.durations.size(); ++k) {
             totalDuration += toSec(accumulator.durations[k]);
         }
@@ -499,6 +513,9 @@
                     double value = values[k] * toSec(durations[k]);
                     sum_c += value;
                 }
+
+                std::cerr << "mean_c = " << sum_c << " / " << totalDuration << " = "
+                          << sum_c / totalDuration << std::endl;
                 
                 summary.mean_c = sum_c / totalDuration;
 
@@ -515,6 +532,9 @@
 
             float mean = summary.sum / summary.count;
 
+            std::cerr << "mean = " << summary.sum << " / " << summary.count << " = "
+                      << summary.sum / summary.count << std::endl;
+
             for (int k = 0; k < sz; ++k) {
                 summary.variance += (values[k] - mean) * (values[k] - mean);
             }