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

add analysis-point version of generate_control_function #348

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

add analysis-point version of generate_control_function #348

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
45 changes: 44 additions & 1 deletion src/Blocks/analysis_points.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,9 @@ function _check_and_sort!(ap_names, aps, namespaces, multiplicities)
if ind === nothing
@error "Could not find analysis point $apn"
happy = false
else
push!(permutation, ind)
end
push!(permutation, ind)
end
happy || error("Failed to find all analysis points. I found these: $(nameof.(aps))")
aps .= aps[permutation]
Expand Down Expand Up @@ -485,6 +486,48 @@ function ModelingToolkit.linearization_function(sys::ModelingToolkit.AbstractSys
ModelingToolkit.linearization_function(system_modifier(sys), un, yn; kwargs...)
end


function ModelingToolkit.generate_control_function(
sys::ModelingToolkit.AbstractODESystem, input_ap_name::SymOrVec, dist_ap_name::SymOrVec; system_modifier = identity,
kwargs...)

all_ap_names = [input_ap_name; dist_ap_name]
find = namespaced_ap_match(all_ap_names, [])
t = get_iv(sys)
aps = []
multiplicities = Int[]
namespaces = []
u = []
d = []
replace = function (ap, ns)
if namespaced_ap_match(ap, ns, input_ap_name, nothing)
push!(aps, ap)
push!(multiplicities, length(ap_var(ap.in))) # ap may be vector-valued
push!(namespaces, ns)
push!(u, ap_var(ap.out))
(0 ~ 0), nothing
elseif namespaced_ap_match(ap, ns, dist_ap_name, nothing)
push!(aps, ap)
push!(multiplicities, length(ap_var(ap.in))) # ap may be vector-valued
push!(namespaces, ns)
push!(d, ap_var(ap.out))
(0 ~ 0), nothing
else
error("This should not have happened")
end
end
sys = expand_connections(sys, find, replace)
permutation = _check_and_sort!(all_ap_names, aps, namespaces, multiplicities)
uinds = 1:length(u)
dinds = length(u) .+ (1:length(d))
un = ModelingToolkit.renamespace.(namespaces[uinds], u[permutation[uinds]])
dn = ModelingToolkit.renamespace.(namespaces[dinds], d[permutation[dinds] .- length(u)])
sys = system_modifier(sys)

ModelingToolkit.generate_control_function(sys, un, dn; kwargs...)
end


# Add a method to get_sensitivity that accepts the name of an AnalysisPoint
for f in [:get_sensitivity, :get_comp_sensitivity, :get_looptransfer, :open_loop]
@eval function $f(sys, ap::AnalysisPoint, args...; kwargs...)
Expand Down
Loading