Mercurial > forge
changeset 9791:c0d39694c42e octave-forge
control-devel: first steps to fix crash with DaISy data (2)
| author | paramaniac |
|---|---|
| date | Tue, 20 Mar 2012 13:11:38 +0000 |
| parents | 3c81a2c03a23 |
| children | bf7e137f08ca |
| files | extra/control-devel/devel/destillation.m extra/control-devel/devel/ident.m extra/control-devel/src/slident.cc |
| diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/control-devel/devel/destillation.m Tue Mar 20 10:36:50 2012 +0000 +++ b/extra/control-devel/devel/destillation.m Tue Mar 20 13:11:38 2012 +0000 @@ -65,10 +65,11 @@ dat = iddata (Y_dest, U_dest) -[sys, x0] = ident (dat, 5) % nobr? 5, 90, ? +[sys, x0] = ident (dat) %, 5) % nobr? 5, 90, ? [y, t] = lsim (sys, U_dest, [], x0); +%[y, t] = lsim (sys, U_dest); figure (1) plot (t, Y_dest, 'b')
--- a/extra/control-devel/devel/ident.m Tue Mar 20 10:36:50 2012 +0000 +++ b/extra/control-devel/devel/ident.m Tue Mar 20 13:11:38 2012 +0000 @@ -6,11 +6,18 @@ jobd = 1; batch = 3; conct = 1; - ctrl = 1; + ctrl = 0; %1; rcond = 0.0; tol = -1.0; + + [n, l, m, e] = size (dat); + + nsmp = n(1) + nobr = fix ((nsmp+1)/(2*(m+l+1))) + % nsmp >= 2*(m+l+1)*nobr - 1 + % nobr <= (nsmp+1)/(2*(m+l+1)) - [a, b, c, d, q, ry, s, k, x0] = slident (dat.y{1}, dat.u{1}, nobr, meth, alg, jobd, batch, conct, ctrl, rcond, tol) + [a, b, c, d, q, ry, s, k, x0] = slident (dat.y{1}, dat.u{1}, nobr, meth, alg, jobd, batch, conct, ctrl, rcond, tol); sys = ss (a, b, c, d, -1);
--- a/extra/control-devel/src/slident.cc Tue Mar 20 10:36:50 2012 +0000 +++ b/extra/control-devel/src/slident.cc Tue Mar 20 13:11:38 2012 +0000 @@ -313,7 +313,7 @@ //////////////////////////////////////////////////////////////////// // TO BE REMOVED !!! //////////////////////////////////////////////////////////////////// -ldwork = 100000; +ldwork = 1000000; //////////////////////////////////////////////////////////////////// /*