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

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

Revision: 7680
          http://octave.svn.sourceforge.net/octave/?rev=7680&view=rev
Author:   paramaniac
Date:     2010-09-07 23:48:21 +0000 (Tue, 07 Sep 2010)

Log Message:
-----------
control: resize arrays inside oct-files

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/@ss/__minreal__.m
    trunk/octave-forge/main/control/inst/hsvd.m
    trunk/octave-forge/main/control/src/slab13ad.cc
    trunk/octave-forge/main/control/src/sltb01pd.cc

Modified: trunk/octave-forge/main/control/inst/@ss/__minreal__.m
===================================================================
--- trunk/octave-forge/main/control/inst/@ss/__minreal__.m	2010-09-07 19:30:23 UTC (rev 7679)
+++ trunk/octave-forge/main/control/inst/@ss/__minreal__.m	2010-09-07 23:48:21 UTC (rev 7680)
@@ -33,10 +33,6 @@
 
   [a, b, c, nr] = sltb01pd (sys.a, sys.b, sys.c, tol);
 
-  a = a(1:nr, 1:nr);
-  b = b(1:nr, :);
-  c = c(:, 1:nr);
-
   retsys = ss (a, b, c, sys.d);
   retsys.lti = sys.lti;  # retain i/o names and tsam
 

Modified: trunk/octave-forge/main/control/inst/hsvd.m
===================================================================
--- trunk/octave-forge/main/control/inst/hsvd.m	2010-09-07 19:30:23 UTC (rev 7679)
+++ trunk/octave-forge/main/control/inst/hsvd.m	2010-09-07 23:48:21 UTC (rev 7680)
@@ -26,7 +26,7 @@
 
 ## Author: Lukas Reichlin <luk...@gm...>
 ## Created: January 2010
-## Version: 0.1
+## Version: 0.2
 
 function hsv_r = hsvd (sys, prop = "offset", val = 1e-8)
 
@@ -54,13 +54,10 @@
   
   [hsv, ns] = slab13ad (a, b, c, discrete, alpha);
   
-  idx = 1 : ns;
-  hsv = hsv (idx);
-  
   if (nargout)
     hsv_r = hsv;
   else
-    bar (idx + (rows (a) - ns), hsv);
+    bar ((1:ns) + (rows (a) - ns), hsv);
     title ("Hankel Singular Values of Stable Part");
     xlabel ("State");
     ylabel ("State Energy");

Modified: trunk/octave-forge/main/control/src/slab13ad.cc
===================================================================
--- trunk/octave-forge/main/control/src/slab13ad.cc	2010-09-07 19:30:23 UTC (rev 7679)
+++ trunk/octave-forge/main/control/src/slab13ad.cc	2010-09-07 23:48:21 UTC (rev 7680)
@@ -112,6 +112,9 @@
             
         if (info != 0)
             error ("hsvd: slab13ad: AB13AD returned info = %d", info);
+
+        // resize
+        hsv.resize (ns);
         
         // return values
         retval(0) = hsv;

Modified: trunk/octave-forge/main/control/src/sltb01pd.cc
===================================================================
--- trunk/octave-forge/main/control/src/sltb01pd.cc	2010-09-07 19:30:23 UTC (rev 7679)
+++ trunk/octave-forge/main/control/src/sltb01pd.cc	2010-09-07 23:48:21 UTC (rev 7680)
@@ -111,7 +111,12 @@
             
         if (info != 0)
             error ("ss: minreal: sltb01pd: TB01PD returned info = %d", info);
-        
+
+        // resize
+        a.resize (nr, nr);
+        b.resize (nr, m);
+        c.resize (p, nr);
+
         // return values
         retval(0) = a;
         retval(1) = b;


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