Skip to content

Commit e0129d1

Browse files
authored
Merge pull request #225 from control-toolbox/224-dev-update-from-ctsolvers
Update from CTSolvers
2 parents 469144f + f8c3809 commit e0129d1

File tree

115 files changed

+10678
-1669
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+10678
-1669
lines changed

.github/workflows/Breakage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
pkgname: [CTDirect, CTFlows, CTParser, OptimalControl]
14+
pkgname: [CTDirect, CTFlows, OptimalControl]
1515
pkgversion: [latest, stable]
1616
include:
1717
- pkgpath: control-toolbox

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ docs/site/
2525
# committed for packages, but should be committed for applications that require a static
2626
# environment.
2727
Manifest.toml
28+
29+
#
30+
reports/
31+
profiling/

Project.toml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
name = "CTModels"
22
uuid = "34c4fa32-2049-4079-8329-de33c2a22e2d"
3+
version = "0.7.0"
34
authors = ["Olivier Cots <olivier.cots@toulouse-inp.fr>"]
4-
version = "0.6.9"
55

66
[deps]
7+
ADNLPModels = "54578032-b7ea-4c30-94aa-7cbd1cce6c9a"
78
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
89
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
10+
ExaModels = "1037b233-b668-4ce9-9b63-f9f681f55dd2"
911
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
12+
KernelAbstractions = "63c18a36-062a-441e-b654-da1e3ab1ce7c"
1013
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1114
MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
1215
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
16+
NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
1317
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
1418
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
1519
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
20+
SolverCore = "ff4d7338-4cf1-434d-91df-b86cb86fb843"
1621

1722
[weakdeps]
1823
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
@@ -25,16 +30,21 @@ CTModelsJSON = "JSON3"
2530
CTModelsPlots = "Plots"
2631

2732
[compat]
28-
CTBase = "0.16"
33+
ADNLPModels = "0.8"
34+
CTBase = "0.17"
2935
DocStringExtensions = "0.9"
36+
ExaModels = "0.9"
3037
Interpolations = "0.16"
3138
JLD2 = "0.6"
3239
JSON3 = "1"
40+
KernelAbstractions = "0.9"
3341
LinearAlgebra = "1"
3442
MLStyle = "0.4"
3543
MacroTools = "0.5"
44+
NLPModels = "0.21"
3645
OrderedCollections = "1"
3746
Parameters = "0.12"
3847
Plots = "1"
3948
RecipesBase = "1"
49+
SolverCore = "0.3"
4050
julia = "1.10"

docs/Project.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
[deps]
2-
CTParser = "32681960-a1b1-40db-9bff-a1ca817385d1"
2+
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
33
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
44
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
55
JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
6+
MarkdownAST = "d0879d2d-cac2-40c8-9cee-1863dc0c7391"
67
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
78

89
[compat]
9-
CTParser = "0.7"
10+
CTBase = "0.17"
1011
Documenter = "1"
1112
JLD2 = "0.6"
1213
JSON3 = "1"

0 commit comments

Comments
 (0)