[Octave-cvsupdate] SF.net SVN: octave:[10694] trunk/octave-forge/extra/control-devel

[<par...@us...>]

Revision: 10694
          http://octave.svn.sourceforge.net/octave/?rev=10694&view=rev
Author:   paramaniac
Date:     2012-06-25 19:24:52 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
control-devel: change to Kalman predictor

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/devel/CDplayer.m
    trunk/octave-forge/extra/control-devel/devel/LakeErie.m
    trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m

Modified: trunk/octave-forge/extra/control-devel/devel/CDplayer.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/CDplayer.m	2012-06-25 16:41:32 UTC (rev 10693)
+++ trunk/octave-forge/extra/control-devel/devel/CDplayer.m	2012-06-25 19:24:52 UTC (rev 10694)
@@ -50,11 +50,15 @@
 
 dat = iddata (Y, U)
 
-[sys, x0] = moen4 (dat, 8, 's', 15)     % s=15, n=8
+% [sys, x0] = moen4 (dat, 8, 's', 15)     % s=15, n=8
+[sys, x0] = moen4 (dat, 8, 's', 15, 'noise', 'k')     % s=15, n=8
 
 
-[y, t] = lsim (sys, U, [], x0);
 
+%[y, t] = lsim (sys, U, [], x0);
+[y, t] = lsim (sys, [U, Y], [], x0);
+
+
 err = norm (Y - y, 1) / norm (Y, 1)
 
 figure (1)

Modified: trunk/octave-forge/extra/control-devel/devel/LakeErie.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/LakeErie.m	2012-06-25 16:41:32 UTC (rev 10693)
+++ trunk/octave-forge/extra/control-devel/devel/LakeErie.m	2012-06-25 19:24:52 UTC (rev 10694)
@@ -76,11 +76,14 @@
    	                   'outname', {'a. dissolved oxygen';
    	                               'b. algae'})
 
-[sys, x0] = moen4 (dat, 's', 5, 'n', 4)    % s=5, n=4
+% [sys, x0] = moen4 (dat, 's', 5, 'n', 4)    % s=5, n=4
+[sys, x0] = moen4 (dat, 's', 5, 'n', 4, 'noise', 'k')    % s=5, n=4
 
+
 x0=x0{1};
 
-[y, t] = lsim (sys, U_erie, [], x0);
+[y, t] = lsim (sys, [U_erie, Y_erie], [], x0);
+%[y, t] = lsim (sys, U_erie, [], x0);
 %[y, t] = lsim (sys, U_erie);
 
 err = norm (Y_erie - y, 1) / norm (Y_erie, 1)

Modified: trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m	2012-06-25 16:41:32 UTC (rev 10693)
+++ trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m	2012-06-25 19:24:52 UTC (rev 10694)
@@ -97,6 +97,7 @@
       case "confirm"
         conf = logical (val);
       case "noise"
+        ## FIXME: find a more speaking name than 'noise' for this option
         noise = val;
       otherwise
         warning ("%s: invalid property name '%s' ignored", method, key);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.