Merge branch 'master' into ss_conversion

JuliaControl · Sep 27, 2020 · cab77cf · cab77cf
2 parents c4f2929 + a3417a3
commit cab77cf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,10 @@
 language: julia
 julia:
   - 1.0
-  - 1.3
   - 1.5
   - nightly
 matrix:
   allow_failures:
-  - julia: 1.3
   - julia: nightly
   fast_finish: true
 notifications:

diff --git a/src/types/zpk.jl b/src/types/zpk.jl
@@ -71,7 +71,7 @@ end
 zpk(k::Real, Ts::TimeEvolution) = zpk(eltype(k)[], eltype(k)[], k, Ts)
 
 
-zpk(sys::StateSpace) = zpk(tf(sys)) # FIXME: probably better with direct conversion
+zpk(sys::StateSpace) = zpk(zpkdata(sys)...)
 
 function zpk(G::TransferFunction{TE,S}) where {TE<:TimeEvolution,T0, S<:SisoTf{T0}}
     T = typeof(one(T0)/one(T0))