enable remake for optimization problems

Author: ValentinKaisermayer

src/variables.jl

@@ -119,19 +119,14 @@ end
     throw(ArgumentError("$vars are missing from the variable map."))
 end
 
-# FIXME: remove after: https://github.com/SciML/SciMLBase.jl/pull/311
-function SciMLBase.handle_varmap(varmap, sys::AbstractSystem; field = :states, kwargs...)
-    out = varmap_to_vars(varmap, getfield(sys, field); kwargs...)
-    return out
-end
-
 """
 $(SIGNATURES)
 
 Intercept the call to `process_p_u0_symbolic` and process symbolic maps of `p` and/or `u0` if the 
 user has `ModelingToolkit` loaded.
 """
-function SciMLBase.process_p_u0_symbolic(prob::ODEProblem, p, u0)
+function SciMLBase.process_p_u0_symbolic(prob::Union{ODEProblem, OptimizationProblem}, p,
+                                         u0)
     # check if a symbolic remake is possible
     if eltype(p) <: Pair
         hasproperty(prob.f, :sys) && hasfield(typeof(prob.f.sys), :ps) ||

test/odesystem.jl

@@ -277,8 +277,8 @@ sol_dpmap = solve(prob_dpmap, Rodas5())
     prob = ODEProblem(sys, Pair[])
     prob_new = SciMLBase.remake(prob, p = Dict(sys1.a => 3.0, b => 4.0),
                                 u0 = Dict(sys1.x => 1.0))
-    @test_broken prob_new.p == [4.0, 3.0, 1.0]
-    @test_broken prob_new.u0 == [1.0, 0.0]
+    @test prob_new.p == [4.0, 3.0, 1.0]
+    @test prob_new.u0 == [1.0, 0.0]
 end
 
 # test kwargs

test/optimizationsystem.jl

@@ -137,23 +137,31 @@ end
 # nested constraints
 @testset "nested systems" begin
     @variables x y
-    o1 = (x - 1)^2
+    @parameters a=1
+    o1 = (x - a)^2
     o2 = (y - 1 / 2)^2
     c1 = [
         x ~ 1,
     ]
     c2 = [
         y ~ 1,
     ]
-    sys1 = OptimizationSystem(o1, [x], [], name = :sys1, constraints = c1)
+    sys1 = OptimizationSystem(o1, [x], [a], name = :sys1, constraints = c1)
     sys2 = OptimizationSystem(o2, [y], [], name = :sys2, constraints = c2)
     sys = OptimizationSystem(0, [], []; name = :sys, systems = [sys1, sys2],
                              constraints = [sys1.x + sys2.y ~ 2], checks = false)
     prob = OptimizationProblem(sys, [0.0, 0.0])
-
     @test isequal(constraints(sys), vcat(sys1.x + sys2.y ~ 2, sys1.x ~ 1, sys2.y ~ 1))
     @test isequal(equations(sys), (sys1.x - 1)^2 + (sys2.y - 1 / 2)^2)
     @test isequal(states(sys), [sys1.x, sys2.y])
+
+    prob_ = remake(prob, u0=[1.0, 0.0], p=[2.0])
+    @test isequal(prob_.u0, [1.0, 0.0])
+    @test isequal(prob_.p, [2.0])
+
+    prob_ = remake(prob, u0=Dict(sys1.x => 1.0), p=Dict(sys1.a => 2.0))
+    @test isequal(prob_.u0, [1.0, 0.0])
+    @test isequal(prob_.p, [2.0])
 end
 
 @testset "time dependent var" begin