Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/helpers/print.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ function _ansi_color(color::Symbol, bold::Bool=false)
:magenta => 35,
:cyan => 36,
:white => 37,
:default => 39
:default => 39,
)

code = get(color_codes, color, 39)
if bold
return "\033[1;$(code)m"
Expand Down
4 changes: 1 addition & 3 deletions src/imports/ctsolvers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ import CTSolvers:
# Parameter types (imported only, not reexported)
AbstractStrategyParameter

@reexport import CTSolvers:
CPU,
GPU
@reexport import CTSolvers: CPU, GPU

@reexport import CTSolvers:

Expand Down
2 changes: 1 addition & 1 deletion test/suite/reexport/test_ctflows.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module TestCtflows

using Test: Test
using OptimalControl # using is mandatory since we test exported symbols
import CTFlows # needed for abstract type checks
using CTFlows: CTFlows # needed for abstract type checks

const VERBOSE = isdefined(Main, :TestOptions) ? Main.TestOptions.VERBOSE : true
const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : true
Expand Down
2 changes: 1 addition & 1 deletion test/suite/reexport/test_ctsolvers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module TestCtsolvers
using Test: Test
using CTSolvers: CTSolvers
using OptimalControl # using is mandatory since we test exported symbols
import SolverCore # needed for ocp_solution signature check
using SolverCore: SolverCore # needed for ocp_solution signature check

const VERBOSE = isdefined(Main, :TestOptions) ? Main.TestOptions.VERBOSE : true
const SHOWTIMING = isdefined(Main, :TestOptions) ? Main.TestOptions.SHOWTIMING : true
Expand Down
35 changes: 27 additions & 8 deletions test/suite/solve/test_canonical.jl
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,34 @@ function test_canonical()
modeler_solver_pairs = [
# ADNLP modeler with all solvers
("ADNLP", "Ipopt", OptimalControl.ADNLP(), OptimalControl.Ipopt(print_level=0)),
("ADNLP", "MadNLP", OptimalControl.ADNLP(), OptimalControl.MadNLP(print_level=MadNLP.ERROR)),
(
"ADNLP",
"MadNLP",
OptimalControl.ADNLP(),
OptimalControl.MadNLP(print_level=MadNLP.ERROR),
),
("ADNLP", "Uno", OptimalControl.ADNLP(), OptimalControl.Uno(logger="SILENT")),
("ADNLP", "MadNCL", OptimalControl.ADNLP(), OptimalControl.MadNCL(print_level=MadNLP.ERROR)),
(
"ADNLP",
"MadNCL",
OptimalControl.ADNLP(),
OptimalControl.MadNCL(print_level=MadNLP.ERROR),
),
# Exa modeler with all solvers
("Exa", "Ipopt", OptimalControl.Exa(), OptimalControl.Ipopt(print_level=0)),
("Exa", "MadNLP", OptimalControl.Exa(), OptimalControl.MadNLP(print_level=MadNLP.ERROR)),
(
"Exa",
"MadNLP",
OptimalControl.Exa(),
OptimalControl.MadNLP(print_level=MadNLP.ERROR),
),
("Exa", "Uno", OptimalControl.Exa(), OptimalControl.Uno(logger="SILENT")),
("Exa", "MadNCL", OptimalControl.Exa(), OptimalControl.MadNCL(print_level=MadNLP.ERROR)),
(
"Exa",
"MadNCL",
OptimalControl.Exa(),
OptimalControl.MadNCL(print_level=MadNLP.ERROR),
),
]

problems = [("Beam", Beam()), ("Goddard", Goddard())]
Expand Down Expand Up @@ -140,10 +160,9 @@ function test_canonical()
Test.@testset "$dname / $mname / $sname" begin
Test.@test success
if success
Test.@test solve_result isa
OptimalControl.AbstractSolution
Test.@test OptimalControl.objective(solve_result) ≈
pb.obj rtol = OBJ_RTOL
Test.@test solve_result isa OptimalControl.AbstractSolution
Test.@test OptimalControl.objective(solve_result) ≈ pb.obj rtol =
OBJ_RTOL
end
end
end
Expand Down