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

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

Revision: 9228
          http://octave.svn.sourceforge.net/octave/?rev=9228&view=rev
Author:   paramaniac
Date:     2011-11-30 15:03:54 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
control-devel: get slicot sb16cd working

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

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

Added: trunk/octave-forge/extra/control-devel/devel/test_sb16cd.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/test_sb16cd.m	                        (rev 0)
+++ trunk/octave-forge/extra/control-devel/devel/test_sb16cd.m	2011-11-30 15:03:54 UTC (rev 9228)
@@ -0,0 +1,108 @@
+%{
+ SB16CD EXAMPLE PROGRAM DATA (Continuous system)
+  8  1  1   2   0.1E0  C  D  F  R  F
+  
+  N, M, P, NCR, TOL,
+  DICO, JOBD, JOBMR, JOBCF, ORDSEL
+  
+         0    1.0000         0         0         0         0         0        0
+         0         0         0         0         0         0         0        0
+         0         0   -0.0150    0.7650         0         0         0        0
+         0         0   -0.7650   -0.0150         0         0         0        0
+         0         0         0         0   -0.0280    1.4100         0        0
+         0         0         0         0   -1.4100   -0.0280         0        0
+         0         0         0         0         0         0   -0.0400    1.850
+         0         0         0         0         0         0   -1.8500   -0.040
+    0.0260
+   -0.2510
+    0.0330
+   -0.8860
+   -4.0170
+    0.1450
+    3.6040
+    0.2800
+  -.996 -.105 0.261 .009 -.001 -.043 0.002 -0.026
+  0.0
+4.472135954999638e-002    6.610515358414598e-001    4.698598960657579e-003  3.601363251422058e-001    1.032530880771415e-001   -3.754055214487997e-002  -4.268536964759344e-002    3.287284547842979e-002
+    4.108939884667451e-001
+    8.684600000000012e-002
+    3.852317308197148e-004
+   -3.619366874815911e-003
+   -8.803722876359955e-003
+    8.420521094001852e-003
+    1.234944428038507e-003
+    4.263205617645322e-003
+%}
+
+a =  [       0    1.0000         0         0         0         0         0        0
+             0         0         0         0         0         0         0        0
+             0         0   -0.0150    0.7650         0         0         0        0
+             0         0   -0.7650   -0.0150         0         0         0        0
+             0         0         0         0   -0.0280    1.4100         0        0
+             0         0         0         0   -1.4100   -0.0280         0        0
+             0         0         0         0         0         0   -0.0400    1.850
+             0         0         0         0         0         0   -1.8500   -0.040 ];
+
+b =  [  0.0260
+       -0.2510
+        0.0330
+       -0.8860
+       -4.0170
+        0.1450
+        3.6040
+        0.2800 ];
+
+c =  [  -.996 -.105 0.261 .009 -.001 -.043 0.002 -0.026 ];
+
+d =  [  0.0 ];
+
+f = [  4.472135954999638e-002    6.610515358414598e-001    4.698598960657579e-003  3.601363251422058e-001    1.032530880771415e-001   -3.754055214487997e-002  -4.268536964759344e-002    3.287284547842979e-002 ];
+
+g = [  4.108939884667451e-001
+       8.684600000000012e-002
+       3.852317308197148e-004
+      -3.619366874815911e-003
+      -8.803722876359955e-003
+       8.420521094001852e-003
+       1.234944428038507e-003
+       4.263205617645322e-003 ];
+       
+%{
+  8  1  1   2   0.1E0  C  D  F  R  F
+  
+  N, M, P, NCR, TOL,
+  DICO, JOBD, JOBMR, JOBCF, ORDSEL
+%}
+
+
+tol = 0.1;  # tol1
+dico = 0;
+jobd = 1;
+jobmr = 1;
+jobcf = 1;
+ordsel = 0;
+ncr = 2;
+
+
+[ac, bc, cc] = slsb16cd (a, b, c, d, dico, ncr, ordsel, jobd, jobmr, \
+                             f, g, jobcf, tol)
+
+%{
+ SB16CD EXAMPLE PROGRAM RESULTS
+
+ The order of reduced controller =  2
+
+ The frequency-weighted Hankel singular values are:
+   3.3073   0.7274   0.1124   0.0784   0.0242   0.0182   0.0101   0.0094
+
+ The reduced controller state dynamics matrix Ac is 
+  -0.4334   0.4884
+  -0.1950  -0.1093
+
+ The reduced controller input/state matrix Bc is 
+  -0.4231
+  -0.1785
+
+ The reduced controller state/output matrix Cc is 
+  -0.0326  -0.2307
+%}
\ No newline at end of file

Modified: trunk/octave-forge/extra/control-devel/src/slsb16cd.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/slsb16cd.cc	2011-11-30 14:54:12 UTC (rev 9227)
+++ trunk/octave-forge/extra/control-devel/src/slsb16cd.cc	2011-11-30 15:03:54 UTC (rev 9228)
@@ -60,7 +60,7 @@
     int nargin = args.length ();
     octave_value_list retval;
     
-    if (nargin != 15)
+    if (nargin != 13)
     {
         print_usage ();
     }

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