final fixes in Butterworth/Bessel/Chebyshev/Elliptic filters

ar1st0crat · Aug 21, 2021 · 70ee2b8 · 70ee2b8
1 parent 474064e
commit 70ee2b8
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 34 deletions.
diff --git a/NWaves/Filters/Bessel/BandPassFilter.cs b/NWaves/Filters/Bessel/BandPassFilter.cs
@@ -35,6 +35,6 @@ private static TransferFunction MakeTf(double f1, double f2, int order)
         /// </summary>
         ///<param name="f1"></param>
         ///<param name="f2"></param>
-        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, _b.Length / 2));
+        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2));
     }
 }
diff --git a/NWaves/Filters/Bessel/BandStopFilter.cs b/NWaves/Filters/Bessel/BandStopFilter.cs
@@ -1,6 +1,5 @@
 using NWaves.Filters.Base;
 using NWaves.Filters.Fda;
-using System;
 
 namespace NWaves.Filters.Bessel
 {
@@ -36,6 +35,6 @@ private static TransferFunction MakeTf(double f1, double f2, int order)
         /// </summary>
         ///<param name="f1"></param>
         ///<param name="f2"></param>
-        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, _b.Length / 2));
+        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2));
     }
 }
diff --git a/NWaves/Filters/Bessel/HighPassFilter.cs b/NWaves/Filters/Bessel/HighPassFilter.cs
@@ -1,6 +1,5 @@
 using NWaves.Filters.Base;
 using NWaves.Filters.Fda;
-using System;
 
 namespace NWaves.Filters.Bessel
 {
@@ -34,6 +33,6 @@ private static TransferFunction MakeTf(double freq, int order)
         /// Change filter coeffs online
         /// </summary>
         /// <param name="freq"></param>
-        public void Change(double freq) => Change(MakeTf(freq, _b.Length));
+        public void Change(double freq) => Change(MakeTf(freq, _a.Length - 1));
     }
 }
diff --git a/NWaves/Filters/Bessel/LowPassFilter.cs b/NWaves/Filters/Bessel/LowPassFilter.cs
@@ -33,6 +33,6 @@ private static TransferFunction MakeTf(double freq, int order)
         /// Change filter coeffs online
         /// </summary>
         /// <param name="freq"></param>
-        public void Change(double freq) => Change(MakeTf(freq, _b.Length));
+        public void Change(double freq) => Change(MakeTf(freq, _a.Length - 1));
     }
 }
diff --git a/NWaves/Filters/Butterworth/BandPassFilter.cs b/NWaves/Filters/Butterworth/BandPassFilter.cs
@@ -35,6 +35,6 @@ private static TransferFunction MakeTf(double f1, double f2, int order)
         /// </summary>
         ///<param name="f1"></param>
         ///<param name="f2"></param>
-        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, _b.Length / 2));
+        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2));
     }
 }
diff --git a/NWaves/Filters/Butterworth/BandStopFilter.cs b/NWaves/Filters/Butterworth/BandStopFilter.cs
@@ -35,6 +35,6 @@ private static TransferFunction MakeTf(double f1, double f2, int order)
         /// </summary>
         ///<param name="f1"></param>
         ///<param name="f2"></param>
-        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, _b.Length / 2));
+        public void Change(double f1, double f2) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2));
     }
 }
diff --git a/NWaves/Filters/Butterworth/HighPassFilter.cs b/NWaves/Filters/Butterworth/HighPassFilter.cs
@@ -32,6 +32,6 @@ private static TransferFunction MakeTf(double freq, int order)
         /// Change filter coeffs online
         /// </summary>
         /// <param name="freq"></param>
-        public void Change(double freq) => Change(MakeTf(freq, _b.Length));
+        public void Change(double freq) => Change(MakeTf(freq, _a.Length - 1));
     }
 }
diff --git a/NWaves/Filters/Butterworth/LowPassFilter.cs b/NWaves/Filters/Butterworth/LowPassFilter.cs
@@ -32,6 +32,6 @@ private static TransferFunction MakeTf(double freq, int order)
         /// Change filter coeffs online
         /// </summary>
         /// <param name="freq"></param>
-        public void Change(double freq) => Change(MakeTf(freq, _b.Length));
+        public void Change(double freq) => Change(MakeTf(freq, _a.Length - 1));
     }
 }
diff --git a/NWaves/Filters/ChebyshevI/BandPassFilter.cs b/NWaves/Filters/ChebyshevI/BandPassFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevI
     /// <summary>
     /// Band-pass Chebyshev-I filter
     /// </summary>
-    public class BandPassFilter : IirFilter
+    public class BandPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -36,6 +36,6 @@ private static TransferFunction MakeTf(double f1, double f2, int order, double r
         /// <param name="f1"></param>
         /// <param name="f2"></param>
         /// <param name="ripple"></param>
-        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, _b.Length / 2, ripple));
+        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevI/BandStopFilter.cs b/NWaves/Filters/ChebyshevI/BandStopFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevI
     /// <summary>
     /// Band-stop Chebyshev-I filter
     /// </summary>
-    public class BandStopFilter : IirFilter
+    public class BandStopFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -36,6 +36,6 @@ private static TransferFunction MakeTf(double f1, double f2, int order, double r
         /// <param name="f1"></param>
         /// <param name="f2"></param>
         /// <param name="ripple"></param>
-        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, _b.Length / 2, ripple));
+        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevI/HighPassFilter.cs b/NWaves/Filters/ChebyshevI/HighPassFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevI
     /// <summary>
     /// High-pass Chebyshev-I filter
     /// </summary>
-    public class HighPassFilter : IirFilter
+    public class HighPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -34,6 +34,6 @@ private static TransferFunction MakeTf(double freq, int order, double ripple = 0
         /// </summary>
         /// <param name="freq"></param>
         /// <param name="ripple"></param>
-        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _b.Length, ripple));
+        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _a.Length - 1, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevI/LowPassFilter.cs b/NWaves/Filters/ChebyshevI/LowPassFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevI
     /// <summary>
     /// Low-pass Chebyshev-I filter
     /// </summary>
-    public class LowPassFilter : IirFilter
+    public class LowPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -34,6 +34,6 @@ private static TransferFunction MakeTf(double freq, int order, double ripple = 0
         /// </summary>
         /// <param name="freq"></param>
         /// <param name="ripple"></param>
-        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _b.Length, ripple));
+        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _a.Length - 1, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevII/BandPassFilter.cs b/NWaves/Filters/ChebyshevII/BandPassFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevII
     /// <summary>
     /// Band-pass Chebyshev-II filter
     /// </summary>
-    public class BandPassFilter : IirFilter
+    public class BandPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -38,6 +38,6 @@ private static TransferFunction MakeTf(double freq1, double freq2, int order, do
         /// <param name="f1"></param>
         /// <param name="f2"></param>
         /// <param name="ripple"></param>
-        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, _b.Length / 2, ripple));
+        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevII/BandStopFilter.cs b/NWaves/Filters/ChebyshevII/BandStopFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevII
     /// <summary>
     /// Band-stop Chebyshev-II filter
     /// </summary>
-    public class BandStopFilter : IirFilter
+    public class BandStopFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -38,6 +38,6 @@ private static TransferFunction MakeTf(double freq1, double freq2, int order, do
         /// <param name="f1"></param>
         /// <param name="f2"></param>
         /// <param name="ripple"></param>
-        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, _b.Length / 2, ripple));
+        public void Change(double f1, double f2, double ripple = 0.1) => Change(MakeTf(f1, f2, (_a.Length - 1) / 2, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevII/HighPassFilter.cs b/NWaves/Filters/ChebyshevII/HighPassFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevII
     /// <summary>
     /// High-pass Chebyshev-II filter
     /// </summary>
-    public class HighPassFilter : IirFilter
+    public class HighPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -36,6 +36,6 @@ private static TransferFunction MakeTf(double freq, int order, double ripple = 0
         /// </summary>
         /// <param name="freq"></param>
         /// <param name="ripple"></param>
-        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _b.Length, ripple));
+        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _a.Length - 1, ripple));
     }
 }
diff --git a/NWaves/Filters/ChebyshevII/LowPassFilter.cs b/NWaves/Filters/ChebyshevII/LowPassFilter.cs
@@ -6,7 +6,7 @@ namespace NWaves.Filters.ChebyshevII
     /// <summary>
     /// Low-pass Chebyshev-II filter
     /// </summary>
-    public class LowPassFilter : IirFilter
+    public class LowPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -36,6 +36,6 @@ private static TransferFunction MakeTf(double freq, int order, double ripple = 0
         /// </summary>
         /// <param name="freq"></param>
         /// <param name="ripple"></param>
-        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _b.Length, ripple));
+        public void Change(double freq, double ripple = 0.1) => Change(MakeTf(freq, _a.Length - 1, ripple));
     }
 }
diff --git a/NWaves/Filters/Elliptic/BandPassFilter.cs b/NWaves/Filters/Elliptic/BandPassFilter.cs
@@ -3,7 +3,7 @@
 
 namespace NWaves.Filters.Elliptic
 {
-    public class BandPassFilter : IirFilter
+    public class BandPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -43,7 +43,7 @@ private static TransferFunction MakeTf(double freq1, double freq2, int order, do
         /// <param name="rippleStop"></param>
         public void Change(double freq1, double freq2, double ripplePass = 1, double rippleStop = 20)
         {
-            Change(MakeTf(freq1, freq2, _b.Length / 2, ripplePass, rippleStop));
+            Change(MakeTf(freq1, freq2, (_a.Length - 1) / 2, ripplePass, rippleStop));
         }
     }
 }
diff --git a/NWaves/Filters/Elliptic/BandStopFilter.cs b/NWaves/Filters/Elliptic/BandStopFilter.cs
@@ -3,7 +3,7 @@
 
 namespace NWaves.Filters.Elliptic
 {
-    public class BandStopFilter : IirFilter
+    public class BandStopFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -43,7 +43,7 @@ private static TransferFunction MakeTf(double freq1, double freq2, int order, do
         /// <param name="rippleStop"></param>
         public void Change(double freq1, double freq2, double ripplePass = 1, double rippleStop = 20)
         {
-            Change(MakeTf(freq1, freq2, _b.Length / 2, ripplePass, rippleStop));
+            Change(MakeTf(freq1, freq2, (_a.Length - 1) / 2, ripplePass, rippleStop));
         }
     }
 }
diff --git a/NWaves/Filters/Elliptic/HighPassFilter.cs b/NWaves/Filters/Elliptic/HighPassFilter.cs
@@ -3,7 +3,7 @@
 
 namespace NWaves.Filters.Elliptic
 {
-    public class HighPassFilter : IirFilter
+    public class HighPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -40,7 +40,7 @@ private static TransferFunction MakeTf(double freq, int order, double ripplePass
         /// <param name="rippleStop"></param>
         public void Change(double freq, double ripplePass = 1, double rippleStop = 20)
         {
-            Change(MakeTf(freq, _b.Length, ripplePass, rippleStop));
+            Change(MakeTf(freq, _a.Length - 1, ripplePass, rippleStop));
         }
     }
 }
diff --git a/NWaves/Filters/Elliptic/LowPassFilter.cs b/NWaves/Filters/Elliptic/LowPassFilter.cs
@@ -3,7 +3,7 @@
 
 namespace NWaves.Filters.Elliptic
 {
-    public class LowPassFilter : IirFilter
+    public class LowPassFilter : ZiFilter
     {
         /// <summary>
         /// Constructor
@@ -40,7 +40,7 @@ private static TransferFunction MakeTf(double freq, int order, double ripplePass
         /// <param name="rippleStop"></param>
         public void Change(double freq, double ripplePass = 1, double rippleStop = 20)
         {
-            Change(MakeTf(freq, _b.Length, ripplePass, rippleStop));
+            Change(MakeTf(freq, _a.Length - 1, ripplePass, rippleStop));
         }
     }
 }