comparison jnmr/DynamicVector.cpp @ 44:6c8a048720c3

improving functions in dynamic vector - to copy with changing offset in copyvector and the drawvector routine

 	
 }
 
 void DynamicVector::copyFromDynamicVector(const DynamicVector& dynamicVec){
 	if (dynamicVec.length == length){
+		offset = dynamicVec.offset;
 		for (int i = 0;i < length;i++)
 			array[i] = dynamicVec.array[i];
 	}
 	else{
 		printf("CANNOT COPY VECTORS OF NON SAME LENGTH!!\n");

 	}
 	
 //	addGaussianShapeByLookupTable(mean, StdDev, factor);
 }
 
+
+void DynamicVector::addGaussianShapeFromRealTime(const double& actualTime, const double& StdDev, double factor){
+	
+	double mean = getRealTermsAsIndex(actualTime);
+	printf("Gaussian realtime %f at index %f\n", actualTime, mean);
+	int i;
+	double std_dev_factor = (2*StdDev*StdDev);
+	factor *= (1/(StdDev*sqrt(2*PI)));
+	int maxVal = min((int) array.size(), (int)(mean + 4.8*StdDev));
+	int minVal = max(0, (int)(mean - 4.8*StdDev));
+	
+	for (i=minVal;i < maxVal;i++){
+		array[i] += factor*exp(-1*(i-mean)*(i-mean)/(std_dev_factor));
+	}
+	
+	//	addGaussianShapeByLookupTable(mean, StdDev, factor);
+}
+
+
 void DynamicVector::addGaussianShapeByLookupTable(double& mean, double& StdDev, double factor){
 	int i;
 	int lookupIndex ;
 	factor *= (1/(StdDev*sqrt(2*PI)));
 	for (i=0;i<array.size()-1;i++){

 		double heightConstant = screenHeight / maxVal;
 		int lastHeightPixel = heightConstant * (maxVal - array[startInt-1]);
 		int newHeightPixel;
 		for (int i = startInt;i < endInt;i++){
 			newHeightPixel = (int) heightConstant * (maxVal - array[i]);
-			ofLine (stepSize*(i-1), lastHeightPixel, stepSize*i, newHeightPixel);
+			int xPos = i - startInt;
+			ofLine (stepSize*(xPos-1), lastHeightPixel, stepSize*xPos, newHeightPixel);
 			lastHeightPixel = newHeightPixel;
 		}
 	
 }