diff options
Diffstat (limited to 'rotord/src')
| -rw-r--r-- | rotord/src/nodes_audio_analysis.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp index faefb02..c6a19c9 100644 --- a/rotord/src/nodes_audio_analysis.cpp +++ b/rotord/src/nodes_audio_analysis.cpp @@ -122,7 +122,7 @@ namespace Rotor{ //how to group with similarity? //segments come with similarity groups - // 1 - are the wanted segments less than discovered? + // 1 - are the wanted git checksegments less than discovered? // N - do nothing // 2 - get intensity and tempo averages // 2 - count the groups @@ -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,8 +252,9 @@ 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 @@ -356,6 +357,7 @@ nned to retrieve total intensity by segment f.values.push_back(outputvalues[i]); features[times[totals[i].first]]=f; } +>>>>>>> intensitysimilarity } } |