Mercurial > forge

changeset 10290:2dd7c8168ea0 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
control-devel: use new moen4 method for test examples
author paramaniac
date Mon, 21 May 2012 15:27:49 +0000
parents ad94a9e3eabe
children 83fd5ae52ac6
files extra/control-devel/devel/CDplayer.m extra/control-devel/devel/Destillation.m extra/control-devel/devel/DestillationME.m extra/control-devel/devel/Evaporator.m extra/control-devel/devel/GlassFurnace.m extra/control-devel/devel/HeatingSystem.m extra/control-devel/devel/LakeErie.m extra/control-devel/devel/pH.m
diffstat 8 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/extra/control-devel/devel/CDplayer.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/CDplayer.m	Mon May 21 15:27:49 2012 +0000
@@ -50,7 +50,7 @@
 
 dat = iddata (Y, U)
 
-[sys, x0] = moen4 (dat, 8)     % s=15, n=8
+[sys, x0] = moen4 (dat, 8, 's', 15)     % s=15, n=8
 
 
 [y, t] = lsim (sys, U, [], x0);
--- a/extra/control-devel/devel/Destillation.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/Destillation.m	Mon May 21 15:27:49 2012 +0000
@@ -69,7 +69,7 @@
 
 dat = iddata (Y_dest, U_dest)
 
-[sys, x0] = ident (dat, 5, 4)    % s=5, n=4
+[sys, x0] = moen4 (dat, 's', 5, 'n', 4)    % s=5, n=4
 
 
 [y, t] = lsim (sys, U_dest, [], x0);
--- a/extra/control-devel/devel/DestillationME.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/DestillationME.m	Mon May 21 15:27:49 2012 +0000
@@ -71,7 +71,7 @@
 
 dat = iddata (Y, U)
 
-[sys, x0] = ident (dat, 5, 4)    % s=5, n=4
+[sys, x0] = moen4 (dat, 's', 5, 'n', 4)    % s=5, n=4
 
 x0=x0{1};
 
--- a/extra/control-devel/devel/Evaporator.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/Evaporator.m	Mon May 21 15:27:49 2012 +0000
@@ -51,7 +51,7 @@
 
 dat = iddata (Y, U)
 
-[sys, x0] = ident (dat, 10, 4)     % s=10, n=4
+[sys, x0] = moen4 (dat, 's', 10, 'n', 4)     % s=10, n=4
 
 
 [y, t] = lsim (sys, U, [], x0);
--- a/extra/control-devel/devel/GlassFurnace.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/GlassFurnace.m	Mon May 21 15:27:49 2012 +0000
@@ -48,7 +48,7 @@
 
 dat = iddata (Y, U)
 
-[sys, x0] = moen4 (dat, 5)     % s=10, n=5
+[sys, x0] = moen4 (dat, 's', 10, 'n', 5)     % s=10, n=5
 
 
 [y, t] = lsim (sys, U, [], x0);
--- a/extra/control-devel/devel/HeatingSystem.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/HeatingSystem.m	Mon May 21 15:27:49 2012 +0000
@@ -75,7 +75,7 @@
                          'outunit', '°C')
 
 % s=15, n=7
-[sys1, x0] = ident (dat, 15, 7)
+[sys1, x0] = moen4 (dat, 's', 15, 'n', 7)
 sys2 = arx (dat, 7, 7)       % normally na = nb
 
 [y1, t1] = lsim (sys1, U, [], x0);
--- a/extra/control-devel/devel/LakeErie.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/LakeErie.m	Mon May 21 15:27:49 2012 +0000
@@ -76,7 +76,7 @@
    	                   'outname', {'a. dissolved oxygen';
    	                               'b. algae'})
 
-[sys, x0] = ident (dat, 5, 4)    % s=5, n=4
+[sys, x0] = moen4 (dat, 's', 5, 'n', 4)    % s=5, n=4
 
 x0=x0{1};
 
--- a/extra/control-devel/devel/pH.m	Mon May 21 15:16:30 2012 +0000
+++ b/extra/control-devel/devel/pH.m	Mon May 21 15:27:49 2012 +0000
@@ -51,7 +51,7 @@
 
 dat = iddata (Y, U)
 
-[sys, x0] = moen4 (dat, 6)     % s=15, n=6
+[sys, x0] = moen4 (dat, 's', 15, 'n', 6)     % s=15, n=6
 
 
 [y, t] = lsim (sys, U, [], x0);