Skip to content

fix: fix incorrect folding in substitute in OptimizationSystem #3475

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
merged 1 commit into from
Mar 26, 2025
Merged

fix: fix incorrect folding in substitute in OptimizationSystem #3475

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
6 changes: 3 additions & 3 deletions src/systems/optimization/optimizationsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ function OptimizationSystem(op, unknowns, ps;
unknowns′[i] = irrvar
end
end
op′ = substitute(op′, irreducible_subs)
constraints = substitute.(constraints, (irreducible_subs,))
op′ = fast_substitute(op′, irreducible_subs)
constraints = fast_substitute.(constraints, (irreducible_subs,))

if !(isempty(default_u0) && isempty(default_p))
Base.depwarn(
Expand All @@ -127,7 +127,7 @@ function OptimizationSystem(op, unknowns, ps;
throw(ArgumentError("System names must be unique."))
end
defaults = todict(defaults)
defaults = Dict(substitute(value(k), irreducible_subs) => substitute(
defaults = Dict(fast_substitute(value(k), irreducible_subs) => fast_substitute(
value(v), irreducible_subs)
for (k, v) in pairs(defaults) if value(v) !== nothing)

Expand Down
23 changes: 22 additions & 1 deletion test/optimizationsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using ModelingToolkit, SparseArrays, Test, Optimization, OptimizationOptimJL,
OptimizationMOI, Ipopt, AmplNLWriter, Ipopt_jll, SymbolicIndexingInterface
OptimizationMOI, Ipopt, AmplNLWriter, Ipopt_jll, SymbolicIndexingInterface,
LinearAlgebra
using ModelingToolkit: get_metadata

@testset "basic" begin
Expand Down Expand Up @@ -388,3 +389,23 @@ end
@test all(y -> any(x -> isequal(x, y), unknowns(sys2)), [x2, sys1.x1])
@test all(y -> any(x -> isequal(x, y), parameters(sys2)), [p2, sys1.p1])
end

function myeigvals_1(A::AbstractMatrix)
eigvals(A)[1]
end

@register_symbolic myeigvals_1(A::AbstractMatrix)

@testset "Issue#3473: Registered array function in objective, no irreducible variables" begin
p_free = @variables begin
p1, [bounds = (0, 1)]
p2, [bounds = (0, 1)]
p3, [bounds = (0, 1)]
p4, [bounds = (0, 1)]
end

m = diagm(p_free)

obj = myeigvals_1(m)
@test_nowarn OptimizationSystem(obj, p_free, []; name = :osys)
end
Loading