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

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

Revision: 8462
          http://octave.svn.sourceforge.net/octave/?rev=8462&view=rev
Author:   paramaniac
Date:     2011-08-15 18:23:39 +0000 (Mon, 15 Aug 2011)

Log Message:
-----------
control: cleaning up

Modified Paths:
--------------
    trunk/octave-forge/main/control/devel/makefile_hankel.m

Added Paths:
-----------
    trunk/octave-forge/main/control/devel/test_2.m
    trunk/octave-forge/main/control/devel/test_ss2tf.m

Removed Paths:
-------------
    trunk/octave-forge/main/control/devel/ss2tf/

Modified: trunk/octave-forge/main/control/devel/makefile_hankel.m
===================================================================
--- trunk/octave-forge/main/control/devel/makefile_hankel.m	2011-08-15 18:06:43 UTC (rev 8461)
+++ trunk/octave-forge/main/control/devel/makefile_hankel.m	2011-08-15 18:23:39 UTC (rev 8462)
@@ -4,6 +4,9 @@
 ## USAGE: * fetch control from Octave-Forge by svn
 ##        * add control/inst, control/src and control/devel to your Octave path
 ##        * run makefile_*
+## NOTES: * The option "-Wl,-framework" "-Wl,vecLib" is needed for MacPorts'
+##          octave-devel @3.3.52_1+gcc44 on MacOS X 10.6.4. However, this option
+##          breaks other platforms. See MacPorts Ticket #26640.
 ## ==============================================================================
 
 homedir = pwd ();
@@ -11,7 +14,8 @@
 srcdir = [develdir, "/../src"];
 cd (srcdir);
 
-mkoctfile slab13ad.cc \
+mkoctfile "-Wl,-framework" "-Wl,vecLib" \
+          slab13ad.cc \
           AB13AD.f TB01ID.f TB01KD.f AB13AX.f MA02DD.f \
           MB03UD.f TB01LD.f SB03OU.f MB03QX.f select.f \
           SB03OT.f MB03QD.f MB04ND.f MB04OD.f MB03QY.f \

Added: trunk/octave-forge/main/control/devel/test_2.m
===================================================================
--- trunk/octave-forge/main/control/devel/test_2.m	                        (rev 0)
+++ trunk/octave-forge/main/control/devel/test_2.m	2011-08-15 18:23:39 UTC (rev 8462)
@@ -0,0 +1,14 @@
+ss_sys = WestlandLynx;
+tf_sys = tf (ss_sys);
+
+w = logspace (-4, 3, 500);
+
+figure (1)
+sigma (ss_sys, w)
+
+figure (2)
+sigma (tf_sys, w)
+
+
+sys = ss (0, 1, 1, 0)
+tf (sys)

Copied: trunk/octave-forge/main/control/devel/test_ss2tf.m (from rev 8461, trunk/octave-forge/main/control/devel/ss2tf/test_ss2tf.m)
===================================================================
--- trunk/octave-forge/main/control/devel/test_ss2tf.m	                        (rev 0)
+++ trunk/octave-forge/main/control/devel/test_ss2tf.m	2011-08-15 18:23:39 UTC (rev 8462)
@@ -0,0 +1,83 @@
+a = [ -1.0   0.0   0.0
+       0.0  -2.0   0.0
+       0.0   0.0  -3.0 ];
+
+b = [  0.0   1.0  -1.0
+       1.0   1.0   0.0 ].';
+
+c = [  0.0   1.0   1.0
+       1.0   1.0   1.0 ];
+
+d = [  1.0   0.0
+       0.0   1.0 ];
+
+[p, m] = size (d);
+md = 4
+
+[gn, gd, ign, igd] = sltb04bd (a, b, c, d)
+
+num = reshape (gn, md, p, m)
+den = reshape (gd, md, p, m)
+
+numc = mat2cell (num, md, ones(1,p), ones(1,m))
+denc = mat2cell (den, md, ones(1,p), ones(1,m))
+
+numc = squeeze (numc)
+denc = squeeze (denc)
+
+ignc = mat2cell (ign, ones(1,p), ones(1,m));
+igdc = mat2cell (igd, ones(1,p), ones(1,m));
+
+num = cellfun (@(x, y) x(1:y+1), numc, ignc, "uniformoutput", false);
+den = cellfun (@(x, y) x(1:y+1), denc, igdc, "uniformoutput", false);
+
+
+tf (num, den)
+
+%{
+numc{1,2,1}
+denc{1,2,1}
+numc{1,1,2}
+denc{1,1,2}
+%}
+
+
+%num(:, 1, 1)
+%den(:, 1, 1)
+%num(:, 1, 2)
+%den(:, 1, 2)
+
+%num = mat2cell (gn, p, m)
+%den = mat2cell (gd, p, m)
+
+%num = gn(1:ign+1)
+%den = gd(1:igd+1)
+%{
+[gn, gd, ign, igd] = sltb04bd (-2, 3, 4, 5)
+
+
+% for i = 1 : size (gn, 1)
+%   for j = 1 : size (gn, 2)
+%     gn(i, j, :)
+%     gd(i, j, :)
+%   endfor
+% endfor
+
+
+P = tf (1, [1 5 11 14 11 5 1]);
+
+S = ss (P);
+
+[num, den, ign, igd] = sltb04bd (S.a, S.b, S.c, S.d)
+
+P
+
+
+
+[num, den, ign, igd] = sltb04bd (0, 1, 1, 0)
+
+
+sys = WestlandLynx;
+
+[num, den, ign, igd] = sltb04bd (sys.a, sys.b, sys.c, sys.d);
+%}


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