From c2cd92d57457c30c8d66cb2c589191a3bb950f7d Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Tue, 10 Dec 2013 13:13:25 +0000
Subject: avoid decimation loop

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

(limited to 'rotord/src')

diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp
index c6a19c9..1bc82e6 100644
--- a/rotord/src/nodes_audio_analysis.cpp
+++ b/rotord/src/nodes_audio_analysis.cpp
@@ -218,7 +218,7 @@ namespace Rotor{
 			totalsmap.push_back((tempos[i]*parameters["tempo_weight"]->value)+(intensities[i]*parameters["intensity_weight"]->value));
 		}
 
-		
+		/*
 		//sort and convert to features
 		std::sort(totals.begin(),totals.end(),sortsegments);
 		for (i=0;i<totals.size();i++) {
@@ -252,9 +252,7 @@ namespace Rotor{
 			f.values.push_back((double)i-bucketoffsets[i]);
 			features[times[totals[i].first]]=f;
 		}
-
-<<<<<<< HEAD
-=======
+/*
 		/*
 sort intensity totals
 find out how many segments will share levels apart from similarity levels
@@ -319,7 +317,8 @@ nned to retrieve total intensity by segment
 				seggrps.erase(seggrps.begin()+smallest);
 			}
 			cerr<<"intensities merged, "<<seggrps.size()<<" levels remain"<<endl;
-			while (seggrps.size()<min((int)parameters["levels"]->value,(int)totalsmap.size())) {
+			while (false) {
+			//while (seggrps.size()<min((int)parameters["levels"]->value,(int)totalsmap.size())) {
 				//split groups
 				//calculate standard deviation of intensity variation
 				vector<double> devs;
@@ -357,7 +356,7 @@ nned to retrieve total intensity by segment
 			f.values.push_back(outputvalues[i]);
 			features[times[totals[i].first]]=f;
 		}
->>>>>>> intensitysimilarity
+
 	}
 }
 
-- 
cgit v1.2.3