changeset 14:f1252b6a7cf5

More debug output, and a minor fix
author Chris Cannam
date Fri, 07 Oct 2011 14:07:42 +0100
parents 0d4048bfadbb
children 887c629502a9
files Agent.h AgentList.h BeatRootProcessor.h
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Agent.h	Thu Oct 06 18:37:50 2011 +0100
+++ b/Agent.h	Fri Oct 07 14:07:42 2011 +0100
@@ -138,7 +138,7 @@
 
     Agent clone() const {
         Agent a(*this);
-        a.idCounter++;
+        a.idNumber = idCounter++;
         return a;
     }
 
--- a/AgentList.h	Thu Oct 06 18:37:50 2011 +0100
+++ b/AgentList.h	Fri Oct 07 14:07:42 2011 +0100
@@ -130,8 +130,9 @@
             std::cerr << "removeDuplicates: removed " << removed << ", have "
                       << list.size() << " agent(s) remaining" << std::endl;
         }
-        for (int i = 0; i <list.size(); ++i) {
-            std::cerr << "agent " << i  << ": time " << list[i].beatTime << std::endl;
+        int n = 0;
+        for (Container::iterator i = list.begin(); i != list.end(); ++i) {
+            std::cerr << "agent " << n++ << ": time " << i->beatTime << std::endl;
         }
 #endif
     } // removeDuplicates()
--- a/BeatRootProcessor.h	Thu Oct 06 18:37:50 2011 +0100
+++ b/BeatRootProcessor.h	Fri Oct 07 14:07:42 2011 +0100
@@ -124,6 +124,11 @@
     /** Tracks beats once all frames have been processed by processFrame
      */
     EventList beatTrack() {
+
+        for (int i = 0; i < spectralFlux.size(); ++i) {
+            if ((i % 8) == 0) std::cerr << "\n";
+            std::cerr << spectralFlux[i] << " ";
+        }
 		
         double hop = hopTime;
         Peaks::normalise(spectralFlux);