Commitef43d0a

committed

Fix h2syn, added simple test

Similar fix to hinfsyn: np -> np_, and identical test.

1 parent9187645 commitef43d0aCopy full SHA for ef43d0a

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,8 @@ def h2syn(P,nmeas,ncon):`
`90`	`90`
`91`	`91`	`n=np.size(P.A,0)`
`92`	`92`	`m=np.size(P.B,1)`
`93`		`-np=np.size(P.C,0)`
`94`		`-out=sb10hd(n,m,np,ncon,nmeas,P.A,P.B,P.C,P.D)`
	`93`	`+np_=np.size(P.C,0)`
	`94`	`+out=sb10hd(n,m,np_,ncon,nmeas,P.A,P.B,P.C,P.D)`
`95`	`95`	`Ak=out[0]`
`96`	`96`	`Bk=out[1]`
`97`	`97`	`Ck=out[2]`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,21 @@ def testHinfsyn(self):`
`26`	`26`
`27`	`27`	`# TODO: add more interesting examples`
`28`	`28`
	`29`	`+classTestH2(unittest.TestCase):`
	`30`	`+@unittest.skipIf(notslycot_check(),"slycot not installed")`
	`31`	`+deftestH2syn(self):`
	`32`	`+"Test h2syn"`
	`33`	`+p=control.ss(-1, [1,1], [[1], [1]], [[0,1], [1,0]])`
	`34`	`+k=control.robust.h2syn(p,1,1)`
	`35`	`+# from Octave, which also uses SB10HD for H-2 synthesis:`
	`36`	`+# a= -1; b1= 1; b2= 1; c1= 1; c2= 1; d11= 0; d12= 1; d21= 1; d22= 0;`
	`37`	`+# g = ss(a,[b1,b2],[c1;c2],[d11,d12;d21,d22]);`
	`38`	`+# k = h2syn(g,1,1);`
	`39`	`+# the solution is the same as for the hinfsyn test`
	`40`	`+np.testing.assert_array_almost_equal(k.A, [[-3]])`
	`41`	`+np.testing.assert_array_almost_equal(k.B, [[1]])`
	`42`	`+np.testing.assert_array_almost_equal(k.C, [[-1]])`
	`43`	`+np.testing.assert_array_almost_equal(k.D, [[0]])`
`29`	`44`
`30`	`45`	`if__name__=="__main__":`
`31`	`46`	`unittest.main()`

Comments

(0)