Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pass through kwargs to norm calculations #542

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

pass through kwargs to norm calculations #542

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/matrix_comps.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,16 +209,16 @@ It represents the desired relative accuracy for the computed L∞ norm

`sys` is first converted to a `StateSpace` model if needed.
"""
function LinearAlgebra.norm(sys::AbstractStateSpace, p::Real=2; tol=1e-6)
function LinearAlgebra.norm(sys::AbstractStateSpace, p::Real=2; tol=1e-6, kwargs...)
if p == 2
return sqrt(tr(covar(sys, I)))
elseif p == Inf
return hinfnorm(sys; tol=tol)[1]
return hinfnorm(sys; tol, kwargs...)[1]
else
error("`p` must be either `2` or `Inf`")
end
end
LinearAlgebra.norm(sys::TransferFunction, p::Real=2; tol=1e-6) = norm(ss(sys), p, tol=tol)
LinearAlgebra.norm(sys::TransferFunction, p::Real=2; tol=1e-6, kwargs...) = norm(ss(sys), p; tol, kwargs...)


"""
Expand All @@ -245,9 +245,9 @@ state space systems in continuous and discrete time', American Control Conferenc

See also [`linfnorm`](@ref).
"""
hinfnorm(sys::AbstractStateSpace{<:Continuous}; tol=1e-6) = _infnorm_two_steps_ct(sys, :hinf, tol)
hinfnorm(sys::AbstractStateSpace{<:Discrete}; tol=1e-6) = _infnorm_two_steps_dt(sys, :hinf, tol)
hinfnorm(sys::TransferFunction; tol=1e-6) = hinfnorm(ss(sys); tol=tol)
hinfnorm(sys::AbstractStateSpace{<:Continuous}; tol=1e-6, kwargs...) = _infnorm_two_steps_ct(sys, :hinf; tol, kwargs...)
hinfnorm(sys::AbstractStateSpace{<:Discrete}; tol=1e-6, kwargs...) = _infnorm_two_steps_dt(sys, :hinf; tol, kwargs...)
hinfnorm(sys::TransferFunction; tol=1e-6) = hinfnorm(ss(sys); tol, kwargs...)

"""
` (Ninf, ω_peak) = linfnorm(sys; tol=1e-6)`
Expand All @@ -272,16 +272,16 @@ state space systems in continuous and discrete time', American Control Conferenc

See also [`hinfnorm`](@ref).
"""
function linfnorm(sys::AbstractStateSpace; tol=1e-6)
function linfnorm(sys::AbstractStateSpace; tol=1e-6, kwargs...)
if iscontinuous(sys)
return _infnorm_two_steps_ct(sys, :linf, tol)
return _infnorm_two_steps_ct(sys, :linf; tol, kwargs...)
else
return _infnorm_two_steps_dt(sys, :linf, tol)
return _infnorm_two_steps_dt(sys, :linf; tol, kwargs...)
end
end
linfnorm(sys::TransferFunction; tol=1e-6) = linfnorm(ss(sys); tol=tol)
linfnorm(sys::TransferFunction; tol=1e-6) = linfnorm(ss(sys); tol, kwargs...)

function _infnorm_two_steps_ct(sys::AbstractStateSpace, normtype::Symbol, tol=1e-6, maxIters=250, approximag=1e-10)
function _infnorm_two_steps_ct(sys::AbstractStateSpace, normtype::Symbol; tol=1e-6, maxIters=250, approximag=1e-10)
# norm type :hinf or :linf the reason that to not use `hinfnorm(sys) = isstable(sys) : linfnorm ? (Inf, Nan)`
# is to avoid re computing the poles and return the peak frequencies for, e.g., 1/(s^2 + 1)
# `maxIters`: the maximum number of iterations allowed in the algorithm (default 1000)
Expand Down Expand Up @@ -367,7 +367,7 @@ function _infnorm_two_steps_ct(sys::AbstractStateSpace, normtype::Symbol, tol=1e
error("In _infnorm_two_steps_dt: The computation of the H∞/L∞ norm did not converge in $maxIters iterations")
end

function _infnorm_two_steps_dt(sys::AbstractStateSpace, normtype::Symbol, tol=1e-6, maxIters=250, approxcirc=1e-8)
function _infnorm_two_steps_dt(sys::AbstractStateSpace, normtype::Symbol; tol=1e-6, maxIters=250, approxcirc=1e-8)
# Discrete-time version of linfnorm_two_steps_ct above
# Compuations are done in normalized frequency θ

Expand Down