Fix systems keyword argument handling in System

Author: YingboMa

src/systems/abstractsystem.jl

@@ -505,7 +505,7 @@ function namespace_expr(O, sys, n = nameof(sys))
             # metadata from the rescoped variable
             rescoped = renamespace(n, O)
             similarterm(O, operation(rescoped), renamed,
-                        metadata = metadata(rescoped))::T
+                metadata = metadata(rescoped))::T
         else
             similarterm(O, operation(O), renamed, metadata = metadata(O))::T
         end

src/systems/systems.jl

@@ -1,6 +1,6 @@
 function System(eqs::AbstractVector{<:Equation}, iv = nothing, args...; name = nothing,
     kw...)
-    ODESystem(eqs, iv, args...; name, checks = false)
+    ODESystem(eqs, iv, args...; name, kw..., checks = false)
 end
 
 """

test/dde.jl

@@ -83,26 +83,30 @@ sys = structural_simplify(sys)
 prob_mtk = SDDEProblem(sys, [x(t) => 1.0 + t], tspan; constant_lags = (τ,));
 @test_nowarn sol_mtk = solve(prob_mtk, RKMil())
 
-
 @variables t
 D = Differential(t)
 @parameters x(..) a
 
-function oscillator(;name, k=1.0, τ=0.01)
+function oscillator(; name, k = 1.0, τ = 0.01)
     @parameters k=k τ=τ
     @variables x(..)=0.1 y(t)=0.1 jcn(t)=0.0 delx(t)
     eqs = [D(x(t)) ~ y,
-           D(y) ~ -k*x(t-τ)+jcn,
-           delx ~ x(t-τ)]
-    return System(eqs; name=name)
+        D(y) ~ -k * x(t - τ) + jcn,
+        delx ~ x(t - τ)]
+    return System(eqs; name = name)
 end
 
-@named osc1 = oscillator(k=1.0, τ=0.01)
-@named osc2 = oscillator(k=2.0, τ=0.04)
+systems = @named begin
+    osc1 = oscillator(k = 1.0, τ = 0.01)
+    osc2 = oscillator(k = 2.0, τ = 0.04)
+end
 eqs = [osc1.jcn ~ osc2.delx,
-       osc2.jcn ~ osc1.delx]
+    osc2.jcn ~ osc1.delx]
 @named coupledOsc = System(eqs, t)
-@named coupledOsc = compose(coupledOsc, [osc1, osc2])
-sys = structural_simplify(coupledOsc)
-@test length(equations(sys)) == 4
-@test length(states(sys)) == 4
+@named coupledOsc = compose(coupledOsc, systems)
+@named coupledOsc2 = System(eqs, t; systems)
+for coupledOsc in [coupledOsc, coupledOsc2]
+    local sys = structural_simplify(coupledOsc)
+    @test length(equations(sys)) == 4
+    @test length(states(sys)) == 4
+end

test/optimizationsystem.jl

@@ -207,18 +207,20 @@ end
     prob = OptimizationProblem(combinedsys, u0, p, grad = true, hess = true, cons_j = true,
         cons_h = true)
     @test prob.f.sys === combinedsys
-    @test_broken SciMLBase.successful_retcode(solve(prob, Ipopt.Optimizer(); print_level = 0))
-   #=
-    @test sol.minimum < -1e5
-
-    prob = OptimizationProblem(sys2, [x => 0.0, y => 0.0], [a => 1.0, b => 100.0],
-        grad = true, hess = true, cons_j = true, cons_h = true)
-    @test prob.f.sys === sys2
-    sol = solve(prob, IPNewton())
-    @test sol.minimum < 1.0
-    sol = solve(prob, Ipopt.Optimizer(); print_level = 0)
-    @test sol.minimum < 1.0
-    =#
+    @test_broken SciMLBase.successful_retcode(solve(prob,
+        Ipopt.Optimizer();
+        print_level = 0))
+    #=
+     @test sol.minimum < -1e5
+
+     prob = OptimizationProblem(sys2, [x => 0.0, y => 0.0], [a => 1.0, b => 100.0],
+         grad = true, hess = true, cons_j = true, cons_h = true)
+     @test prob.f.sys === sys2
+     sol = solve(prob, IPNewton())
+     @test sol.minimum < 1.0
+     sol = solve(prob, Ipopt.Optimizer(); print_level = 0)
+     @test sol.minimum < 1.0
+     =#
 end
 
 @testset "metadata" begin