Merge branch 'master' into compathelper/new_version/2019-12-17-14-02-59-522-1074000113

Author: mfalt

.travis.yml

@@ -1,8 +1,7 @@
 language: julia
 julia:
   - 1.0
-  - 1.1
-  - 1.2
+  - 1.3
   - nightly
 matrix:
   allow_failures:

Project.toml

@@ -20,7 +20,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-Colors = "0.9.2, 0.10"
+Colors = "0.9.2, 0.10, 0.11"
 DSP = "0.6.1"
 DelayDiffEq = "5.6"
 IterTools = "1.0"

README.md

@@ -74,7 +74,7 @@ Some of the available commands are:
 ##### Constructing systems
 ss, tf, zpk, ss2tf
 ##### Analysis
-pole, tzero, norm, norminf, ctrb, obsv, gangoffour, margin, markovparam, damp, dampreport, zpkdata, dcgain, covar, gram, sigma, sisomargin
+pole, tzero, norm, hinfnorm, linfnorm, ctrb, obsv, gangoffour, margin, markovparam, damp, dampreport, zpkdata, dcgain, covar, gram, sigma, sisomargin
 ##### Synthesis
 care, dare, dlyap, lqr, dlqr, place, leadlink, laglink, leadlinkat, rstd, rstc, dab, balreal, baltrunc
 ###### PID design

src/ControlSystems.jl

@@ -24,7 +24,8 @@ export  LTISystem,
         lqgi,
         covar,
         norm,
-        norminf,
+        hinfnorm,
+        linfnorm,
         gram,
         ctrb,
         obsv,
@@ -143,6 +144,7 @@ include("plotting.jl")
 
 @deprecate num numvec
 @deprecate den denvec
+@deprecate norminf hinfnorm
 
 # The path has to be evaluated upon initial import
 const __CONTROLSYSTEMS_SOURCE_DIR__ = dirname(Base.source_path())

src/analysis.jl

@@ -138,7 +138,7 @@ function damp(sys::LTISystem)
         ps = log(ps)/Ts
     end
     Wn = abs.(ps)
-    order = sortperm(Wn)
+    order = sortperm(Wn; by=z->(abs(z), real(z), imag(z)))
     Wn = Wn[order]
     ps = ps[order]
     ζ = -cos.(angle.(ps))

src/freqresp.jl

@@ -128,7 +128,6 @@ frequencies `w`
 `sv` has size `(length(w), max(ny, nu))`"""
 function sigma(sys::LTISystem, w::AbstractVector)
     resp = freqresp(sys, w)
-    nw, ny, nu = size(resp)
     sv = dropdims(mapslices(svdvals, resp, dims=(2,3)),dims=3)
     return sv, w
 end