Skip to content

Commit 9af9c78

Browse files
authored
Merge pull request #499 from control-toolbox/498-general-up-compat-and-new-release
up compat
2 parents 121d1f8 + 00a06c1 commit 9af9c78

File tree

5 files changed

+12
-23
lines changed

5 files changed

+12
-23
lines changed

Project.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OptimalControl"
22
uuid = "5f98b655-cc9a-415a-b60e-744165666948"
33
authors = ["Olivier Cots <[email protected]>"]
4-
version = "1.0.1"
4+
version = "1.0.2"
55

66
[deps]
77
CTBase = "54762871-cc72-4466-b8e8-f6c8b58076cd"
@@ -13,10 +13,10 @@ CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
1313
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1414

1515
[compat]
16-
CTBase = "0.15"
16+
CTBase = "0.16"
1717
CTDirect = "0.14"
1818
CTFlows = "0.8"
19-
CTModels = "0.2"
19+
CTModels = "0.3"
2020
CTParser = "0.2"
2121
CommonSolve = "0.2"
2222
DocStringExtensions = "0.9"

docs/Project.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
2424

2525
[compat]
2626
BenchmarkTools = "1.6"
27-
CTBase = "0.15"
27+
CTBase = "0.16"
2828
CTDirect = "0.14"
2929
CTFlows = "0.8"
30-
CTModels = "0.2"
30+
CTModels = "0.3"
3131
CTParser = "0.2"
3232
CommonSolve = "0.2"
3333
DifferentiationInterface = "0.6"
@@ -45,4 +45,4 @@ OrdinaryDiffEq = "6.93"
4545
Percival = "0.7"
4646
Plots = "1.40"
4747
Suppressor = "0.2"
48-
julia = "1.10"
48+
julia = "1"

docs/src/tutorial-double-integrator-energy.md

+4-15
Original file line numberDiff line numberDiff line change
@@ -113,29 +113,18 @@ We can export (or save) the solution in a Julia `.jld2` data file and reload it
113113

114114
```@example main
115115
using JLD2
116-
using JSON3 # hide
117-
118-
using Suppressor # hide
119-
@suppress_err begin # hide
120-
export_ocp_solution(sol; filename_prefix="my_solution")
121-
end # hide
122-
123-
sol_jld = import_ocp_solution(ocp; filename_prefix="my_solution")
124-
116+
export_ocp_solution(sol; filename="my_solution")
117+
sol_jld = import_ocp_solution(ocp; filename="my_solution")
125118
println("Objective from computed solution: ", objective(sol))
126119
println("Objective from imported solution: ", objective(sol_jld))
127120
```
128121

129122
### JSON
130123

131124
```@example main
132-
# load additional modules
133125
using JSON3
134-
135-
export_ocp_solution(sol; filename_prefix="my_solution", format=:JSON)
136-
137-
sol_json = import_ocp_solution(ocp; filename_prefix="my_solution", format=:JSON)
138-
126+
export_ocp_solution(sol; filename="my_solution", format=:JSON)
127+
sol_json = import_ocp_solution(ocp; filename="my_solution", format=:JSON)
139128
println("Objective from computed solution: ", objective(sol))
140129
println("Objective from imported solution: ", objective(sol_json))
141130
```

src/solve.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function CommonSolve.solve(
8989
)::CTModels.Solution
9090

9191
# get the full description
92-
method = CTBase.getFullDescription(description, available_methods())
92+
method = CTBase.complete(description; descriptions=available_methods())
9393

9494
# solve the problem
9595
if :direct method

test/Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SplitApplyCombine = "03a91e81-4c3e-53e1-a0a4-9c0c8f19dd66"
1010
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1111

1212
[compat]
13-
CTModels = "0.2"
13+
CTModels = "0.3"
1414
DifferentiationInterface = "0.6"
1515
ForwardDiff = "0.10"
1616
LinearAlgebra = "1"

0 commit comments

Comments
 (0)