Handle constraint bounds and some fixes

ext/OptimizationMTKExt.jl

@@ -48,6 +48,7 @@ function Optimization.instantiate_function(f, x, adtype::AutoModelingToolkit, p,
         cons_hess_prototype = f.cons_hess_prototype,
         expr = Optimization.symbolify(f.expr),
         cons_expr = Optimization.symbolify.(f.cons_expr),
+        sys = sys,
         observed = f.observed)
 end
 
@@ -93,6 +94,7 @@ function Optimization.instantiate_function(f, cache::Optimization.ReInitCache,
         cons_hess_prototype = f.cons_hess_prototype,
         expr = Optimization.symbolify(f.expr),
         cons_expr = Optimization.symbolify.(f.cons_expr),
+        sys = sys,
         observed = f.observed)
 end
 

lib/OptimizationMOI/src/nlp.jl

@@ -167,17 +167,26 @@ function MOIOptimizationNLPCache(prob::OptimizationProblem,
         cons_expr = f.cons_expr
     end
 
-    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))
+    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)
+        @show cons
+        _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
 
+    @show expr
+    @show _cons_expr
+
     evaluator = MOIOptimizationNLPEvaluator(f,
         reinit_cache,
         prob.lb,
@@ -393,11 +402,24 @@ end
 function MOI.constraint_expr(evaluator::MOIOptimizationNLPEvaluator, i)
     # expr has the form f(x,p) == 0 or f(x,p) <= 0 
     cons_expr = deepcopy(evaluator.cons_expr[i].args[2])
-    compop = Symbol(evaluator.cons_expr[i].args[1])
     repl_getindex!(cons_expr)
     _replace_parameter_indices!(cons_expr, evaluator.p)
     _replace_variable_indices!(cons_expr)
-    return Expr(:call, compop, cons_expr, 0.0)
+    lb, ub = Float64(evaluator.lcons[i]), Float64(evaluator.ucons[i])
+    @show lb
+    @show ub
+    @show cons_expr
+    if lb == ub
+        return Expr(:call, :(==), cons_expr, lb)
+    else
+        if lb == -Inf
+            return Expr(:call, :(<=), cons_expr, ub)
+        elseif ub == Inf
+            return Expr(:call, :(>=), cons_expr, lb)
+        else
+            return Expr(:call, :between, cons_expr, lb, ub)
+        end
+    end
 end
 
 function _add_moi_variables!(opt_setup, evaluator::MOIOptimizationNLPEvaluator)