Fix defaults functions

Author: YingboMa

docs/src/tutorials/tearing_parallelism.md

@@ -59,12 +59,12 @@ function ConstantVoltage(;name, V = 1.0)
            V ~ p.v - n.v
            0 ~ p.i + n.i
           ]
-    ODESystem(eqs, t, [], [V], systems=[p, n], default=Dict(V => val), name=name)
+    ODESystem(eqs, t, [], [V], systems=[p, n], defaults=Dict(V => val), name=name)
 end
 
 function HeatPort(;name)
     @variables T(t) Q_flow(t)
-    return ODESystem(Equation[], t, [T, Q_flow], [], default=Dict(T=>293.15, Q_flow=>0.0), name=name)
+    return ODESystem(Equation[], t, [T, Q_flow], [], defaults=Dict(T=>293.15, Q_flow=>0.0), name=name)
 end
 
 function HeatingResistor(;name, R=1.0, TAmbient=293.15, alpha=1.0)
@@ -101,7 +101,7 @@ function HeatCapacitor(;name, rho=8050, V=1, cp=460, TAmbient=293.15)
           ]
     ODESystem(
         eqs, t, [], [rho, V, cp], systems=[h],
-        default=Dict(rho=>rho_val, V=>V_val, cp=>cp_val),
+        defaults=Dict(rho=>rho_val, V=>V_val, cp=>cp_val),
         name=name,
     )
 end
@@ -160,7 +160,7 @@ end
 eqs = [
        D(E) ~ sum(((i, sys),)->getproperty(sys, Symbol(:resistor, i)).h.Q_flow, enumerate(rc_systems))
       ]
-big_rc = ODESystem(eqs, t, [], [], systems=rc_systems, default=Dict(E=>0.0))
+big_rc = ODESystem(eqs, t, [], [], systems=rc_systems, defaults=Dict(E=>0.0))
 ```
 
 Now let's say we want to expose a bit more parallelism via running tearing.

src/systems/abstractsystem.jl

@@ -284,8 +284,8 @@ namespace_variables(sys::AbstractSystem) = states(sys, states(sys))
 namespace_parameters(sys::AbstractSystem) = parameters(sys, parameters(sys))
 
 function namespace_defaults(sys)
-    d_u0 = defaults(sys)
-    Dict(states(sys, k) => namespace_expr(d_u0[k], nameof(sys), independent_variable(sys)) for k in keys(d_u0))
+    defs = defaults(sys)
+    Dict((isparameter(k) ? parameters(sys, k) : states(sys, k)) => namespace_expr(defs[k], nameof(sys), independent_variable(sys)) for k in keys(defs))
 end
 
 function namespace_equations(sys::AbstractSystem)
@@ -344,8 +344,8 @@ end
 
 function defaults(sys::AbstractSystem)
     systems = get_systems(sys)
-    d_u0 = get_defaults(sys)
-    isempty(systems) ? d_u0 : mapreduce(namespace_defaults, merge, systems; init=d_u0)
+    defs = get_defaults(sys)
+    isempty(systems) ? defs : mapreduce(namespace_defaults, merge, systems; init=defs)
 end
 
 states(sys::AbstractSystem, v) = renamespace(nameof(sys), v)
@@ -405,13 +405,13 @@ function Base.show(io::IO, sys::AbstractSystem)
     Base.printstyled(io, "States ($nvars):"; bold=true)
     nrows = min(nvars, limit ? rows : nvars)
     limited = nrows < length(vars)
-    d_u0 = has_defaults(sys) ? defaults(sys) : nothing
+    defs = has_defaults(sys) ? defaults(sys) : nothing
     for i in 1:nrows
         s = vars[i]
         print(io, "\n  ", s)
 
-        if d_u0 !== nothing
-            val = get(d_u0, s, nothing)
+        if defs !== nothing
+            val = get(defs, s, nothing)
             if val !== nothing
                 print(io, " [defaults to $val]")
             end
@@ -428,8 +428,8 @@ function Base.show(io::IO, sys::AbstractSystem)
         s = vars[i]
         print(io, "\n  ", s)
 
-        if d_u0 !== nothing
-            val = get(d_u0, s, nothing)
+        if defs !== nothing
+            val = get(defs, s, nothing)
             if val !== nothing
                 print(io, " [defaults to $val]")
             end

test/components.jl

@@ -5,7 +5,7 @@ using ModelingToolkit, OrdinaryDiffEq
 const t = Sym{ModelingToolkit.Parameter{Real}}(:t)
 function Pin(;name)
     @variables v(t) i(t)
-    ODESystem(Equation[], t, [v, i], [], name=name, default=[v=>1.0, i=>1.0])
+    ODESystem(Equation[], t, [v, i], [], name=name, defaults=[v=>1.0, i=>1.0])
 end
 
 function Ground(name)
@@ -23,7 +23,7 @@ function ConstantVoltage(name; V = 1.0)
            V ~ p.v - n.v
            0 ~ p.i + n.i
           ]
-    ODESystem(eqs, t, [], [V], systems=[p, n], default=Dict(V => val), name=name)
+    ODESystem(eqs, t, [], [V], systems=[p, n], defaults=Dict(V => val), name=name)
 end
 
 function Resistor(name; R = 1.0)
@@ -37,7 +37,7 @@ function Resistor(name; R = 1.0)
            0 ~ p.i + n.i
            v ~ p.i * R
           ]
-    ODESystem(eqs, t, [v], [R], systems=[p, n], default=Dict(R => val), name=name)
+    ODESystem(eqs, t, [v], [R], systems=[p, n], defaults=Dict(R => val), name=name)
 end
 
 function Capacitor(name; C = 1.0)
@@ -52,7 +52,7 @@ function Capacitor(name; C = 1.0)
            0 ~ p.i + n.i
            D(v) ~ p.i / C
           ]
-    ODESystem(eqs, t, [v], [C], systems=[p, n], default=Dict(C => val), name=name)
+    ODESystem(eqs, t, [v], [C], systems=[p, n], defaults=Dict(C => val), name=name)
 end
 
 R = 1.0
@@ -82,7 +82,7 @@ rc_eqs = [
 
 rc_model = ODESystem(rc_eqs, t, systems=[resistor, capacitor, source, ground], name=:rc)
 sys = structural_simplify(rc_model)
-@test ModelingToolkit.default(sys) == Dict(
+@test ModelingToolkit.defaults(sys) == Dict(
                                              capacitor.C => 1.0,
                                              source.V => 1.0,
                                              resistor.R => 1.0,

test/symbolic_parameters.jl

@@ -19,7 +19,7 @@ u0 = Pair{Num, Any}[
     y => σ, # default u0 from default p
     z => u-0.1,
 ]
-ns = NonlinearSystem(eqs, [x,y,z],[σ,ρ,β], name=:ns, defaults=merge(par, u0))
+ns = NonlinearSystem(eqs, [x,y,z],[σ,ρ,β], name=:ns, defaults=[par; u0])
 ns.y = u*1.1
 resolved = ModelingToolkit.varmap_to_vars(Dict(), parameters(ns), defaults=ModelingToolkit.defaults(ns))
 @test resolved == [1, 0.1+1, (0.1+1)*1.1]