comparison dsp/signalconditioning/FiltFilt.cpp @ 506:285f18c0992a

Tests and fixes for FiltFilt: Fix overrun; reset filter between forwards and backwards processes

     COPYING included with this distribution for more information.
 */
 
 #include "FiltFilt.h"
 
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
 FiltFilt::FiltFilt(Filter::Parameters parameters) :
     m_filter(parameters)
 {
     m_ord = m_filter.getOrder();
 }
 
 FiltFilt::~FiltFilt()
 {
 }
 
-void FiltFilt::process(double *src, double *dst, int length)
+void FiltFilt::process(const double *const QM_R__ src,
+                       double *const QM_R__ dst,
+                       const int length)
 {       
     int i;
 
     if (length == 0) return;
 

     double sample0 = 2 * src[ 0 ];
     double sampleN = 2 * src[ length - 1 ];
 
     int index = 0;
     for (i = nFact; i > 0; i--) {
-        filtScratchIn[ index++ ] = sample0 - src[ i ];
+        if (i < length) {
+            filtScratchIn[index] = sample0 - src[ i ];
+        }
+        ++index;
     }
     index = 0;
     for (i = 0; i < nFact; i++) {
-        filtScratchIn[ (nExt - nFact) + index++ ] =
-            sampleN - src[ (length - 2) - i ];
+        if (i < length) {
+            filtScratchIn[(nExt - nFact) + index] =
+                sampleN - src[ (length - 2) - i ];
+        }
+        ++index;
     }
 
     index = 0;
     for (i = 0; i < length; i++) {
         filtScratchIn[ i + nFact ] = src[ i ];
     }
-        
+    
     ////////////////////////////////
     // Do 0Ph filtering
     m_filter.process(filtScratchIn, filtScratchOut, nExt);
         
     // reverse the series for FILTFILT 
     for (i = 0; i < nExt; i++) { 
         filtScratchIn[ i ] = filtScratchOut[ nExt - i - 1];
     }
 
+    // clear filter state
+    m_filter.reset();
+    
     // do FILTER again 
     m_filter.process(filtScratchIn, filtScratchOut, nExt);
-        
+
     // reverse the series back 
     for (i = 0; i < nExt; i++) {
         filtScratchIn[ i ] = filtScratchOut[ nExt - i - 1 ];
     }
     for (i = 0; i < nExt; i++) {

 
     delete [] filtScratchIn;
     delete [] filtScratchOut;
 }
 
-void FiltFilt::reset()
-{
-
-}