Skip to content

Add function for register_nlsystem that doesn't require inequalities #15

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

Merged
DimitriAlston merged 1 commit into from
Jun 22, 2026
Merged

Add function for register_nlsystem that doesn't require inequalities #15

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/basefuncs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# systems.
################################################################################

function mtk_generate_model_equations(sys::ModelingToolkit.System)
function _generate_model_equations(sys::ModelingToolkit.System)
param_dict = copy(ModelingToolkit.initial_conditions(sys))
h = []
for i in eachindex(ModelingToolkit.unknowns(sys))
Expand All @@ -30,7 +30,7 @@ function mtk_generate_model_equations(sys::ModelingToolkit.System)
return h
end

function mtk_generate_reduced_expression(expr::Symbolics.Num, sys::ModelingToolkit.System)
function _generate_reduced_expression(expr::Symbolics.Num, sys::ModelingToolkit.System)
sub_dict = ModelingToolkit.initial_conditions(sys)
for eqn in ModelingToolkit.observed(sys)
sub_dict[eqn.lhs] = eqn.rhs
Expand Down
22 changes: 18 additions & 4 deletions src/userfuncs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ function and `Vector{Symbolics.Num}` constraints from a `ModelingToolkit.System`
to a `JuMP.Model`.
"""
function register_nlsystem(model::JuMP.Model, sys::ModelingToolkit.System, obj::Symbolics.Num, ineqs::Vector{Symbolics.Num})
h = EOptInterface.mtk_generate_model_equations(sys)
f = EOptInterface.mtk_generate_reduced_expression(obj, sys)
h = EOptInterface._generate_model_equations(sys)
f = EOptInterface._generate_reduced_expression(obj, sys)
g = []
for i in eachindex(ineqs)
gi = EOptInterface.mtk_generate_reduced_expression(ineqs[i], sys)
gi = EOptInterface._generate_reduced_expression(ineqs[i], sys)
push!(g, gi)
end
JuMP.@constraint(model, [i in eachindex(h)], h[i](JuMP.all_variables(model)...) == 0)
Expand All @@ -46,12 +46,26 @@ function register_nlsystem(model::JuMP.Model, sys::ModelingToolkit.System, obj::
return
end

"""
$(DocStringExtensions.TYPEDSIGNATURES)

Automatically formulates and adds a user-provided `Symbolics.Num` objective
function from a `ModelingToolkit.System` to a `JuMP.Model`.
"""
function register_nlsystem(model::JuMP.Model, sys::ModelingToolkit.System, obj::Symbolics.Num)
h = EOptInterface._generate_model_equations(sys)
f = EOptInterface._generate_reduced_expression(obj, sys)
JuMP.@constraint(model, [i in eachindex(h)], h[i](JuMP.all_variables(model)...) == 0)
JuMP.@objective(model, Min, f(JuMP.all_variables(model)...))
return
end

"""
$(DocStringExtensions.TYPEDSIGNATURES)

Automatically applies specified direct transcription method and registers the
discretized ODE `ModelingToolkit.System` as algebraic JuMP constraints.
Current supports Explicit Euler "EE" and Implicit Euler "IE".
Currently supports Explicit Euler "EE" and Implicit Euler "IE".
"""
function register_odesystem(model::JuMP.Model, sys::ModelingToolkit.System, tspan::Tuple{Real,Real}, tstep::Real, integrator::String)
if integrator != "EE" && integrator != "IE"
Expand Down
4 changes: 4 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@ using Test
@test JuMP.primal_status(model) == JuMP.FEASIBLE_POINT
@test isapprox(JuMP.objective_value(model), 169869.99931631665, atol=1e-3)

model = JuMP.Model(Ipopt.Optimizer)
JuMP.@variable(model, xL[i] <= x[i=1:6] <= xU[i])
EOptInterface.register_nlsystem(model, system, obj)

end

@testset "ODE Model" begin
Expand Down
Loading