comparison jnmr/midiEventHolder.cpp @ 49:3ce6dadd8167

Added src for the results calculator, comparing match output with the JNMR midi follower output

 #include <fstream>
 #include <assert.h>
 
 midiEventHolder::midiEventHolder(){
 	
-
+	timeProjectionToMeet = 600;//ms in future they will intersect bet predicted and causal play position
+	
 	double scalarForPositionVectors = 10;
 	
 //	recordedNoteOnIndex = 0;
 	alignmentPosition = 0;
 	

 		
 		bayesStruct.updateBestEstimate(0);//was timedifference
 		//	bayesStruct.updateTmpBestEstimate(timeDifference);
 	}
 	
-	
+	//did just update smooth to current if it was less
 	
 	if (smoothPlayPosition < bayesStruct.bestEstimate){
 		updateSmoothPositionTo(bayesStruct.bestEstimate);
 		//smoothPlayPosition = bayesStruct.bestEstimate;
 	}
 	
+
+	
 	updateCausalPlayPosition(getTimeNow(bayesStruct.lastBestEstimateUpdateTime));
+	
+/*
+	//now we try updating it to a causal path that tries to match into the future	
+ if (smoothPlayPosition < causalPlayPosition){
+		updateSmoothPositionTo(causalPlayPosition);
+	}
+*/	
 	
 //	playPositionInMillis = timeDifference;//based on updating from when we change period
 	//this to be added
 
 	

 			   annotationNote, annotationLocation, annotationTime, difference);
 		
 //		assert(annotationNote == recordedNoteOnMatrix[smoothIndex][1]);
 	assert(annotationTick == recordedNoteOnMatrix[smoothIndex][0]);
 	
+		smoothDifference = difference;
 		
 		if ((*differenceOutput).is_open()){
 			(*differenceOutput) << beatPositions[smoothIndex] << "," << difference << "," << playingTime << "," << (annotationTime*1000.0) << "\n";
 		//	printf("midi %i beat pos %f playing time now at %f :: annotaion %i loc % f time %f diff \t%f ms\n",  
 		//		   recordedNoteOnMatrix[smoothIndex][1], 

 		
 }
 
 void midiEventHolder::updateCausalPlayPosition(const double& timeNow){
 	//projected position
-	double timeProjectionToMeet = 1000;//ms in future they will intersect
+	
 	double difference =	bayesStruct.bestEstimate - causalPlayPosition;
 	causalSpeed = bayesStruct.speedEstimate;
 	causalSpeed += (difference/timeProjectionToMeet);
 	
 	if (causalSpeed < 0)

 	}	
 	
 	//ofDrawBitmapString(ofToString(timeOffsetForScreen, 1), 20,20);
 	ofSetColor(255,255,255);
 	ofDrawBitmapString(timeString, 20, 60);
+	ofDrawBitmapString("diff "+ofToString(smoothDifference), 20, 140);
 	
 //last played piutch
 	ofSetColor(0,200,0,50);
 	int yLocation = (*screenHeight) - ((lastPlayedPitch - noteMinimum )*(*screenHeight)/ (float)(noteMaximum - noteMinimum));						 
 	ofRect(0,yLocation, 100,  noteHeight);