Merge pull request #175 from control-toolbox/print

Up print

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.6.0"
+version = "0.6.1"
 
 [deps]
 CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"

src/print.jl

@@ -20,6 +20,7 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::Model)
 
     # ------------------------------------------------------------------------------ #
     # print the code
+    printstyled(io, "Abstract defintion:\n\n"; bold=true)
     tab = 4
     code = striplines(definition(ocp))
     @match code.head begin
@@ -225,7 +226,7 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::Model)
     #
     some_printing && println(io)
     printstyled(io, "Declarations "; bold=true)
-    printstyled(io, "(* required):\n"; bold=false)
+    printstyled(io, "(* required):\n"; bold=true)
     #println(io)
 
     # print table of settings
@@ -293,6 +294,7 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::PreModel)
 
         # ------------------------------------------------------------------------------ #
         # print the code
+        printstyled(io, "Abstract defintion:\n\n"; bold=true)
         tab = 4
         code = striplines(definition(ocp))
         @match code.head begin
@@ -512,7 +514,7 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::PreModel)
     #
     some_printing && println(io)
     printstyled(io, "Declarations "; bold=true)
-    printstyled(io, "(* required):\n"; bold=false)
+    printstyled(io, "(* required):\n"; bold=true)
     #println(io)
 
     # print table of settings

test/extras/print_model.jl

@@ -1,5 +1,5 @@
 using Pkg
-Pkg.activate("./")
+Pkg.activate(".")
 
 using CTBase
 using CTModels

test/solution_example.jl

@@ -12,8 +12,6 @@ function solution_example(; fun=false)
     # set control
     CTModels.control!(pre_ocp, 1)
 
-    pre_ocp_returned = deepcopy(pre_ocp)
-
     # set control
     CTModels.variable!(pre_ocp, 2)
 
@@ -54,6 +52,8 @@ function solution_example(; fun=false)
 
     CTModels.time_dependence!(pre_ocp; autonomous=false)
 
+    pre_ocp_returned = deepcopy(pre_ocp)
+
     # build model
     ocp = CTModels.build(pre_ocp)