Skip to content

Commit 5cb9d9c

Browse files
ocotsocots
authored
Merge pull request #225 from control-toolbox/rename
Update CTModels compat
2 parents 5fee52f + 7d57149 commit 5cb9d9c

4 files changed

Lines changed: 30 additions & 27 deletions

File tree

‎.github/workflows/Breakage.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ jobs:
2020
pkgname: ${{ matrix.pkgname }}
2121
pkgpath: ${{ matrix.pkgpath }}
2222
pkgversion: ${{ matrix.pkgversion }}
23+
use_ct_registry: true
24+
secrets:
25+
SSH_KEY: ${{ secrets.SSH_KEY }}

‎src/initial_guess.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ When `log = true`, the macro additionally prints a human-readable
311311
312312
# Returns
313313
314-
- `AbstractOptimalControlInitialGuess`: backend-specific initial guess
314+
- `AbstractInitialGuess`: backend-specific initial guess
315315
object produced by the current backend (par défaut `CTModels`).
316316
317317
# Example
@@ -333,7 +333,7 @@ julia> ig = @init ocp begin
333333
u(t) := t
334334
end
335335
336-
julia> ig isa CTModels.AbstractOptimalControlInitialGuess
336+
julia> ig isa CTModels.AbstractInitialGuess
337337
true
338338
```
339339
"""

‎test/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1818
Aqua = "0.8"
1919
BenchmarkTools = "1"
2020
CTBase = "0.18"
21-
CTModels = "0.8"
21+
CTModels = "0.9"
2222
CUDA = "5"
2323
ExaModels = "0.9"
2424
Interpolations = "0.16"

‎test/test_initial_guess.jl‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function test_initial_guess()
4040
u(t) := t
4141
end
4242

43-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
43+
@test ig isa CTModels.AbstractInitialGuess
4444
CTModels.validate_initial_guess(ocp_fixed, ig)
4545

4646
ufun = CTModels.control(ig)
@@ -54,15 +54,15 @@ function test_initial_guess()
5454
@testset "empty and alias-only blocks delegate to defaults" begin
5555
# Empty block: should behave like a plain call to build_initial_guess(ocp, ())
5656
ig_empty = @init ocp_fixed begin end
57-
@test ig_empty isa CTModels.AbstractOptimalControlInitialGuess
57+
@test ig_empty isa CTModels.AbstractInitialGuess
5858
CTModels.validate_initial_guess(ocp_fixed, ig_empty)
5959

6060
# Alias-only block: aliases are executed, but no init specs should still
6161
# delegate to build_initial_guess(ocp, ()).
6262
ig_alias_only = @init ocp_fixed begin
6363
c = 1.0
6464
end
65-
@test ig_alias_only isa CTModels.AbstractOptimalControlInitialGuess
65+
@test ig_alias_only isa CTModels.AbstractInitialGuess
6666
CTModels.validate_initial_guess(ocp_fixed, ig_alias_only)
6767
end
6868

@@ -72,7 +72,7 @@ function test_initial_guess()
7272
v(t) := a
7373
end
7474

75-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
75+
@test ig isa CTModels.AbstractInitialGuess
7676
CTModels.validate_initial_guess(ocp_fixed, ig)
7777

7878
xfun = CTModels.state(ig)
@@ -89,7 +89,7 @@ function test_initial_guess()
8989
tf := a
9090
end
9191

92-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
92+
@test ig isa CTModels.AbstractInitialGuess
9393
CTModels.validate_initial_guess(ocp_var, ig)
9494
end
9595

@@ -98,7 +98,7 @@ function test_initial_guess()
9898
ig_block = @init ocp_var2 begin
9999
w := [1.0, 2.0]
100100
end
101-
@test ig_block isa CTModels.AbstractOptimalControlInitialGuess
101+
@test ig_block isa CTModels.AbstractInitialGuess
102102
CTModels.validate_initial_guess(ocp_var2, ig_block)
103103
v_block = CTModels.variable(ig_block)
104104
@test length(v_block) == 2
@@ -109,7 +109,7 @@ function test_initial_guess()
109109
ig_tf = @init ocp_var2 begin
110110
tf := 1.0
111111
end
112-
@test ig_tf isa CTModels.AbstractOptimalControlInitialGuess
112+
@test ig_tf isa CTModels.AbstractInitialGuess
113113
CTModels.validate_initial_guess(ocp_var2, ig_tf)
114114
v_tf = CTModels.variable(ig_tf)
115115
@test length(v_tf) == 2
@@ -120,7 +120,7 @@ function test_initial_guess()
120120
ig_a = @init ocp_var2 begin
121121
a := 0.5
122122
end
123-
@test ig_a isa CTModels.AbstractOptimalControlInitialGuess
123+
@test ig_a isa CTModels.AbstractInitialGuess
124124
CTModels.validate_initial_guess(ocp_var2, ig_a)
125125
v_a = CTModels.variable(ig_a)
126126
@test length(v_a) == 2
@@ -132,7 +132,7 @@ function test_initial_guess()
132132
tf := 1.0
133133
a := 0.5
134134
end
135-
@test ig_both isa CTModels.AbstractOptimalControlInitialGuess
135+
@test ig_both isa CTModels.AbstractInitialGuess
136136
CTModels.validate_initial_guess(ocp_var2, ig_both)
137137
v_both = CTModels.variable(ig_both)
138138
@test length(v_both) == 2
@@ -147,7 +147,7 @@ function test_initial_guess()
147147
u(t) := t
148148
end
149149

150-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
150+
@test ig isa CTModels.AbstractInitialGuess
151151
CTModels.validate_initial_guess(ocp_fixed, ig)
152152

153153
xfun = CTModels.state(ig)
@@ -172,7 +172,7 @@ function test_initial_guess()
172172
u(t) := t
173173
end
174174

175-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
175+
@test ig isa CTModels.AbstractInitialGuess
176176
CTModels.validate_initial_guess(ocp_fixed, ig)
177177

178178
xfun = CTModels.state(ig)
@@ -201,7 +201,7 @@ function test_initial_guess()
201201
u(T) := U
202202
end
203203

204-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
204+
@test ig isa CTModels.AbstractInitialGuess
205205
CTModels.validate_initial_guess(ocp_fixed, ig)
206206

207207
xfun = CTModels.state(ig)
@@ -234,7 +234,7 @@ function test_initial_guess()
234234
u(T) := U
235235
end
236236

237-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
237+
@test ig isa CTModels.AbstractInitialGuess
238238
CTModels.validate_initial_guess(ocp_fixed, ig)
239239

240240
xfun = CTModels.state(ig)
@@ -261,7 +261,7 @@ function test_initial_guess()
261261
u(T) := nothing
262262
end
263263

264-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
264+
@test ig isa CTModels.AbstractInitialGuess
265265
CTModels.validate_initial_guess(ocp_fixed, ig)
266266
end
267267

@@ -279,7 +279,7 @@ function test_initial_guess()
279279
u(Tu) := Du
280280
end
281281

282-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
282+
@test ig isa CTModels.AbstractInitialGuess
283283
CTModels.validate_initial_guess(ocp_fixed, ig)
284284

285285
xfun = CTModels.state(ig)
@@ -304,7 +304,7 @@ function test_initial_guess()
304304
v(t) := 1.0
305305
end
306306

307-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
307+
@test ig isa CTModels.AbstractInitialGuess
308308
CTModels.validate_initial_guess(ocp_fixed, ig)
309309
end
310310

@@ -315,7 +315,7 @@ function test_initial_guess()
315315
u := 0.1
316316
end
317317

318-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
318+
@test ig isa CTModels.AbstractInitialGuess
319319
CTModels.validate_initial_guess(ocp_fixed, ig)
320320
end
321321

@@ -324,7 +324,7 @@ function test_initial_guess()
324324
tf := 1.0
325325
end
326326

327-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
327+
@test ig isa CTModels.AbstractInitialGuess
328328
CTModels.validate_initial_guess(ocp_var, ig)
329329
end
330330

@@ -333,7 +333,7 @@ function test_initial_guess()
333333
ig_plain = @init ocp_fixed begin
334334
u(t) := t
335335
end
336-
@test ig_plain isa CTModels.AbstractOptimalControlInitialGuess
336+
@test ig_plain isa CTModels.AbstractInitialGuess
337337
CTModels.validate_initial_guess(ocp_fixed, ig_plain)
338338

339339
# Same DSL but with log = true, while redirecting stdout to avoid polluting test logs
@@ -342,7 +342,7 @@ function test_initial_guess()
342342
u(t) := t
343343
end log = true
344344
end
345-
@test ig_log isa CTModels.AbstractOptimalControlInitialGuess
345+
@test ig_log isa CTModels.AbstractInitialGuess
346346
CTModels.validate_initial_guess(ocp_fixed, ig_log)
347347

348348
# Compare behaviour at a few sample points
@@ -361,7 +361,7 @@ function test_initial_guess()
361361
u(t) := t
362362
end
363363

364-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
364+
@test ig isa CTModels.AbstractInitialGuess
365365
CTModels.validate_initial_guess(ocp_var, ig)
366366

367367
xfun = CTModels.state(ig)
@@ -388,7 +388,7 @@ function test_initial_guess()
388388
u(T) := nothing
389389
end
390390

391-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
391+
@test ig isa CTModels.AbstractInitialGuess
392392
CTModels.validate_initial_guess(ocp_var, ig)
393393
end
394394

@@ -403,7 +403,7 @@ function test_initial_guess()
403403
u(T) := U
404404
end
405405

406-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
406+
@test ig isa CTModels.AbstractInitialGuess
407407
CTModels.validate_initial_guess(ocp_var, ig)
408408

409409
xfun = CTModels.state(ig)
@@ -437,7 +437,7 @@ function test_initial_guess()
437437
u(Tu) := Du
438438
end
439439

440-
@test ig isa CTModels.AbstractOptimalControlInitialGuess
440+
@test ig isa CTModels.AbstractInitialGuess
441441
CTModels.validate_initial_guess(ocp_var, ig)
442442

443443
xfun = CTModels.state(ig)

0 commit comments

Comments
 (0)