Merge pull request #194 from control-toolbox/compat

Update compat

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.3"
+version = "0.6.4"
 
 [deps]
 CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
@@ -29,7 +29,7 @@ CTModelsPlots = "Plots"
 CTBase = "0.16"
 DocStringExtensions = "0.9"
 Interpolations = "0.16"
-JLD2 = "0.5"
+JLD2 = "0.6"
 JSON3 = "1"
 LinearAlgebra = "1"
 MLStyle = "0.4"

docs/Project.toml

@@ -6,7 +6,7 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 
 [compat]
 Documenter = "1"
-JLD2 = "0.5"
+JLD2 = "0.6"
 JSON3 = "1"
 Plots = "1"
 julia = "1.10"

src/print.jl

@@ -249,6 +249,7 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::Model)
         __is_objective_set(ocp) ? "V" : "X",
     )
     println("")
+    #### PrettyTables v2
     h1 = Highlighter((data, i, j) -> data[i, j] == "X"; bold=true, foreground=:red)
     h2 = Highlighter((data, i, j) -> data[i, j] == "V"; bold=true, foreground=:green)
     pretty_table(
@@ -262,6 +263,19 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::Model)
         alignment=:c,
         compact_printing=true,
     )
+    #### PrettyTables v3
+    # h1 = TextHighlighter((data, i, j) -> data[i, j] == "X", crayon"bold red")
+    # h2 = TextHighlighter((data, i, j) -> data[i, j] == "V", crayon"bold green")
+    # style = TextTableStyle(first_line_column_label = crayon"yellow bold")
+    # pretty_table(
+    #     io,
+    #     data;
+    #     column_labels=header,
+    #     style= style,
+    #     highlighters=[h1, h2],
+    #     alignment=:c,
+    #     compact_printing=true,
+    # )
 
     #
     return nothing
@@ -537,6 +551,7 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::PreModel)
         __is_objective_set(ocp) ? "V" : "X",
     )
     println("")
+    #### PrettyTables v2
     h1 = Highlighter((data, i, j) -> data[i, j] == "X"; bold=true, foreground=:red)
     h2 = Highlighter((data, i, j) -> data[i, j] == "V"; bold=true, foreground=:green)
     pretty_table(
@@ -550,6 +565,19 @@ function Base.show(io::IO, ::MIME"text/plain", ocp::PreModel)
         alignment=:c,
         compact_printing=true,
     )
+    #### PrettyTables v3
+    # h1 = TextHighlighter((data, i, j) -> data[i, j] == "X", crayon"bold red")
+    # h2 = TextHighlighter((data, i, j) -> data[i, j] == "V", crayon"bold green")
+    # style = TextTableStyle(first_line_column_label = crayon"yellow bold")
+    # pretty_table(
+    #     io,
+    #     data;
+    #     column_labels=header,
+    #     style= style,
+    #     highlighters=[h1, h2],
+    #     alignment=:c,
+    #     compact_printing=true,
+    # )
 
     #
     return nothing

test/Project.toml

@@ -16,7 +16,7 @@ Aqua = "0.8"
 CTBase = "0.16"
 CTDirect = "0.16"
 CTParser = "0.6"
-JLD2 = "0.5"
+JLD2 = "0.6"
 JSON3 = "1"
 NLPModelsIpopt = "0.10"
 Plots = "1"

test/extras/print_model.jl

@@ -1,3 +1,4 @@
+using Revise
 using Pkg
 Pkg.activate(".")