Merge pull request #150 from control-toolbox/149-dev-plot-a-solution

Plot without positional arguments

Author: ocots

Project.toml

@@ -1,7 +1,7 @@
 name = "CTModels"
 uuid = "34c4fa32-2049-4079-8329-de33c2a22e2d"
 authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
-version = "0.4.1"
+version = "0.4.2"
 
 [deps]
 CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
@@ -34,7 +34,7 @@ JSON3 = "1.14"
 LinearAlgebra = "1"
 MLStyle = "0.4"
 MacroTools = "0.5"
-OrderedCollections = "1.8.0"
+OrderedCollections = "1.8"
 Parameters = "0.12"
 Plots = "1.40"
 PrettyTables = "2.4"

ext/plot.jl

@@ -1112,6 +1112,47 @@ function Plots.plot!(
     kwargs...,
 )
 
+    model = CTModels.model(sol)
+
+    # check if the plot is empty
+    if isempty(p.series_list)
+        
+        attr = NamedTuple((Symbol(key),value) for (key,value) in p.attr if key != :layout)
+
+        pnew = __initial_plot(
+            sol,
+            description...;
+            layout=layout,
+            control=control,
+            model=model,
+            size=__size_plot(
+                sol,
+                model,
+                control,
+                layout,
+                description...;
+                state_style=state_style,
+                control_style=control_style,
+                costate_style=costate_style,
+                path_style=path_style,
+                dual_style=dual_style,
+            ),
+            state_style=state_style,
+            control_style=control_style,
+            costate_style=costate_style,
+            path_style=path_style,
+            dual_style=dual_style,
+            attr...,
+            kwargs...,
+        )
+
+        # replace p by pnew, must have a side effect
+        for k ∈ fieldnames(typeof(p))
+           setfield!(p, k, getfield(pnew, k))
+        end
+        
+    end
+
     # plot the solution with infos from the model
     return __plot!(
         p,
@@ -1124,7 +1165,7 @@ function Plots.plot!(
         state_style=state_style,
         control_style=control_style,
         costate_style=costate_style,
-        model=CTModels.model(sol),
+        model=model,
         state_bounds_style=state_bounds_style,
         control_bounds_style=control_bounds_style,
         time_style=time_style,

test/extras/plot_manual.jl

@@ -1,3 +1,6 @@
+using Pkg
+Pkg.activate(".")
+
 using CTModels
 using Plots
 
@@ -37,6 +40,8 @@ function get_solution()
     end
     CTModels.definition!(pre_ocp, definition) # does not correspond to the solution
 
+    CTModels.time_dependence!(pre_ocp; autonomous=false)
+
     # build model
     ocp = CTModels.build_model(pre_ocp)
 
@@ -127,7 +132,15 @@ end;
 
 sol = get_solution();
 
+#
+plt = plot(size=(800,800))
+pp = plot!(plt, sol)
+
+pp
+plt
+
 # layout = :group
+
 plot(sol; layout=:group, control=:components)
 plot(sol; layout=:group, control=:norm)
 plot(sol; layout=:group, control=:all)