fix

Author: ValentinKaisermayer

src/systems/optimization/constraints_system.jl

@@ -178,7 +178,10 @@ end
 function generate_function(sys::ConstraintsSystem, dvs = states(sys), ps = parameters(sys);
                            kwargs...)
     lhss = generate_canonical_form_lhss(sys)
-    func = build_function(lhss, value.(dvs), value.(ps))
+    pre, sol_states = get_substitutions_and_solved_states(sys)
+
+    func = build_function(lhss, value.(dvs), value.(ps); postprocess_fbody = pre,
+                          states = sol_states, kwargs...)
 
     cstr = constraints(sys)
     lcons = fill(-Inf, length(cstr))
@@ -206,3 +209,14 @@ g(x) <= 0
 function generate_canonical_form_lhss(sys)
     lhss = subs_constants([Symbolics.canonical_form(eq).lhs for eq in constraints(sys)])
 end
+
+function get_cmap(sys::ConstraintsSystem)
+    #Inject substitutions for constants => values
+    cs = collect_constants([get_constraints(sys); get_observed(sys)]) #ctrls? what else?
+    if !empty_substitutions(sys)
+        cs = [cs; collect_constants(get_substitutions(sys).subs)]
+    end
+    # Swap constants for their values
+    cmap = map(x -> x ~ getdefault(x), cs)
+    return cmap, cs
+end

src/systems/optimization/optimizationsystem.jl

@@ -245,10 +245,8 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
     lb = varmap_to_vars(dvs .=> lb, dvs; defaults = defs, tofloat = false, use_union)
     ub = varmap_to_vars(dvs .=> ub, dvs; defaults = defs, tofloat = false, use_union)
 
-    if !isnothing(lb) && all(lb .== -Inf)
+    if !isnothing(lb) && all(lb .== -Inf) && !isnothing(ub) && all(ub .== Inf)
         lb = nothing
-    end
-    if !isnothing(ub) && all(ub .== Inf)
         ub = nothing
     end
 
@@ -301,16 +299,18 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
         cons_expr = toexpr.(subs_constants(constraints(cons_sys)))
         rep_pars_vals!.(cons_expr, Ref(pairs_arr))
 
-        if isnothing(lcons) && isnothing(ucons) # use the symbolically specified bounds
+        if !haskey(kwargs, :lcons) && !haskey(kwargs, :ucons) # use the symbolically specified bounds
             lcons = lcons_
             ucons = ucons_
         else # use the user supplied constraints bounds
-            xor(isnothing(lcons), isnothing(lcons)) &&
-                throw(ArgumentError("Expected both `lcons` and `lcons` to be supplied"))
-            !isnothing(lcons) && length(lcons) != length(cstr) &&
+            haskey(kwargs, :lcons) && haskey(kwargs, :ucons) &&
+                throw(ArgumentError("Expected both `ucons` and `lcons` to be supplied"))
+            haskey(kwargs, :lcons) && length(kwargs[:lcons]) != length(cstr) &&
                 throw(ArgumentError("Expected `lcons` to be of the same length as the vector of constraints"))
-            !isnothing(ucons) && length(ucons) != length(cstr) &&
+            haskey(kwargs, :ucons) && length(kwargs[:ucons]) != length(cstr) &&
                 throw(ArgumentError("Expected `ucons` to be of the same length as the vector of constraints"))
+            lcons = haskey(kwargs, :lcons)
+            ucons = haskey(kwargs, :ucons)
         end
 
         if sparse
@@ -417,10 +417,8 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0,
     lb = varmap_to_vars(dvs .=> lb, dvs; defaults = defs, tofloat = false, use_union)
     ub = varmap_to_vars(dvs .=> ub, dvs; defaults = defs, tofloat = false, use_union)
 
-    if !isnothing(lb) && all(lb .== -Inf)
+    if !isnothing(lb) && all(lb .== -Inf) && !isnothing(ub) && all(ub .== Inf)
         lb = nothing
-    end
-    if !isnothing(ub) && all(ub .== Inf)
         ub = nothing
     end
 
@@ -468,16 +466,18 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0,
         cons_expr = toexpr.(subs_constants(constraints(cons_sys)))
         rep_pars_vals!.(cons_expr, Ref(pairs_arr))
 
-        if isnothing(lcons) && isnothing(ucons) # use the symbolically specified bounds
+        if !haskey(kwargs, :lcons) && !haskey(kwargs, :ucons) # use the symbolically specified bounds
             lcons = lcons_
             ucons = ucons_
         else # use the user supplied constraints bounds
-            xor(isnothing(lcons), isnothing(lcons)) &&
-                throw(ArgumentError("Expected both `lcons` and `lcons` to be supplied"))
-            !isnothing(lcons) && length(lcons) != length(cstr) &&
+            haskey(kwargs, :lcons) && haskey(kwargs, :ucons) &&
+                throw(ArgumentError("Expected both `ucons` and `lcons` to be supplied"))
+            haskey(kwargs, :lcons) && length(kwargs[:lcons]) != length(cstr) &&
                 throw(ArgumentError("Expected `lcons` to be of the same length as the vector of constraints"))
-            !isnothing(ucons) && length(ucons) != length(cstr) &&
+            haskey(kwargs, :ucons) && length(kwargs[:ucons]) != length(cstr) &&
                 throw(ArgumentError("Expected `ucons` to be of the same length as the vector of constraints"))
+            lcons = haskey(kwargs, :lcons)
+            ucons = haskey(kwargs, :ucons)
         end
 
         if sparse

src/utils.jl

@@ -597,15 +597,19 @@ function empty_substitutions(sys)
     isnothing(subs) || isempty(subs.deps)
 end
 
-function get_substitutions_and_solved_states(sys; no_postprocess = false)
+function get_cmap(sys)
     #Inject substitutions for constants => values
     cs = collect_constants([get_eqs(sys); get_observed(sys)]) #ctrls? what else?
     if !empty_substitutions(sys)
         cs = [cs; collect_constants(get_substitutions(sys).subs)]
     end
     # Swap constants for their values
     cmap = map(x -> x ~ getdefault(x), cs)
+    return cmap, cs
+end
 
+function get_substitutions_and_solved_states(sys; no_postprocess = false)
+    cmap, cs = get_cmap(sys)
     if empty_substitutions(sys) && isempty(cs)
         sol_states = Code.LazyState()
         pre = no_postprocess ? (ex -> ex) : get_postprocess_fbody(sys)