Skip to content

Commit 26ed351

Browse files
committed
comapre with correct gamma
1 parent 063e553 commit 26ed351

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

test/test_glover_mcfarlane.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ G = tf(200, [10, 1])*tf(1, [0.05, 1])^2 |> ss
44
Gd = tf(100, [10, 1]) |> ss
55
W1 = tf([1, 2], [1, 1e-6]) |> ss
66
Gs = G*W1
7-
Ks, γmin = glover_mcfarlane(Gs, 1.1)
8-
@test γmin 2.34 atol=0.005
7+
Ks, γ, info = glover_mcfarlane(Gs, 1.1)
8+
@test info.γmin 2.34 atol=0.005
99

1010
if isinteractive()
1111
bodeplot([G, Gs, Gs*Ks]) |> display
@@ -50,12 +50,12 @@ Gcl = extended_gangoffour(P, K)
5050
@test nugap(K, -K0)[1] < 1e-4
5151
@test info.margin 0.6325 atol=1e-3
5252

53-
@test RobustAndOptimalControl.ncfmargin(P, K)[1] 0.4472 atol=1e-3
53+
@test ncfmargin(P, K)[1] 0.4472 atol=1e-3
5454

5555
p = ss(tf(4, [1, -0.001]))
5656
cL = 1
5757
cH = 10
58-
@test RobustAndOptimalControl.ncfmargin(p,cL)[1] 0.7069 atol=1e-3
58+
@test ncfmargin(p,cL)[1] 0.7069 atol=1e-3
5959

6060

6161

0 commit comments

Comments
 (0)