changed: using nameof instead of .name.name in show

Author: franckgaga

src/controller/explicitmpc.jl

@@ -181,9 +181,9 @@ function Base.show(io::IO, mpc::ExplicitMPC)
     nu, nd = mpc.estim.model.nu, mpc.estim.model.nd
     nx̂, nym, nyu = mpc.estim.nx̂, mpc.estim.nym, mpc.estim.nyu
     n = maximum(ndigits.((Hp, Hc, nu, nx̂, nym, nyu, nd))) + 1
-    println(io, "$(typeof(mpc).name.name) controller with a sample time Ts = "*
+    println(io, "$(nameof(typeof(mpc))) controller with a sample time Ts = "*
                 "$(mpc.estim.model.Ts) s, "*
-                "$(typeof(mpc.estim).name.name) estimator and:")
+                "$(nameof(typeof(mpc.estim))) estimator and:")
     println(io, "$(lpad(Hp, n)) prediction steps Hp")
     println(io, "$(lpad(Hc, n)) control steps Hc")
     print_estim_dim(io, mpc.estim, n)

src/estimator/mhe.jl

@@ -5,9 +5,9 @@ function Base.show(io::IO, estim::MovingHorizonEstimator)
     nu, nd = estim.model.nu, estim.model.nd
     nx̂, nym, nyu = estim.nx̂, estim.nym, estim.nyu
     n = maximum(ndigits.((nu, nx̂, nym, nyu, nd))) + 1
-    println(io, "$(typeof(estim).name.name) estimator with a sample time "*
+    println(io, "$(nameof(typeof(estim))) estimator with a sample time "*
                 "Ts = $(estim.model.Ts) s, $(JuMP.solver_name(estim.optim)) optimizer, "*
-                "$(typeof(estim.model).name.name) and:")
+                "$(nameof(typeof(estim.model))) and:")
     print_estim_dim(io, estim, n)
 end
 

src/plot_sim.jl

@@ -101,7 +101,7 @@ get_nx̂(mpc::PredictiveController) = mpc.estim.nx̂
 
 function Base.show(io::IO, res::SimResult) 
     N = length(res.T_data)
-    print(io, "Simulation results of $(typeof(res.obj).name.name) with $N time steps.")
+    print(io, "Simulation results of $(nameof(typeof(res.obj))) with $N time steps.")
 end
 
 
@@ -137,7 +137,7 @@ function sim!(
     D_data  = Matrix{NT}(undef, plant.nd, N)
     X_data  = Matrix{NT}(undef, plant.nx, N)
     setstate!(plant, x_0)
-    @progress name="$(typeof(plant).name.name) simulation" for i=1:N
+    @progress name="$(nameof(typeof(plant))) simulation" for i=1:N
         y = evaloutput(plant, d) 
         Y_data[:, i] .= y
         U_data[:, i] .= u
@@ -282,7 +282,7 @@ function sim_closedloop!(
     lastd, lasty = d, evaloutput(plant, d)
     initstate!(est_mpc, lastu, lasty[estim.i_ym], lastd)
     isnothing(x̂_0) || setstate!(est_mpc, x̂_0)
-    @progress name="$(typeof(est_mpc).name.name) simulation" for i=1:N
+    @progress name="$(nameof(typeof(est_mpc))) simulation" for i=1:N
         d = lastd + d_step + d_noise.*randn(plant.nd)
         y = evaloutput(plant, d) + y_step + y_noise.*randn(plant.ny)
         ym = y[estim.i_ym]

src/predictive_control.jl

@@ -31,10 +31,10 @@ function Base.show(io::IO, mpc::PredictiveController)
     nu, nd = mpc.estim.model.nu, mpc.estim.model.nd
     nx̂, nym, nyu = mpc.estim.nx̂, mpc.estim.nym, mpc.estim.nyu
     n = maximum(ndigits.((Hp, Hc, nu, nx̂, nym, nyu, nd))) + 1
-    println(io, "$(typeof(mpc).name.name) controller with a sample time Ts = "*
+    println(io, "$(nameof(typeof(mpc))) controller with a sample time Ts = "*
                 "$(mpc.estim.model.Ts) s, $(JuMP.solver_name(mpc.optim)) optimizer, "*
-                "$(typeof(mpc.transcription).name.name) transcription, "*
-                "$(typeof(mpc.estim).name.name) estimator and:")
+                "$(nameof(typeof(mpc.transcription))) transcription, "*
+                "$(nameof(typeof(mpc.estim))) estimator and:")
     println(io, "$(lpad(Hp, n)) prediction steps Hp")
     println(io, "$(lpad(Hc, n)) control steps Hc")
     println(io, "$(lpad(nϵ, n)) slack variable ϵ (control constraints)")

src/sim_model.jl

@@ -372,7 +372,7 @@ function Base.show(io::IO, model::SimModel)
     nu, nd = model.nu, model.nd
     nx, ny = model.nx, model.ny
     n = maximum(ndigits.((nu, nx, ny, nd))) + 1
-    println(io, "$(typeof(model).name.name) with a sample time Ts = $(model.Ts) s"*
+    println(io, "$(nameof(typeof(model))) with a sample time Ts = $(model.Ts) s"*
                 "$(detailstr(model)) and:")
     println(io, "$(lpad(nu, n)) manipulated inputs u")
     println(io, "$(lpad(nx, n)) states x")

src/state_estim.jl

@@ -32,8 +32,8 @@ function Base.show(io::IO, estim::StateEstimator)
     nu, nd = estim.model.nu, estim.model.nd
     nx̂, nym, nyu = estim.nx̂, estim.nym, estim.nyu
     n = maximum(ndigits.((nu, nx̂, nym, nyu, nd))) + 1
-    println(io, "$(typeof(estim).name.name) estimator with a sample time "*
-                "Ts = $(estim.model.Ts) s, $(typeof(estim.model).name.name) and:")
+    println(io, "$(nameof(typeof(estim))) estimator with a sample time "*
+                "Ts = $(estim.model.Ts) s, $(nameof(typeof(estim.model))) and:")
     print_estim_dim(io, estim, n)
 end