Merge pull request #766 from SciML/myb/print

Less verbose printing a few minor fixes

Author: YingboMa

src/systems/abstractsystem.jl

@@ -319,11 +319,13 @@ end
 
 function Base.show(io::IO, sys::AbstractSystem)
     eqs = equations(sys)
-    Base.printstyled(io, "Equations ($(length(eqs))):\n"; bold=true)
-    Base.print_matrix(io, eqs)
-    println(io)
+    Base.printstyled(io, "Model $(nameof(sys)) with $(length(eqs)) equations\n"; bold=true)
+    # The reduced equations are usually very long. It's not that useful to print
+    # them.
+    #Base.print_matrix(io, eqs)
+    #println(io)
 
-    rows = first(displaysize(io)) ÷ 3
+    rows = first(displaysize(io)) ÷ 5
     limit = get(io, :limit, false)
 
     vars = states(sys); nvars = length(vars)

src/systems/control/controlsystem.jl

@@ -91,6 +91,8 @@ function ControlSystem(loss, deqs::AbstractVector{<:Equation}, iv, dvs, controls
     ps′ = value.(ps)
     default_u0 isa Dict || (default_u0 = Dict(default_u0))
     default_p isa Dict || (default_p = Dict(default_p))
+    default_u0 = Dict(value(k) => value(default_u0[k]) for k in keys(default_u0))
+    default_p = Dict(value(k) => value(default_p[k]) for k in keys(default_p))
     ControlSystem(value(loss), deqs, iv′, dvs′, controls′,
                   ps′, observed, name, systems, default_u0, default_p)
 end

src/systems/diffeqs/abstractodesystem.jl

@@ -254,11 +254,11 @@ function process_DEProblem(constructor, sys::AbstractODESystem,u0map,parammap;
     dvs = states(sys)
     ps = parameters(sys)
     u0map′ = lower_mapnames(u0map,sys.iv)
-    u0 = varmap_to_vars(u0map′,dvs; defaults=get_default_u0(sys))
+    u0 = varmap_to_vars(u0map′,dvs; defaults=default_u0(sys))
 
     if !(parammap isa DiffEqBase.NullParameters)
         parammap′ = lower_mapnames(parammap)
-        p = varmap_to_vars(parammap′,ps; defaults=get_default_p(sys))
+        p = varmap_to_vars(parammap′,ps; defaults=default_p(sys))
     else
         p = ps
     end

src/systems/diffeqs/odesystem.jl

@@ -90,6 +90,8 @@ function ODESystem(
 
     default_u0 isa Dict || (default_u0 = Dict(default_u0))
     default_p isa Dict || (default_p = Dict(default_p))
+    default_u0 = Dict(value(k) => value(default_u0[k]) for k in keys(default_u0))
+    default_p = Dict(value(k) => value(default_p[k]) for k in keys(default_p))
 
     tgrad = RefValue(Vector{Num}(undef, 0))
     jac = RefValue{Any}(Matrix{Num}(undef, 0, 0))

src/systems/diffeqs/sdesystem.jl

@@ -90,6 +90,8 @@ function SDESystem(deqs::AbstractVector{<:Equation}, neqs, iv, dvs, ps;
 
     default_u0 isa Dict || (default_u0 = Dict(default_u0))
     default_p isa Dict || (default_p = Dict(default_p))
+    default_u0 = Dict(value(k) => value(default_u0[k]) for k in keys(default_u0))
+    default_p = Dict(value(k) => value(default_p[k]) for k in keys(default_p))
 
     tgrad = RefValue(Vector{Num}(undef, 0))
     jac = RefValue{Any}(Matrix{Num}(undef, 0, 0))

src/systems/jumps/jumpsystem.jl

@@ -75,6 +75,8 @@ function JumpSystem(eqs, iv, states, ps;
     end
     default_u0 isa Dict || (default_u0 = Dict(default_u0))
     default_p isa Dict || (default_p = Dict(default_p))
+    default_u0 = Dict(value(k) => value(default_u0[k]) for k in keys(default_u0))
+    default_p = Dict(value(k) => value(default_p[k]) for k in keys(default_p))
 
     JumpSystem{typeof(ap)}(ap, value(iv), value.(states), value.(ps), observed, name, systems, default_u0, default_p)
 end
@@ -197,8 +199,8 @@ dprob = DiscreteProblem(js, u₀map, tspan, parammap)
 """
 function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Tuple,
                                     parammap=DiffEqBase.NullParameters(); kwargs...)
-    u0 = varmap_to_vars(u0map, states(sys); defaults=get_default_u0(sys))
-    p  = varmap_to_vars(parammap, parameters(sys); defaults=get_default_p(sys))
+    u0 = varmap_to_vars(u0map, states(sys); defaults=default_u0(sys))
+    p  = varmap_to_vars(parammap, parameters(sys); defaults=default_p(sys))
     f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT
     df = DiscreteFunction{true,true}(f, syms=Symbol.(states(sys)))
     DiscreteProblem(df, u0, tspan, p; kwargs...)
@@ -225,8 +227,8 @@ dprob = DiscreteProblem(js, u₀map, tspan, parammap)
 """
 function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Tuple,
                                     parammap=DiffEqBase.NullParameters(); kwargs...)
-    u0 = varmap_to_vars(u0map, states(sys); defaults=get_default_u0(sys))
-    p  = varmap_to_vars(parammap, parameters(sys); defaults=get_default_p(sys))
+    u0 = varmap_to_vars(u0map, states(sys); defaults=default_u0(sys))
+    p  = varmap_to_vars(parammap, parameters(sys); defaults=default_p(sys))
     # identity function to make syms works
     quote
         f  = DiffEqBase.DISCRETE_INPLACE_DEFAULT

src/systems/nonlinear/nonlinearsystem.jl

@@ -58,6 +58,8 @@ function NonlinearSystem(eqs, states, ps;
                          systems = NonlinearSystem[])
     default_u0 isa Dict || (default_u0 = Dict(default_u0))
     default_p isa Dict || (default_p = Dict(default_p))
+    default_u0 = Dict(value(k) => value(default_u0[k]) for k in keys(default_u0))
+    default_p = Dict(value(k) => value(default_p[k]) for k in keys(default_p))
     NonlinearSystem(eqs, value.(states), value.(ps), observed, name, systems, default_u0, default_p, nothing)
 end
 
@@ -210,11 +212,11 @@ function process_NonlinearProblem(constructor, sys::NonlinearSystem,u0map,paramm
     dvs = states(sys)
     ps = parameters(sys)
     u0map′ = lower_mapnames(u0map)
-    u0 = varmap_to_vars(u0map′,dvs; defaults=get_default_u0(sys))
+    u0 = varmap_to_vars(u0map′,dvs; defaults=default_u0(sys))
 
     if !(parammap isa DiffEqBase.NullParameters)
         parammap′ = lower_mapnames(parammap)
-        p = varmap_to_vars(parammap′,ps; defaults=get_default_p(sys))
+        p = varmap_to_vars(parammap′,ps; defaults=default_p(sys))
     else
         p = ps
     end

src/systems/optimization/optimizationsystem.jl

@@ -57,6 +57,8 @@ function OptimizationSystem(op, states, ps;
 
     default_u0 isa Dict || (default_u0 = Dict(default_u0))
     default_p isa Dict || (default_p = Dict(default_p))
+    default_u0 = Dict(value(k) => value(default_u0[k]) for k in keys(default_u0))
+    default_p = Dict(value(k) => value(default_p[k]) for k in keys(default_p))
 
     OptimizationSystem(
                        value(op), value.(states), value.(ps),
@@ -156,8 +158,8 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0,
 
     _f = DiffEqBase.OptimizationFunction{iip,AutoModelingToolkit,typeof(f),typeof(_grad),typeof(_hess),Nothing,Nothing,Nothing,Nothing}(f,AutoModelingToolkit(),_grad,_hess,nothing,nothing,nothing,nothing)
 
-    u0 = varmap_to_vars(u0,dvs; defaults=get_default_u0(sys))
-    p = varmap_to_vars(parammap,ps; defaults=get_default_p(sys))
+    u0 = varmap_to_vars(u0,dvs; defaults=default_u0(sys))
+    p = varmap_to_vars(parammap,ps; defaults=default_p(sys))
     lb = varmap_to_vars(lb,dvs)
     ub = varmap_to_vars(ub,dvs)
     OptimizationProblem{iip}(_f,u0,p;lb=lb,ub=ub,kwargs...)
@@ -211,8 +213,8 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0,
         _hess = :nothing
     end
 
-    u0 = varmap_to_vars(u0,dvs; defaults=get_default_u0(sys))
-    p = varmap_to_vars(parammap,ps; defaults=get_default_p(sys))
+    u0 = varmap_to_vars(u0,dvs; defaults=default_u0(sys))
+    p = varmap_to_vars(parammap,ps; defaults=default_p(sys))
     lb = varmap_to_vars(lb,dvs)
     ub = varmap_to_vars(ub,dvs)
     quote

test/components.jl

@@ -77,11 +77,11 @@ C1 = Capacitor(:C1)
 I1 = Inductor(:I1)
 @test isequal(R1.p.i, (@variables R1₊p₊i(t))[1])
 @parameters R
-@test ModelingToolkit.get_default_p(flatten(R1)) == Dict(R => 1.0)
+@test ModelingToolkit.default_p(flatten(R1)) == Dict(R => 1.0)
 @variables n₊v(t) p₊v(t) n₊i(t) p₊i(t)
-@test ModelingToolkit.get_default_u0(flatten(R1)) == Dict(
-                                                          n₊v => 1.0,
-                                                          p₊v => 1.0,
-                                                          n₊i => 1.0,
-                                                          p₊i => 1.0,
-                                                         )
+@test ModelingToolkit.default_u0(flatten(R1)) == Dict(
+                                                      n₊v => 1.0,
+                                                      p₊v => 1.0,
+                                                      n₊i => 1.0,
+                                                      p₊i => 1.0,
+                                                     )

test/reduction.jl

@@ -41,6 +41,8 @@ eqs = [
 lorenz1 = ODESystem(eqs,t,name=:lorenz1)
 
 lorenz1_aliased = alias_elimination(lorenz1)
+io = IOBuffer(); show(io, lorenz1_aliased); str = String(take!(io))
+@test all(s->occursin(s, str), ["lorenz1", "States (3)", "Parameters (3)"])
 reduced_eqs = [
                D(x) ~ σ*(y - x)
                D(y) ~ β + x*(ρ - z) - y