From dedbf6ba89b9e30018dc32761a1075b30bfcbd90 Mon Sep 17 00:00:00 2001
From: Aayush Sabharwal <aayush.sabharwal@gmail.com>
Date: Tue, 22 Oct 2024 19:17:11 +0530
Subject: [PATCH] fix: mark bounded optimization unknowns as irreducible

---
 src/systems/optimization/optimizationsystem.jl | 13 ++++++++++++-
 src/variables.jl                               |  1 +
 test/optimizationsystem.jl                     | 16 +++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/systems/optimization/optimizationsystem.jl b/src/systems/optimization/optimizationsystem.jl
index 22488e8bad..4a65e8cce9 100644
--- a/src/systems/optimization/optimizationsystem.jl
+++ b/src/systems/optimization/optimizationsystem.jl
@@ -103,6 +103,17 @@ function OptimizationSystem(op, unknowns, ps;
     ps′ = value.(ps)
     op′ = value(scalarize(op))
 
+    irreducible_subs = Dict()
+    for i in eachindex(unknowns′)
+        var = unknowns′[i]
+        if hasbounds(var)
+            irreducible_subs[var] = irrvar = setirreducible(var, true)
+            unknowns′[i] = irrvar
+        end
+    end
+    op′ = substitute(op′, irreducible_subs)
+    constraints = substitute.(constraints, (irreducible_subs,))
+
     if !(isempty(default_u0) && isempty(default_p))
         Base.depwarn(
             "`default_u0` and `default_p` are deprecated. Use `defaults` instead.",
@@ -113,7 +124,7 @@ function OptimizationSystem(op, unknowns, ps;
         throw(ArgumentError("System names must be unique."))
     end
     defaults = todict(defaults)
-    defaults = Dict(value(k) => value(v)
+    defaults = Dict(substitute(value(k), irreducible_subs) => substitute(value(v), irreducible_subs)
     for (k, v) in pairs(defaults) if value(v) !== nothing)
 
     var_to_name = Dict()
diff --git a/src/variables.jl b/src/variables.jl
index c0c875450c..fcfc7f9b1e 100644
--- a/src/variables.jl
+++ b/src/variables.jl
@@ -106,6 +106,7 @@ isoutput(x) = isvarkind(VariableOutput, x)
 # Before the solvability check, we already have handled IO variables, so
 # irreducibility is independent from IO.
 isirreducible(x) = isvarkind(VariableIrreducible, x)
+setirreducible(x, v) = setmetadata(x, VariableIrreducible, v)
 state_priority(x) = convert(Float64, getmetadata(x, VariableStatePriority, 0.0))::Float64
 
 function default_toterm(x)
diff --git a/test/optimizationsystem.jl b/test/optimizationsystem.jl
index 426d6d5de0..be68485647 100644
--- a/test/optimizationsystem.jl
+++ b/test/optimizationsystem.jl
@@ -1,5 +1,5 @@
 using ModelingToolkit, SparseArrays, Test, Optimization, OptimizationOptimJL,
-      OptimizationMOI, Ipopt, AmplNLWriter, Ipopt_jll
+      OptimizationMOI, Ipopt, AmplNLWriter, Ipopt_jll, SymbolicIndexingInterface
 using ModelingToolkit: get_metadata
 
 @testset "basic" begin
@@ -347,3 +347,17 @@ end
     prob = @test_nowarn OptimizationProblem(sys, nothing)
     @test_nowarn solve(prob, NelderMead())
 end
+
+@testset "Bounded unknowns are irreducible" begin
+    @variables x
+    @variables y [bounds = (-Inf, Inf)]
+    @variables z [bounds = (1.0, 2.0)]
+    obj = x^2 + y^2 + z^2
+    cons = [
+        y ~ 2x
+        z ~ 2y
+    ]
+    @mtkbuild sys = OptimizationSystem(obj, [x, y, z], []; constraints = cons)
+    @test is_variable(sys, z)
+    @test !is_variable(sys, y)
+end