Skip to content

Commit 8e90fd2

Browse files
authored
Merge pull request #162 from control-toolbox/161-general-update-compat-ctparser
uncomment tests
2 parents 498bfd6 + 29835e8 commit 8e90fd2

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "CTModels"
22
uuid = "34c4fa32-2049-4079-8329-de33c2a22e2d"
33
authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
4-
version = "0.5.0"
4+
version = "0.5.1"
55

66
[deps]
77
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"

test/Project.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
[deps]
22
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
33
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
4+
CTDirect = "790bbbee-bee9-49ee-8912-a9de031322d5"
5+
CTParser = "32681960-a1b1-40db-9bff-a1ca817385d1"
46
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
57
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
8+
NLPModelsIpopt = "f4238b75-b362-5c4c-b852-0801c9a21d71"
69
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
710
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
811

912
[compat]
1013
Aqua = "0.8"
1114
CTBase = "0.16"
15+
CTDirect = "0.14"
16+
CTParser = "0.4"
1217
JLD2 = "0.5"
1318
JSON3 = "1"
19+
NLPModelsIpopt = "0.10"
1420
Plots = "1.40"
1521
Test = "1"
1622
julia = "1.10"

test/runtests.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ using Aqua
33
using CTBase
44
using CTModels
55

6-
#using CTDirect
7-
#using NLPModelsIpopt
8-
#import CTParser: CTParser, @def
9-
#CTParser.prefix!(:CTModels); # code generated by @def is prefixed by CTModels (not by OptimalControl - the default)
6+
using CTDirect
7+
using NLPModelsIpopt
8+
import CTParser: CTParser, @def
9+
CTParser.prefix!(:CTModels); # code generated by @def is prefixed by CTModels (not by OptimalControl - the default)
1010

1111
#
1212
include("solution_example.jl")
13-
#include("solution_example_path_constraints.jl")
13+
include("solution_example_path_constraints.jl")
1414

1515
#
1616
@testset verbose = true showtiming = true "CTModels tests" begin
@@ -29,8 +29,8 @@ include("solution_example.jl")
2929
:init,
3030
:utils,
3131
:solution,
32-
# :plot,
33-
# :export_import,
32+
:plot,
33+
:export_import,
3434
)
3535
@testset "$(name)" begin
3636
test_name = Symbol(:test_, name)

0 commit comments

Comments
 (0)