comparison include/stats.hpp @ 137:aac018615930 ClockSync

MovingAverage now returns a meaningful value also when the buffer is not full

 template<class TYPE> 
 class MovingAverage{
 private:
   TYPE* array;
   int length;
+  bool bufferFull;
   int pointer;
   TYPE sum;
   double scale;
   double average;
   void dealloc(){
-    free(array);
+	free(array);
     //  delete array;
   }
    
   void init(int aLength){
     length=aLength;

     sum=0;
     if(array==NULL)
       printf("Error while allocating array\n");
     memset(array, 0, sizeof(TYPE)*length);
     pointer=0;
+    bufferFull=false;
   }
 public:
   MovingAverage(){
     init(0);
   }

   }
   double add(TYPE newElement){
     sum-=array[pointer];
     array[pointer]=newElement;
     sum+=newElement;
-    average=sum*scale;
+    if(bufferFull==true){
+    	average=sum*scale;
+    }
+    else{
+    	average=sum/(double)(1+pointer);
+    }
     pointer++;
-    if(pointer==length)
+    if(pointer==length){
       pointer=0;
+      bufferFull=true;
+    }
     return average;
   }
   double getAverage(){
     return average;
   }