comparison src/DynamicVector.cpp @ 2:5581023e0de4

Added separate CannamMidiFileLoader class to handle the loading in.

  *  Created by Andrew on 18/07/2011.
  *  Copyright 2011 QMUL. All rights reserved.
  *
  */
 
+
 #include "DynamicVector.h"
 
 DynamicVector::DynamicVector(){
 	length = 0;
 	arraySize = 0;

 	}
 	maximumValue = max;
 	return max;
 }
 
+double DynamicVector::getIntegratedEstimate(){
+	//returns the index of the integrated average - where the probability distribution is centred
+	double estimate = 0;
+	double integratedTotal = 0;
+	for (int i = 0;i < length;i++){
+		estimate += array[i]*i;
+		integratedTotal += array[i];
+	}
+	if (integratedTotal > 0){
+		estimate /= integratedTotal;
+	}
+	return estimate;
+}
+
 void DynamicVector::zero(){
 	for (int i = 0;i < array.size();i++)
 		array[i] = 0;
 }
 

 	//now delete tmp array
 }
 
 void DynamicVector::addGaussianShape(double mean, double StdDev, double factor){
 	int i;
+	factor *= (1/(StdDev*sqrt(2*PI)));
 	for (i=0;i<array.size();i++){
-		array[i] += factor*(1/(StdDev*sqrt(2*PI)))*exp(-1*(i-mean)*(i-mean)/(2*StdDev*StdDev));
+		array[i] += factor*exp(-1*(i-mean)*(i-mean)/(2*StdDev*StdDev));
 	}
 	//printf("ADDED GAUSSIAN SHAPE %i\n", (int)array.size());
+}
+
+void DynamicVector::addTriangularShape(double mean, double width, double factor){
+	int i;
+
+	for (i= max(0., (double)(mean - width));i < min((mean+width), (double)array.size());i++){
+		array[i] += factor * abs(i - mean) / mean;		
+	}
+
 }
 
 void DynamicVector::addConstant(double value){
 	for (int i=0;i<array.size();i++){
 		array[i] += value;