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

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

Revision: 8889
          http://octave.svn.sourceforge.net/octave/?rev=8889&view=rev
Author:   paramaniac
Date:     2011-10-27 21:44:50 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
control-devel: get testcase for slicot ab09id working

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/src/slab09id.cc

Added Paths:
-----------
    trunk/octave-forge/extra/control-devel/devel/test_ab09id.m

Added: trunk/octave-forge/extra/control-devel/devel/test_ab09id.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/test_ab09id.m	                        (rev 0)
+++ trunk/octave-forge/extra/control-devel/devel/test_ab09id.m	2011-10-27 21:44:50 UTC (rev 8889)
@@ -0,0 +1,82 @@
+% AB09ID EXAMPLE PROGRAM DATA (Continuous system)
+%  3  1  1   6  1  0  0   2   0.0  0.0  0.0 0.1E0  0.0    C   S  S   F   L  S  F 
+
+% N, M, P, NV, PV, NW, MW, NR,
+% ALPHA, ALPHAC, ALPHAO, TOL1, TOL2,
+% DICO, JOBC, JOBO, JOB, WEIGHT,
+% EQUIL, ORDSEL
+
+
+a =  [ -26.4000,    6.4023,    4.3868;
+        32.0000,         0,         0;
+              0,    8.0000,         0 ];
+
+b =  [       16
+              0
+              0 ];
+
+c =  [   9.2994     1.1624     0.1090 ];
+
+d =  [        0 ];
+
+av = [  -1.0000,         0,    4.0000,   -9.2994,   -1.1624,   -0.1090;
+              0,    2.0000,         0,   -9.2994,   -1.1624,   -0.1090;
+              0,         0,   -3.0000,   -9.2994,   -1.1624,   -0.1090;
+        16.0000,   16.0000,   16.0000,  -26.4000,    6.4023,    4.3868;
+              0,         0,         0,   32.0000,         0,         0;
+              0,         0,         0,         0,    8.0000,         0 ];
+
+bv = [        1
+              1
+              1
+              0
+              0
+              0 ];
+
+cv = [        1          1          1          0          0          0 ];
+
+dv = [        0 ];
+
+aw = bw = cw = dw = [];
+
+alpha = alphac = alphao = 0.0;
+tol1 = 0.1;
+tol2 = 0.0;
+dico = 0;
+jobc = jobo = 0;
+job = 1;
+weight = 1;
+equil = 0;
+ordsel = 0;
+nr = 2;
+
+
+[ar, br, cr, dr] = slab09id (a, b, c, d, dico, equil, nr, ordsel, alpha, job, \
+                             av, bv, cv, dv, \
+                             aw, bw, cw, dw, \
+                             weight, jobc, jobo, alphac, alphao, \
+                             tol1, tol2)
+
+%{
+ AB09ID EXAMPLE PROGRAM RESULTS
+
+
+ The order of reduced model =  2
+
+ The Hankel singular values of weighted ALPHA-stable part are
+   3.8253   0.2005
+
+ The reduced state dynamics matrix Ar is 
+   9.1900   0.0000
+   0.0000 -34.5297
+
+ The reduced input/state matrix Br is 
+  11.9593
+  16.9329
+
+ The reduced state/output matrix Cr is 
+   2.8955   6.9152
+
+ The reduced input/output matrix Dr is 
+   0.0000
+%}
\ No newline at end of file

Modified: trunk/octave-forge/extra/control-devel/src/slab09id.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/slab09id.cc	2011-10-27 19:03:15 UTC (rev 8888)
+++ trunk/octave-forge/extra/control-devel/src/slab09id.cc	2011-10-27 21:44:50 UTC (rev 8889)
@@ -70,7 +70,7 @@
     int nargin = args.length ();
     octave_value_list retval;
     
-    if (nargin != 26)
+    if (nargin != 25)
     {
         print_usage ();
     }
@@ -102,19 +102,19 @@
         Matrix cv = args(12).matrix_value ();
         Matrix dv = args(13).matrix_value ();
       
-        Matrix aw = args(15).matrix_value ();
-        Matrix bw = args(16).matrix_value ();
-        Matrix cw = args(17).matrix_value ();
-        Matrix dw = args(18).matrix_value ();
+        Matrix aw = args(14).matrix_value ();
+        Matrix bw = args(15).matrix_value ();
+        Matrix cw = args(16).matrix_value ();
+        Matrix dw = args(17).matrix_value ();
         
-        const int iweight = args(19).int_value ();
-        const int ijobc = args(20).int_value ();
-        double alphac = args(21).double_value ();
-        const int ijobo = args(22).int_value ();
-        double alphao = args(23).double_value ();
+        const int iweight = args(18).int_value ();
+        const int ijobc = args(19).int_value ();
+        double alphac = args(20).double_value ();
+        const int ijobo = args(21).int_value ();
+        double alphao = args(22).double_value ();
 
-        double tol1 = args(24).double_value ();
-        double tol2 = args(25).double_value ();
+        double tol1 = args(23).double_value ();
+        double tol2 = args(24).double_value ();
 
         if (idico == 0)
             dico = 'C';

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