From 80319aa419fa0556010b7c44b3ef096e369c1212 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Mon, 9 Dec 2013 17:34:33 +0000
Subject: starting similarity-intensity-segmenter

---
 rotord/src/nodes_audio_analysis.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'rotord/src/nodes_audio_analysis.cpp')

diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp
index a6aa4ec..2c3abef 100644
--- a/rotord/src/nodes_audio_analysis.cpp
+++ b/rotord/src/nodes_audio_analysis.cpp
@@ -116,6 +116,16 @@ namespace Rotor{
 		//add tempo and intensity according to a weighting
 		//score the results (ie 1st place, 2nd place) to end up with a set of integer numbers
 
+
+		//combine with similarity numbers
+		// 1. count similarity numbers
+		multiset<int> similarities;
+		
+		for (auto f:analysers["segmenter"].features) {
+			if (f.second.values.size()) similarities.insert(f.second.values[0]);
+		}
+		for (auto s:similarities) cerr<<"group "<<s<<" count: "<<similarities.count(s)<<endl;
+
 		//for (auto a:analysers) a.second.cleanup(); //WHY NOT WORK - its as if the call is const
 		analysers["segmenter"].cleanup();
 		analysers["tempo"].cleanup();
-- 
cgit v1.2.3


From 0b63fd4e7b1bcda9830c2304284ea2daf4073db3 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Mon, 9 Dec 2013 17:36:33 +0000
Subject: starting similarity-intensity-segmenter

---
 rotord/src/nodes_audio_analysis.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'rotord/src/nodes_audio_analysis.cpp')

diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp
index 2c3abef..e80582a 100644
--- a/rotord/src/nodes_audio_analysis.cpp
+++ b/rotord/src/nodes_audio_analysis.cpp
@@ -117,6 +117,11 @@ namespace Rotor{
 		//score the results (ie 1st place, 2nd place) to end up with a set of integer numbers
 
 
+		//for (auto a:analysers) a.second.cleanup(); //WHY NOT WORK - its as if the call is const
+		analysers["segmenter"].cleanup();
+		analysers["tempo"].cleanup();
+		analysers["intensity"].cleanup();
+
 		//combine with similarity numbers
 		// 1. count similarity numbers
 		multiset<int> similarities;
@@ -126,10 +131,6 @@ namespace Rotor{
 		}
 		for (auto s:similarities) cerr<<"group "<<s<<" count: "<<similarities.count(s)<<endl;
 
-		//for (auto a:analysers) a.second.cleanup(); //WHY NOT WORK - its as if the call is const
-		analysers["segmenter"].cleanup();
-		analysers["tempo"].cleanup();
-		analysers["intensity"].cleanup();
 		cerr<<analysers["segmenter"].features.size()<<" segments"<<endl;
 		cerr<<analysers["tempo"].features.size()<<" tempo features"<<endl;
 		cerr<<analysers["intensity"].features.size()<<" intensity features"<<endl;
-- 
cgit v1.2.3