Revision 2:0bae37b297f4, committed 2017-01-10

Comitter:

benson516

Date:

Tue Jan 10 19:45:40 2017 +0000

Parent:

1:3d8226c5abfe

Child:

3:7191d27f4855

Commit message:

Add reset function for resetting all elements without resize the buffer

Changed in this revision

--- a/IIR.h	Fri Jul 29 14:55:33 2016 +0000
+++ b/IIR.h	Tue Jan 10 19:45:40 2017 +0000
@@ -1,43 +1,53 @@
+#ifndef IIR_H
+#define IIR_H
+
 #include <vector>
 using std::vector;
 /*-----------------------------*/
+//   Order of the numerator: m
+//   Orser of the denominator: n
+//--------------------------------//
 //
 //    y     gain*( sum(i from 0 to m) b[i]*x[k-i] )
 //   --- = --------------------------------------------
 //    u     1 + sum( i from 1 to n) a[i]*y[k-i]
 //
 //   y[k] = gain*( sum(i from 0 to m) b[i]*x[k-i] ) - sum( i from 1 to n) a[i]*y[k-i]
-//   
-//   Compatible with the coefficient generated by Matlab fdatool 
+//
+//   Compatible with the coefficient generated by Matlab fdatool
 //
 //   by C.F. Huang from LDSC
 /*-----------------------------*/
 
 class Circular_buffer{
 private:
+    size_t n;
     vector<float> A;
     // vector<float>::iterator it;
     int ind; // The index of the newest element
-    
+
 public:
     Circular_buffer(){
+        n = 0;
         ind = 0;
     }
-    Circular_buffer(int n){
+    Circular_buffer(int n_in){
+        n = n_in;
         A.resize(n);
         for (size_t i=0; i< A.size(); i++)
             A[i] = 0;
-            
+
         ind = 0;
     }
-    
-    void Init(int n){ // Input: buffer size
+
+    void Init(int n_in){ // Input: buffer size
+        n = n_in;
         A.resize(n);
         for (size_t i=0; i< A.size(); i++)
             A[i] = 0;
         ind = 0;
     }
-    
+
     float Get(int i){ // Get the value of the (t-i)th element, where t stands for the current sample
         int ind_e = ind-i;
         while (ind_e < 0){
@@ -45,29 +55,34 @@
         }
         return A[ind_e];
     }
-    void Insert(float x_new){ // Pop the oldest element and push a new element 
+    void Insert(float x_new){ // Pop the oldest element and push a new element
         ind++;
         while (ind >= A.size()){
             ind -= A.size();
-        } 
+        }
         A[ind] = x_new;
     }
+    void reset(float val){ // Reset all elements to val
+        for (size_t i = 0; i< A.size(); i++)
+            A[i] = val;
+        ind = 0;
+    }
 };
 
 class IIR{
 private:
-    
+
     int m; // the order of numerator
     int n; // the order of denominator
     Circular_buffer x,y;
     vector<float> b; // parameters of numerator, highest order --> lowest order (newest -> oldest)
     vector<float> a; // parameters of denominator, highest order --> lowest order (newest -> oldest)
     float gain;
-    
+
 public:
     IIR(int m, int n): m(m),n(n) {
         x.Init(m+1);
-        y.Init(n);      
+        y.Init(n);
     }
     void Assign_parameters(float b_in[], float a_in[], float gain_in){
         //b.assign(b_in,b_in+m+1);
@@ -89,7 +104,7 @@
         for (int i = 0; i <= m; i++ ){
             y_new += b[i]*x.Get(i);
         }
-        
+
         // Denominator
         for (int i = 0; i < n; i++){
             y_new -= a[i]*y.Get(i);
@@ -97,4 +112,10 @@
         y.Insert(y_new);
         return y_new;
     }
+    void Reset(float val){ // Rest all elements to val
+        x.reset(val);
+        y.reset(val);
+    }
 };
+
+#endif