fix and cover more problems; needs corresponding remake in SciMLBase

Author: ValentinKaisermayer

src/variables.jl

@@ -125,7 +125,9 @@ $(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::Union{ODEProblem, OptimizationProblem}, p,
+function SciMLBase.process_p_u0_symbolic(prob::Union{SciMLBase.AbstractDEProblem,
+                                                     NonlinearProblem, OptimizationProblem},
+                                         p,
                                          u0)
     # check if a symbolic remake is possible
     if eltype(p) <: Pair

test/nonlinearsystem.jl

@@ -189,8 +189,7 @@ eq = [v1 ~ sin(2pi * t * h)
 @named sys = ODESystem(eq)
 @test length(equations(structural_simplify(sys))) == 0
 
-#1504
-let
+@testset "Issue: 1504" begin
     @variables u[1:4]
 
     eqs = [u[1] ~ 1,
@@ -213,3 +212,23 @@ eqs = [0 ~ a * x]
 testdict = Dict([:test => 1])
 @named sys = NonlinearSystem(eqs, [x], [a], metadata = testdict)
 @test get_metadata(sys) == testdict
+
+@testset "Remake" begin
+    @parameters a=1.0 b=1.0 c=1.0
+    @constants h = 1
+    @variables x y z
+
+    eqs = [0 ~ a * (y - x) * h,
+        0 ~ x * (b - z) - y,
+        0 ~ x * y - c * z]
+    @named sys = NonlinearSystem(eqs, [x, y, z], [a, b, c], defaults = Dict(x => 2.0))
+    prob = NonlinearProblem(sys, ones(length(states(sys))))
+
+    prob_ = remake(prob, u0 = [1.0, 2.0, 3.0], p = [1.1, 1.2, 1.3])
+    @test prob_.u0 == [1.0, 2.0, 3.0]
+    @test prob_.p == [1.1, 1.2, 1.3]
+
+    prob_ = remake(prob, u0 = Dict(sys.y => 2.0), p = Dict(sys.a => 2.0))
+    @test_broken prob_.u0 == [1.0, 2.0, 1.0] # TODO: needs a `remake(prob::NonlinearProblem, ...)` in SciMLBase
+    @test_broken prob_.p == [2.0, 1.0, 1.0]
+end

test/optimizationsystem.jl

@@ -152,7 +152,7 @@ end
                              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(equations(sys), (sys1.x - sys1.a)^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])