changeset 175:4811fb599a97

* summarising adapter might sort of work now -- quite untested though

--- a/vamp-sdk/hostext/PluginSummarisingAdapter.cpp	Tue Aug 05 13:38:30 2008 +0000
+++ b/vamp-sdk/hostext/PluginSummarisingAdapter.cpp	Tue Aug 05 15:15:37 2008 +0000
@@ -37,6 +37,7 @@
 #include "PluginSummarisingAdapter.h"
 
 #include <map>
+#include <cmath>
 
 namespace Vamp {
 
@@ -53,7 +54,7 @@
 
     void setSummarySegmentBoundaries(const SegmentBoundaries &);
 
-    FeatureSet getSummary(SummaryType type);
+    FeatureList getSummary(int output, SummaryType type);
 
 protected:
     Plugin *m_plugin;
@@ -117,6 +118,11 @@
     return m_impl->getRemainingFeatures();
 }
 
+Plugin::FeatureList
+PluginSummarisingAdapter::getSummary(int output, SummaryType type)
+{
+    return m_impl->getSummary(output, type);
+}
 
 PluginSummarisingAdapter::Impl::Impl(Plugin *plugin, float inputSampleRate) :
     m_plugin(plugin)
@@ -145,6 +151,80 @@
     return fs;
 }
 
+Plugin::FeatureList
+PluginSummarisingAdapter::Impl::getSummary(int output, SummaryType type)
+{
+    //!!! need to ensure that this is only called after processing is
+    //!!! complete (at the moment processing is "completed" in the
+    //!!! call to getRemainingFeatures, but we don't want to require
+    //!!! the host to call getRemainingFeatures at all unless it
+    //!!! actually wants the raw features too -- calling getSummary
+    //!!! should be enough -- we do need to ensure that all data has
+    //!!! been processed though!)
+    FeatureList fl;
+    for (SummarySegmentMap::const_iterator i = m_summaries[output].begin();
+         i != m_summaries[output].end(); ++i) {
+        Feature f;
+        f.hasTimestamp = true;
+        f.timestamp = i->first;
+        f.hasDuration = false;
+        for (OutputSummary::const_iterator j = i->second.begin();
+             j != i->second.end(); ++j) {
+
+            // these will be ordered by bin number, and no bin numbers
+            // will be missing except at the end (because of the way
+            // the accumulators were initially filled in accumulate())
+
+            const OutputBinSummary &summary = j->second;
+            float result = 0.f;
+
+            switch (type) {
+
+            case Minimum:
+                result = summary.minimum;
+                break;
+
+            case Maximum:
+                result = summary.maximum;
+                break;
+
+            case Mean:
+                if (summary.count) {
+                    result = summary.sum / summary.count;
+                }
+                break;
+
+            case Median:
+                result = summary.median;
+                break;
+
+            case Mode:
+                result = summary.mode;
+                break;
+
+            case Sum:
+                result = summary.sum;
+                break;
+
+            case Variance:
+                result = summary.variance;
+                break;
+
+            case StandardDeviation:
+                result = sqrtf(summary.variance);
+                break;
+
+            case Count:
+                result = summary.count;
+                break;
+            }
+        }
+
+        fl.push_back(f);
+    }
+    return fl;
+}
+
 void
 PluginSummarisingAdapter::Impl::accumulate(const FeatureSet &fs,
                                            RealTime timestamp)
@@ -220,7 +300,8 @@
             //!!! I don't like this.  Really the mode should be the
             //!!! value that spans the longest period of time, not the
             //!!! one that appears in the largest number of distinct
-            //!!! features.
+            //!!! features.  I suppose that a median by time rather
+            //!!! than number of features would also be useful.
             
             for (std::map<float, int>::iterator di = distribution.begin();
                  di != distribution.end(); ++di) {
@@ -242,6 +323,8 @@
             m_summaries[output][segmentStart][bin] = summary;
         }
     }
+
+    m_accumulators.clear();
 }
 
 

--- a/vamp-sdk/hostext/PluginSummarisingAdapter.h	Tue Aug 05 13:38:30 2008 +0000
+++ b/vamp-sdk/hostext/PluginSummarisingAdapter.h	Tue Aug 05 15:15:37 2008 +0000
@@ -69,7 +69,7 @@
         Count
     };
 
-    FeatureSet getSummary(int output, SummaryType type);
+    FeatureList getSummary(int output, SummaryType type);
 
 protected:
     class Impl;