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

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

Revision: 10799
          http://octave.svn.sourceforge.net/octave/?rev=10799&view=rev
Author:   paramaniac
Date:     2012-08-02 17:46:05 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
control-devel: support algorithm option

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
    trunk/octave-forge/extra/control-devel/inst/moen4.m
    trunk/octave-forge/extra/control-devel/inst/moesp.m
    trunk/octave-forge/extra/control-devel/inst/n4sid.m

Modified: trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m	2012-08-01 19:44:32 UTC (rev 10798)
+++ trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m	2012-08-02 17:46:05 UTC (rev 10799)
@@ -72,7 +72,7 @@
   conct = 1;                            # no connection between experiments
   ctrl = 1;                             # don't confirm order n
   rcond = 0.0;
-  tol = -1.0;
+  tol = 0.0;                            # -1.0;
   s = [];
   n = [];
   conf = [];
@@ -94,7 +94,15 @@
         endif
         s = val;
       case {"alg", "algorithm"}
-        error ("alg");
+        if (strncmpi (val, "c", 1))
+          alg = 0;                      # Cholesky algorithm applied to correlation matrix
+        elseif (strncmpi (val, "f", 1))
+          alg = 1;                      # fast QR algorithm
+        elseif (strncmpi (val, "q", 1))
+          alg = 2;                      # QR algorithm applied to block Hankel matrices
+        else
+          error ("%s: invalid algorithm", method);
+        endif
       case "tol"
         if (! is_real_scalar (val))
           error ("%s: tolerance 'tol' must be a real scalar", method);

Modified: trunk/octave-forge/extra/control-devel/inst/moen4.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/moen4.m	2012-08-01 19:44:32 UTC (rev 10798)
+++ trunk/octave-forge/extra/control-devel/inst/moen4.m	2012-08-02 17:46:05 UTC (rev 10799)
@@ -21,8 +21,10 @@
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} moen4 (@var{dat}, @var{opt}, @dots{})
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} moen4 (@var{dat}, @var{n}, @var{opt}, @dots{})
 ## Estimate state-space model using combined subspace method:
-## MOESP  algorithm for finding the matrices A and C,
-## and  N4SID  algorithm for finding the matrices B and D.
+## @acronym{MOESP} algorithm for finding the matrices A and C,
+## and @acronym{N4SID} algorithm for finding the matrices B and D.
+## If no output arguments are given, the singular values are
+## plotted on the screen in order to estimate the system order.
 ##
 ## @strong{Inputs}
 ## @table @var
@@ -104,7 +106,7 @@
 ## the relative machine precision.
 ## When @var{tol} < 0,  the estimate is indicated by the
 ## index of the singular value that has the largest
-## logarithmic gap to its successor.
+## logarithmic gap to its successor.  Default value is 0.
 ##
 ## @item 'rcond'
 ## The tolerance to be used for estimating the rank of
@@ -115,7 +117,7 @@
 ## be of full rank.  If the user sets @var{rcond} <= 0,  then an
 ## implicitly computed, default tolerance, defined by
 ## @var{rcond} = m*n*@var{eps},  is used instead, where @var{eps} is the
-## relative machine precision.
+## relative machine precision.  Default value is 0.
 ##
 ## @item 'confirm'
 ## Specifies whether or not the user's confirmation of the

Modified: trunk/octave-forge/extra/control-devel/inst/moesp.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/moesp.m	2012-08-01 19:44:32 UTC (rev 10798)
+++ trunk/octave-forge/extra/control-devel/inst/moesp.m	2012-08-02 17:46:05 UTC (rev 10799)
@@ -20,8 +20,8 @@
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} moesp (@var{dat}, @var{n}, @dots{})
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} moesp (@var{dat}, @var{opt}, @dots{})
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} moesp (@var{dat}, @var{n}, @var{opt}, @dots{})
-## Estimate state-space model using MOESP algorithm.
-## MOESP: Multivariable Output Error State sPace.
+## Estimate state-space model using @acronym{MOESP} algorithm.
+## @acronym{MOESP}: Multivariable Output Error State sPace.
 ## @end deftypefn
 
 ## Author: Lukas Reichlin <luk...@gm...>

Modified: trunk/octave-forge/extra/control-devel/inst/n4sid.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/n4sid.m	2012-08-01 19:44:32 UTC (rev 10798)
+++ trunk/octave-forge/extra/control-devel/inst/n4sid.m	2012-08-02 17:46:05 UTC (rev 10799)
@@ -20,8 +20,8 @@
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} n4sid (@var{dat}, @var{n}, @dots{})
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} n4sid (@var{dat}, @var{opt}, @dots{})
 ## @deftypefnx {Function File} {[@var{sys}, @var{x0}, @var{info}] =} n4sid (@var{dat}, @var{n}, @var{opt}, @dots{})
-## Estimate state-space model using N4SID algorithm.
-## N4SID: Numerical algorithm for Subspace State Space System IDentification.
+## Estimate state-space model using @acronym{N4SID} algorithm.
+## @acronym{N4SID}: Numerical algorithm for Subspace State Space System IDentification.
 ## @end deftypefn
 
 ## Author: Lukas Reichlin <luk...@gm...>

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