add additional DSP methods

JuliaControl · May 22, 2023 · abb1703 · abb1703
1 parent a90f619
commit abb1703
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/ControlSystemsBase/src/dsp.jl b/lib/ControlSystemsBase/src/dsp.jl
@@ -1,5 +1,8 @@
-tf(p::DSP.PolynomialRatio, h::Real = 1) = tf(DSP.coefb(p), DSP.coefa(p), h)
-tf(p::DSP.ZeroPoleGain, h::Real = 1) = tf(DSP.PolynomialRatio(p), h)
+
+tf(p::DSP.PolynomialRatio{:z}, h::Real = 1) = tf(DSP.coefb(p), DSP.coefa(p), h)
+tf(p::DSP.PolynomialRatio{:s}) = tf(DSP.coefb(p), DSP.coefa(p))
+tf(p::DSP.ZeroPoleGain{:z}, h::Real = 1) = tf(DSP.PolynomialRatio(p), h)
+tf(p::DSP.ZeroPoleGain{:s}) = tf(DSP.PolynomialRatio(p))
 
 function DSP.PolynomialRatio(G::TransferFunction{<:Discrete})
     DSP.PolynomialRatio(

diff --git a/lib/ControlSystemsBase/test/test_dsp.jl b/lib/ControlSystemsBase/test/test_dsp.jl
@@ -9,7 +9,7 @@
     Gds = DSP.SecondOrderSections(Gd)
 
     u = randn(100)
-    uf = filt(Gds, u, zeros(2,2))
+    uf = DSP.filt(Gds, u, zeros(2,2))
     uls = lsim(Gd, u').y'
     @test uf[1:end-1] ≈ uls[2:end]
 
@@ -23,8 +23,8 @@
     @test fcs.matrix[1].k ≈ k
 
     u = randn(10)
-    uf = filt(f, u)
+    uf = DSP.filt(f, u)
     uls = lsim(fcs, u').y'
     @test uf ≈ uls
 
-end
+end