comparison jnmr/midiEventHolder.cpp @ 36:5a1b0c6fa1fb

Added class to read in the csv Annotation file, then write out the respective difference between the performed piece as followed here, and the annotation of RWC by Ewert and Muller

 
 
 //Main file to look at here is newNoteEvent() - this calls everything else to update the Bayesian array
 
 #include "midiEventHolder.h"
-#include <iostream>
-#include <fstream>
+
+//#include <iostream>
+//#include <fstream>
 
 midiEventHolder::midiEventHolder(){
+	
+	myNotation.readInSomeValues();
+	
 //	recordedNoteOnIndex = 0;
 	alignmentPosition = 0;
 	
 	useTempoPrior = false;//puts sine wave round tempo
 	confidenceWeightingUsed = true;

 
 	double playingTime = ofGetElapsedTimeMillis();
 	playingTime -= startPlayingTime;
 	//now at the last one
 	
+
+	
 	while (smoothIndex < recordedEventTimes.size() && recordedEventTimes[smoothIndex] < newPosition){
+		float annotationTime = 0;
+		int annotationNote = 0;
+		if (smoothIndex < myNotation.rwcAnnotations.size()){
+			annotationTime = myNotation.rwcAnnotations[smoothIndex].eventTime;
+			annotationNote = myNotation.rwcAnnotations[smoothIndex].midiNote;
+		}
+		
+		
 		if ((*fileOutput).is_open()){
-			(*fileOutput) << beatPositions[smoothIndex] <<",  " <<  recordedNoteOnMatrix[smoothIndex][1] << ",  ";
-			(*fileOutput) << playingTime << "\n";
+			(*fileOutput) << fixed << beatPositions[smoothIndex] <<",\t" <<  recordedNoteOnMatrix[smoothIndex][1] << ",\t";
+			(*fileOutput) << playingTime ;
+			float difference = playingTime - (annotationTime*1000.0);
+				if ( recordedNoteOnMatrix[smoothIndex][1] == annotationNote){
+					(*fileOutput) << " corresponds to " << annotationTime;
+				}
+			(*fileOutput) << " \n";
+			
+			printf("midi %i beat pos %f now at %f :: annotaion %i time %f diff \t%f ms\n",  recordedNoteOnMatrix[smoothIndex][1], 
+				   beatPositions[smoothIndex], playingTime, annotationNote, annotationTime, difference);
 		}
 		
 		smoothIndex++;
 	}