diff matchAnnotationSrc/testApp.h @ 51:ef30f465a904

some minor code changes to choose midi or audio match alignment

--- a/matchAnnotationSrc/testApp.h	Thu Mar 29 13:41:59 2012 +0100
+++ b/matchAnnotationSrc/testApp.h	Sat Mar 31 14:04:49 2012 +0100
@@ -6,15 +6,29 @@
 #include "matchAnnotations.h"
 #include "jnmrMidiPlayerAnnotations.h"
 
-struct TimingResult{
+class TimingResult{
+public:
+	
 	double median;
 	double mean;
 	int count;
 	double percentileCount[7];
 	double percentiles[7];
 	int type;
+	
+	TimingResult(){
+		median= 0;
+		mean = 0;
+		count = 0;
+		for (int i = 0;i <7;i++){
+			percentileCount[i] = 0;
+			percentiles[i] = 0;
+		}
+	}
 };
 
+
+
 class testApp : public ofBaseApp{
 
 	public:
@@ -59,6 +73,14 @@
 	vector<TimingResult> matchOB_results;
 	vector<TimingResult> JNMR_MidiMatcher_results;
 	
+	TimingResult final_JNMR_Midi;
+	TimingResult final_Match_OF;
+	TimingResult final_Match_OB;
+	
+	
+	std::string matchRoot;// = "/Users/andrew/Documents/work/programming/Shell Scripts/MatchMidiToMidiOutput/RWCmatch_RM-C";
 	void getResults(const int& fileID);
+	void calculateOverallPercentiles();
+	void calculateOverallMatchPercentiles();
 	int fileNumberToTest;
 };