Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions src/Utilities/functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1072,9 +1072,17 @@ function canonicalize!(
end

function canonicalize!(f::MOI.ScalarNonlinearFunction)
for (i, arg) in enumerate(f.args)
if !is_canonical(arg)
f.args[i] = canonicalize!(arg)
# Don't use recursion here. This gets called for all scalar nonlinear
# constraints.
stack = MOI.ScalarNonlinearFunction[f]
while !isempty(stack)
g = pop!(stack)
for (i, arg) in enumerate(g.args)
if arg isa MOI.ScalarNonlinearFunction
push!(stack, arg)
elseif !is_canonical(arg)
g.args[i] = canonicalize!(arg)
end
end
end
return f
Expand Down
13 changes: 13 additions & 0 deletions test/Utilities/test_functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2044,6 +2044,19 @@ function test_ScalarNonlinearFunction_is_canonical()
f = MOI.ScalarNonlinearFunction(:sin, Any[f])
end
@test MOI.Utilities.is_canonical(f)
@test MOI.Utilities.canonicalize!(f) isa MOI.ScalarNonlinearFunction
g = MOI.ScalarNonlinearFunction(:^, Any[1.0 * x + 1.0 * x, 2])
for _ in 1:100_000
g = MOI.ScalarNonlinearFunction(:sin, Any[g])
end
@test !MOI.Utilities.is_canonical(g)
MOI.Utilities.canonicalize!(g)
h = MOI.ScalarNonlinearFunction(:^, Any[2.0 * x, 2])
for _ in 1:100_000
h = MOI.ScalarNonlinearFunction(:sin, Any[h])
end
@test MOI.Utilities.is_canonical(h)
@test isapprox(g, h)
return
end

Expand Down
Loading