refactor: use SciMLStructures

Author: AayushSabharwal

lib/OptimizationMOI/Project.toml

@@ -9,6 +9,7 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
+SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
@@ -17,9 +18,10 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 Ipopt_jll = "=300.1400.400"
 Juniper = "0.9"
 MathOptInterface = "1"
-ModelingToolkit = "9"
+ModelingToolkit = "8.76, 9"
 Optimization = "3.21"
 Reexport = "1.2"
+SciMLStructures = "1.0"
 SymbolicIndexingInterface = "0.3"
 Symbolics = "5"
 julia = "1"

lib/OptimizationMOI/src/OptimizationMOI.jl

@@ -4,6 +4,7 @@ using Reexport
 @reexport using Optimization
 using MathOptInterface
 using Optimization.SciMLBase
+using SciMLStructures
 using SymbolicIndexingInterface
 using SparseArrays
 import ModelingToolkit: parameters, unknowns, varmap_to_vars, mergedefaults, toexpr
@@ -234,7 +235,8 @@ Replaces every expression `:p[i]` with its numeric value from `p`
 _replace_parameter_indices!(expr, p) = expr
 function _replace_parameter_indices!(expr::Expr, p)
     if expr.head == :ref && expr.args[1] == :p
-        p_ = p[expr.args[2]]
+        tunable, _, _ = SciMLStructures.canonicalize(SciMLStructures.Tunable(), p)
+        p_ = tunable[expr.args[2]]
         (!isa(p_, Real) || isnan(p_) || isinf(p_)) &&
             throw(ArgumentError("Expected parameters to be real valued: $(expr.args[2]) => $p_"))
         return p_