refactor: simplify expression handling

Author: SebastianM-C

lib/OptimizationIpopt/src/cache.jl

@@ -115,49 +115,50 @@ function IpoptCache(prob, opt;
     lcons = prob.lcons === nothing ? fill(T(-Inf), num_cons) : prob.lcons
     ucons = prob.ucons === nothing ? fill(T(Inf), num_cons) : prob.ucons
 
-    if f.sys isa SymbolicIndexingInterface.SymbolCache{Nothing, Nothing, Nothing} && mtkize
-        try
-            sys = MTK.modelingtoolkitize(prob)
-        catch err
-            throw(ArgumentError("Automatic symbolic expression generation with ModelingToolkit failed with error: $err.
-            Try by setting `mtkize = false` instead if the solver doesn't require symbolic expressions."))
-        end
-        if !isnothing(prob.p) && !(prob.p isa SciMLBase.NullParameters)
-            unames = variable_symbols(sys)
-            pnames = parameter_symbols(sys)
-            us = [unames[i] => prob.u0[i] for i in 1:length(prob.u0)]
-            ps = [pnames[i] => prob.p[i] for i in 1:length(prob.p)]
-            sysprob = OptimizationProblem(sys, us, ps)
-        else
-            unames = variable_symbols(sys)
-            us = [unames[i] => prob.u0[i] for i in 1:length(prob.u0)]
-            sysprob = OptimizationProblem(sys, us)
-        end
+    # if f.sys isa SymbolicIndexingInterface.SymbolCache{Nothing, Nothing, Nothing} && mtkize
+    #     try
+    #         sys = MTK.modelingtoolkitize(prob)
+    #     catch err
+    #         throw(ArgumentError("Automatic symbolic expression generation with ModelingToolkit failed with error: $err.
+    #         Try by setting `mtkize = false` instead if the solver doesn't require symbolic expressions."))
+    #     end
+    #     if !isnothing(prob.p) && !(prob.p isa SciMLBase.NullParameters)
+    #         unames = variable_symbols(sys)
+    #         pnames = parameter_symbols(sys)
+    #         us = [unames[i] => prob.u0[i] for i in 1:length(prob.u0)]
+    #         ps = [pnames[i] => prob.p[i] for i in 1:length(prob.p)]
+    #         sysprob = OptimizationProblem(sys, us, ps)
+    #     else
+    #         unames = variable_symbols(sys)
+    #         us = [unames[i] => prob.u0[i] for i in 1:length(prob.u0)]
+    #         sysprob = OptimizationProblem(sys, us)
+    #     end
 
-        obj_expr = sysprob.f.expr
-        cons_expr = sysprob.f.cons_expr
-    else
+    #     obj_expr = sysprob.f.expr
+    #     cons_expr = sysprob.f.cons_expr
+    # else
         sys = f.sys isa SymbolicIndexingInterface.SymbolCache{Nothing, Nothing, Nothing} ?
               nothing : f.sys
         obj_expr = f.expr
         cons_expr = f.cons_expr
-    end
+    # end
 
-    if sys === nothing
+    # if sys === nothing
         expr = obj_expr
         _cons_expr = cons_expr
-    else
-        expr_map = get_expr_map(sys)
-        expr = convert_to_expr(obj_expr, expr_map; expand_expr = false)
-        expr = repl_getindex!(expr)
-        cons = MTK.constraints(sys)
-        _cons_expr = Vector{Expr}(undef, length(cons))
-        for i in eachindex(cons)
-            _cons_expr[i] = repl_getindex!(convert_to_expr(cons_expr[i],
-                expr_map;
-                expand_expr = false))
-        end
-    end
+    # else
+    #     error("Expressions are not supported")
+    #     expr_map = get_expr_map(sys)
+    #     expr = convert_to_expr(obj_expr, expr_map; expand_expr = false)
+    #     expr = repl_getindex!(expr)
+    #     cons = MTK.constraints(sys)
+    #     _cons_expr = Vector{Expr}(undef, length(cons))
+    #     for i in eachindex(cons)
+    #         _cons_expr[i] = repl_getindex!(convert_to_expr(cons_expr[i],
+    #             expr_map;
+    #             expand_expr = false))
+    #     end
+    # end
     solver_args = NamedTuple(kwargs)
 
     return IpoptCache(

lib/OptimizationIpopt/test/runtests.jl

@@ -65,12 +65,12 @@ end
     end
 end
 
-@testset "cache" begin
+@testset "MTK cache" begin
     @variables x
     @parameters a = 1.0
     @named sys = OptimizationSystem((x - a)^2, [x], [a];)
     sys = complete(sys)
-    prob = OptimizationProblem(sys, [x => 0.0], []; grad = true, hess = true)
+    prob = OptimizationProblem(sys, [x => 0.0]; grad = true, hess = true)
     cache = init(prob, IpoptOptimizer(); print_level = 0)
     @test cache isa OptimizationIpopt.IpoptCache
     sol = solve!(cache)