Skip to content

Commit e552d4f

Browse files
committed
Fix bugs
1 parent bf8d7e7 commit e552d4f

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

Project.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
88
KiteUtils = "90980105-b163-44e5-ba9f-8b1c83bb0533"
99
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1010
NLsolve = "2774e3e8-f4cf-5e23-947b-6d7e65073b56"
11-
NOMAD = "02130f1c-4665-5b79-af82-ff1385104aa0"
1211
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
1312
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1413
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
@@ -27,7 +26,6 @@ KiteUtils = "0.10.7"
2726
LinearAlgebra = "1.10, 1.11"
2827
NLsolve = "4.5.1"
2928
NOMAD = "2.4.1"
30-
PRIMA = "0.2.2"
3129
Parameters = "0.12.3"
3230
Pkg = "1.10, 1.11"
3331
StaticArrays = "1.9.13"
@@ -41,10 +39,10 @@ julia = "1.10, 1.11"
4139

4240
[extras]
4341
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
42+
NOMAD = "02130f1c-4665-5b79-af82-ff1385104aa0"
4443
ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
4544
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
46-
PRIMA = "0a7d04aa-8ac2-47b3-b7a7-9dbd6ad661ed"
4745
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
4846

4947
[targets]
50-
test = ["Test", "ControlPlots", "Documenter", "Aqua", "PRIMA"]
48+
test = ["Test", "ControlPlots", "Documenter", "Aqua", "NOMAD"]

scripts/autotune.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# this script tunes the controller parameters (well, eight of them)
22
using Pkg
3-
if ! ("ControlPlots" keys(Pkg.project().dependencies))
3+
if ! ("NOMAD" keys(Pkg.project().dependencies))
44
using TestEnv; TestEnv.activate()
55
using Test
66
end
7-
using WinchControllers, KiteUtils, PRIMA, NOMAD, ControlPlots
7+
using WinchControllers, KiteUtils, NOMAD, ControlPlots
88

99
LF = 2.5 # limit factor
1010
TUNED::Bool = false

test/test_winchcontroller.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ if @isdefined __TEST__
8686
@test V_WIND[Int64(2/0.02)+1] 9.0 rtol=1e-4
8787
@test V_WIND[Int64(4/0.02)+1] 0.0 atol=1e-4
8888
@test V_WIND[Int64(6/0.02)+1] 9.0 rtol=1e-4
89-
@test mean(FORCE) 1783.2979123136008 rtol=1e-4
89+
@test mean(FORCE) 1782.9912136687296 rtol=1e-4
9090
@test maximum(FORCE) < 4295
9191
@test minimum(FORCE[10:end]) > 10.0
9292
@test STATE[Int64(0.5/dt)] == 0

0 commit comments

Comments
 (0)